This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch improve-asset-browser-filters in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 91c4232516a99c11d52094f21f07c0f7b24833c0 Author: Dominik Riemer <[email protected]> AuthorDate: Mon Aug 25 16:57:16 2025 +0200 feat: Improve asset browser layout --- .../asset-browser-hierarchy.component.html | 2 +- .../asset-browser-hierarchy.component.ts | 18 +++++++++++++++++- .../asset-browser-filter-labels.component.html | 3 +-- .../asset-browser/asset-browser.component.html | 1 + .../asset-browser/asset-browser.component.ts | 3 +++ .../components/kiosk/dashboard-kiosk.component.scss | 2 -- 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.html index ba044f6ad8..030a81adb0 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.html +++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.html @@ -28,7 +28,7 @@ <button mat-icon-button matTreeNodeToggle - *ngIf="hasChild(0, node)" + *ngIf="hasChild(0, node) && !hideAssetChildren" [attr.data-cy]="'button-' + node.nodeName" [attr.aria-label]="'Toggle ' + node.nodeName" > diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.ts index 9fd0edd343..6ed2f52254 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.ts +++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.ts @@ -53,6 +53,9 @@ export class AssetBrowserHierarchyComponent implements OnChanges { @Input() filteredAssetLinkType: string; + @Input() + hideAssetChildren = false; + @Input() resourceCount = 0; @@ -102,8 +105,21 @@ export class AssetBrowserHierarchyComponent implements OnChanges { ), assetDescription: '', assetLinks: [], - assets: this.assetBrowserData.assets, + assets: this.makeAssets(), assetType: undefined, }; } + + private cloneWithoutChildren(assets: SpAsset[]): SpAsset[] { + return assets.map(a => ({ + ...a, + assets: [], + })); + } + + makeAssets(): SpAsset[] { + return this.hideAssetChildren + ? this.cloneWithoutChildren(this.assetBrowserData.assets) + : this.assetBrowserData.assets; + } } diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component.html index 547d81434d..71e18135d7 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component.html +++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component.html @@ -64,11 +64,10 @@ <mat-option *ngFor="let label of labels; let i = index" [value]="label" - class="smaller-font-size" > <sp-label [labelText]="label.label" - size="medium" + size="small" [labelBackground]="label.color" > </sp-label> diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.html index 0a02d5c33e..e6de46c57a 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.html +++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.html @@ -37,6 +37,7 @@ [assetBrowserData]="assetBrowserData" [assetSelectionMode]="assetSelectionMode" [resourceCount]="resourceCount" + [hideAssetChildren]="hideAssetChildren" [filteredAssetLinkType]="filteredAssetLinkType" (selectedAssetEmitter)="applyAssetFilter($event)" class="asset-hierarchy" diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.ts index 991eace9b3..cc12eee708 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.ts +++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.ts @@ -45,6 +45,9 @@ export class AssetBrowserComponent implements OnInit, OnDestroy { @Input() showResources = false; + @Input() + hideAssetChildren = false; + @Input() allResourcesAlias = this.translateService.instant('Resources'); diff --git a/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.scss b/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.scss index b8d6d190bd..0937b31c4c 100644 --- a/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.scss +++ b/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.scss @@ -16,8 +16,6 @@ * */ -@use '../../../../scss/_variables'; - .h-100 { height: 100%; }
