This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch 3156-add-asset-browser-to-overview-pages in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit c428b66a5d24498d699439ab2ddb82f370c5fc79 Author: Dominik Riemer <[email protected]> AuthorDate: Tue Aug 20 10:39:19 2024 +0200 Improve rendering of asset browser --- .../asset-browser-hierarchy/asset-browser-hierarchy.component.ts | 5 ++++- .../asset-browser-node-info/asset-browser-node-info.component.ts | 1 - .../asset-browser-node/asset-browser-node.component.html | 9 ++++++++- .../asset-browser-node/asset-browser-node.component.ts | 2 +- .../lib/components/asset-browser/asset-browser.component.html | 1 + .../src/lib/components/asset-browser/asset-browser.component.ts | 3 +++ .../existing-adapters/existing-adapters.component.html | 1 + ui/src/app/pipelines/pipelines.component.html | 1 + 8 files changed, 19 insertions(+), 4 deletions(-) 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 18c4312478..5c84596a1f 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 @@ -39,6 +39,9 @@ export class AssetBrowserHierarchyComponent implements OnChanges { @Input() assetBrowserData: AssetBrowserData; + @Input() + allResourcesAlias = 'Resources'; + @Input() assetSelectionMode = false; @@ -88,7 +91,7 @@ export class AssetBrowserHierarchyComponent implements OnChanges { makeRootNode(): SpAsset { return { assetId: '_root', - assetName: 'All Resources', + assetName: `All ${this.allResourcesAlias}`, assetDescription: '', assetLinks: [], assets: this.assetBrowserData.assets, diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.ts index 3fe8b1f551..d261cc586d 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.ts +++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.ts @@ -36,7 +36,6 @@ export class AssetBrowserNodeInfoComponent implements OnInit { @Input() assetBrowserData: AssetBrowserData; - s; labels: SpLabel[] = []; assetType: string; diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.html index 2cee505d44..654a2b2aa8 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.html +++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.html @@ -26,7 +26,14 @@ fxFlex="100" (click)="emitSelectedNode(node)" > - <div fxFlex [ngClass]="nodeResourceCount > 0 ? '' : 'asset-node-disabled'"> + <div + fxFlex + [ngClass]=" + nodeResourceCount > 0 || assetSelectionMode + ? '' + : 'asset-node-disabled' + " + > <span fxLayoutAlign="start center">{{ node.assetName }} </span> </div> <div fxLayoutAlign="end center"> diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.ts index 23f53f82c1..7d7187919e 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.ts +++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.ts @@ -91,7 +91,7 @@ export class AssetBrowserNodeComponent implements OnInit, OnChanges { } emitSelectedNode(node: SpAsset): void { - if (this.nodeResourceCount > 0) { + if (this.nodeResourceCount > 0 || this.assetSelectionMode) { this.selectedNodeEmitter.emit(node); } } 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 fd32f8af47..17baed9a64 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 @@ -32,6 +32,7 @@ </div> @if (assetBrowserData?.assets?.length > 0 && expanded) { <sp-asset-browser-hierarchy + [allResourcesAlias]="allResourcesAlias" [assetBrowserData]="assetBrowserData" [assetSelectionMode]="assetSelectionMode" [resourceCount]="resourceCount" 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 4884f8a052..a1a4aa96ba 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 @@ -39,6 +39,9 @@ export class AssetBrowserComponent implements OnInit, OnDestroy { @Input() showResources = false; + @Input() + allResourcesAlias = 'Resources'; + @Input() browserWidth = 20; diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html index 916ac6240c..d5678d8f10 100644 --- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html +++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html @@ -18,6 +18,7 @@ <sp-asset-browser filteredAssetLinkType="adapter" + allResourcesAlias="Adapters" [resourceCount]="existingAdapters.length" (filterIdsEmitter)="applyAdapterFilters($event)" > diff --git a/ui/src/app/pipelines/pipelines.component.html b/ui/src/app/pipelines/pipelines.component.html index 0cb8afd7a1..1c1847df3a 100644 --- a/ui/src/app/pipelines/pipelines.component.html +++ b/ui/src/app/pipelines/pipelines.component.html @@ -18,6 +18,7 @@ <sp-asset-browser filteredAssetLinkType="pipeline" + allResourcesAlias="Pipelines" [resourceCount]="pipelines.length" (filterIdsEmitter)="applyPipelineFilters($event)" >
