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 1c1ee920e8a47f77157e6a07407b57a6254a6cc0 Author: Dominik Riemer <[email protected]> AuthorDate: Mon Aug 19 23:12:17 2024 +0200 Move asset browser to shared-ui module --- .../src/lib/model/assets}/asset.constants.ts | 0 .../platform-services/src/public-api.ts | 2 ++ .../asset-browser-hierarchy.component.html | 0 .../asset-browser-hierarchy.component.scss | 0 .../asset-browser-hierarchy.component.ts | 0 .../asset-browser-node-info.component.html | 0 .../asset-browser-node-info.component.scss | 0 .../asset-browser-node-info.component.ts | 0 .../asset-browser-node.component.html | 0 .../asset-browser-node.component.scss | 0 .../asset-browser-node.component.ts | 0 .../asset-browser-filter-labels.component.html | 0 .../asset-browser-filter-labels.component.ts | 0 .../asset-browser-filter-outer.component.html | 0 .../asset-browser-filter-outer.component.ts | 0 .../asset-browser-filter-sites.component.html | 0 .../asset-browser-filter-sites.component.ts | 0 .../asset-browser-filter-type.component.html | 0 .../asset-browser-filter-type.component.ts | 0 .../asset-browser-filter.component.html | 0 .../asset-browser-filter.component.scss | 0 .../asset-browser-filter.component.ts | 0 .../asset-browser-toolbar.component.html | 0 .../asset-browser-toolbar.component.ts | 0 .../asset-browser/asset-browser.component.html | 4 +-- .../asset-browser/asset-browser.component.scss | 0 .../asset-browser/asset-browser.component.ts | 0 .../asset-browser/asset-browser.model.ts | 0 .../asset-browser/asset-browser.service.ts | 2 +- .../basic-field-description.component.ts | 2 +- .../shared-ui/src/lib/shared-ui.module.ts | 31 ++++++++++++++++++++++ .../streampipes/shared-ui/src/public-api.ts | 2 ++ .../asset-details-links.component.ts | 2 +- .../asset-details/asset-details.component.ts | 8 +++--- .../asset-overview/asset-overview.component.ts | 4 +-- .../asset-upload/asset-upload-dialog.component.ts | 2 +- .../manage-site/manage-site-dialog.component.ts | 2 +- .../site-area-configuration.component.ts | 2 +- ui/src/app/core-ui/core-ui.module.ts | 21 --------------- 39 files changed, 50 insertions(+), 34 deletions(-) diff --git a/ui/src/app/assets/constants/asset.constants.ts b/ui/projects/streampipes/platform-services/src/lib/model/assets/asset.constants.ts similarity index 100% rename from ui/src/app/assets/constants/asset.constants.ts rename to ui/projects/streampipes/platform-services/src/lib/model/assets/asset.constants.ts diff --git a/ui/projects/streampipes/platform-services/src/public-api.ts b/ui/projects/streampipes/platform-services/src/public-api.ts index 8e0d2d428c..bee1c3e53b 100644 --- a/ui/projects/streampipes/platform-services/src/public-api.ts +++ b/ui/projects/streampipes/platform-services/src/public-api.ts @@ -70,6 +70,8 @@ export * from './lib/model/user/user.model'; export * from './lib/model/assets/asset.model'; export * from './lib/model/labels/labels.model'; +export * from './lib/model/assets/asset.constants'; + export * from './lib/model/types/data-type'; export * from './lib/model/types/semantic-type'; diff --git a/ui/src/app/core-ui/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 similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.html rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.html diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.scss b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.scss similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.scss rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.scss diff --git a/ui/src/app/core-ui/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 similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.ts rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.ts diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.html 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.html similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.html rename to 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.html diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.scss 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.scss similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.scss rename to 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.scss diff --git a/ui/src/app/core-ui/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 similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.ts rename to 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 diff --git a/ui/src/app/core-ui/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 similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.html rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.html diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.scss b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.scss similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.scss rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.scss diff --git a/ui/src/app/core-ui/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 similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.ts rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.ts diff --git a/ui/src/app/core-ui/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 similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component.html rename to 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 diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component.ts 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.ts similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component.ts rename to 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.ts diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.html similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.html rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.html diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.ts similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.ts rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.ts diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.html similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.html rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.html diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.ts similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.ts rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.ts diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.html similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.html rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.html diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.ts similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.ts rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.ts diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.html similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.html rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.html diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.scss b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.scss similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.scss rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.scss diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.ts similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.ts rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.ts diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-toolbar.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-toolbar.component.html similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-toolbar.component.html rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-toolbar.component.html diff --git a/ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-toolbar.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-toolbar.component.ts similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser-toolbar/asset-browser-toolbar.component.ts rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-toolbar.component.ts diff --git a/ui/src/app/core-ui/asset-browser/asset-browser.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.html similarity index 96% rename from ui/src/app/core-ui/asset-browser/asset-browser.component.html rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.html index 0f19da89e8..fd32f8af47 100644 --- a/ui/src/app/core-ui/asset-browser/asset-browser.component.html +++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.html @@ -47,8 +47,8 @@ fxFlex="100" > <span class="asset-creation-hint" - >No assets configured yet - use assets to better - organize resources!</span + >No assets found - use assets to better organize + resources!</span > <button mat-button diff --git a/ui/src/app/core-ui/asset-browser/asset-browser.component.scss b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.scss similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser.component.scss rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.scss diff --git a/ui/src/app/core-ui/asset-browser/asset-browser.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.ts similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser.component.ts rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.ts diff --git a/ui/src/app/core-ui/asset-browser/asset-browser.model.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.model.ts similarity index 100% rename from ui/src/app/core-ui/asset-browser/asset-browser.model.ts rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.model.ts diff --git a/ui/src/app/core-ui/asset-browser/asset-browser.service.ts b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.service.ts similarity index 98% rename from ui/src/app/core-ui/asset-browser/asset-browser.service.ts rename to ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.service.ts index 01ff24133e..3b58e3d3e4 100644 --- a/ui/src/app/core-ui/asset-browser/asset-browser.service.ts +++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.service.ts @@ -19,6 +19,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, zip } from 'rxjs'; import { + AssetConstants, AssetSiteDesc, GenericStorageService, Isa95TypeDesc, @@ -26,7 +27,6 @@ import { SpAsset, SpLabel, } from '@streampipes/platform-services'; -import { AssetConstants } from '../../assets/constants/asset.constants'; import { AssetBrowserData, AssetFilter } from './asset-browser.model'; @Injectable({ providedIn: 'root' }) diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/basic-field-description/basic-field-description.component.ts b/ui/projects/streampipes/shared-ui/src/lib/components/basic-field-description/basic-field-description.component.ts index 51c95bb2e4..ef84ac7f0e 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/components/basic-field-description/basic-field-description.component.ts +++ b/ui/projects/streampipes/shared-ui/src/lib/components/basic-field-description/basic-field-description.component.ts @@ -16,7 +16,7 @@ * */ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; @Component({ selector: 'sp-basic-field-description', diff --git a/ui/projects/streampipes/shared-ui/src/lib/shared-ui.module.ts b/ui/projects/streampipes/shared-ui/src/lib/shared-ui.module.ts index 20143d92f7..d5b90cf68d 100644 --- a/ui/projects/streampipes/shared-ui/src/lib/shared-ui.module.ts +++ b/ui/projects/streampipes/shared-ui/src/lib/shared-ui.module.ts @@ -45,9 +45,34 @@ import { MatSort } from '@angular/material/sort'; import { SpExceptionDetailsComponent } from './components/sp-exception-message/exception-details/exception-details.component'; import { SpWarningBoxComponent } from './components/warning-box/warning-box.component'; import { SpBasicFieldDescriptionComponent } from './components/basic-field-description/basic-field-description.component'; +import { AssetBrowserToolbarComponent } from './components/asset-browser/asset-browser-toolbar/asset-browser-toolbar.component'; +import { AssetBrowserFilterComponent } from './components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component'; +import { AssetBrowserComponent } from './components/asset-browser/asset-browser.component'; +import { AssetBrowserFilterLabelsComponent } from './components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component'; +import { AssetBrowserFilterOuterComponent } from './components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component'; +import { AssetBrowserFilterSitesComponent } from './components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component'; +import { AssetBrowserFilterTypeComponent } from './components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component'; +import { AssetBrowserHierarchyComponent } from './components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component'; +import { AssetBrowserNodeComponent } from './components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component'; +import { AssetBrowserNodeInfoComponent } from './components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component'; +import { MatSelectModule } from '@angular/material/select'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatMenuModule } from '@angular/material/menu'; +import { FormsModule } from '@angular/forms'; +import { MatTreeModule } from '@angular/material/tree'; @NgModule({ declarations: [ + AssetBrowserComponent, + AssetBrowserFilterComponent, + AssetBrowserFilterLabelsComponent, + AssetBrowserFilterOuterComponent, + AssetBrowserFilterSitesComponent, + AssetBrowserFilterTypeComponent, + AssetBrowserHierarchyComponent, + AssetBrowserNodeComponent, + AssetBrowserNodeInfoComponent, + AssetBrowserToolbarComponent, ConfirmDialogComponent, PanelDialogComponent, StandardDialogComponent, @@ -67,11 +92,16 @@ import { SpBasicFieldDescriptionComponent } from './components/basic-field-descr imports: [ CommonModule, FlexLayoutModule, + FormsModule, MatButtonModule, MatDividerModule, + MatFormFieldModule, MatIconModule, + MatMenuModule, + MatSelectModule, MatTabsModule, MatTooltipModule, + MatTreeModule, PortalModule, OverlayModule, MatDialogModule, @@ -80,6 +110,7 @@ import { SpBasicFieldDescriptionComponent } from './components/basic-field-descr MatSort, ], exports: [ + AssetBrowserComponent, ConfirmDialogComponent, PanelDialogComponent, StandardDialogComponent, diff --git a/ui/projects/streampipes/shared-ui/src/public-api.ts b/ui/projects/streampipes/shared-ui/src/public-api.ts index 0e30f53d46..a923f5abbc 100644 --- a/ui/projects/streampipes/shared-ui/src/public-api.ts +++ b/ui/projects/streampipes/shared-ui/src/public-api.ts @@ -26,6 +26,7 @@ export * from './lib/dialog/confirm-dialog/confirm-dialog.component'; export * from './lib/dialog/panel-dialog/panel-dialog.component'; export * from './lib/dialog/standard-dialog/standard-dialog.component'; +export * from './lib/components/asset-browser/asset-browser.component'; export * from './lib/components/basic-header-title/header-title.component'; export * from './lib/components/basic-inner-panel/basic-inner-panel.component'; export * from './lib/components/basic-field-description/basic-field-description.component'; @@ -46,3 +47,4 @@ export * from './lib/services/jwt-token-storage.service'; export * from './lib/services/current-user.service'; export * from './lib/services/echarts-toolbox.service'; export * from './lib/services/colorization.service'; +export * from './lib/components/asset-browser/asset-browser.service'; diff --git a/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-links/asset-details-links.component.ts b/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-links/asset-details-links.component.ts index b9baa36975..56fd818cd6 100644 --- a/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-links/asset-details-links.component.ts +++ b/ui/src/app/assets/components/asset-details/asset-details-panel/asset-details-links/asset-details-links.component.ts @@ -26,7 +26,7 @@ import { import { SpManageAssetLinksDialogComponent } from '../../../../dialog/manage-asset-links/manage-asset-links-dialog.component'; import { DialogService, PanelType } from '@streampipes/shared-ui'; import { EditAssetLinkDialogComponent } from '../../../../dialog/edit-asset-link/edit-asset-link-dialog.component'; -import { AssetConstants } from '../../../../constants/asset.constants'; +import { AssetConstants } from '../../../../../../../projects/streampipes/platform-services/src/lib/model/assets/asset.constants'; @Component({ selector: 'sp-asset-details-links', diff --git a/ui/src/app/assets/components/asset-details/asset-details.component.ts b/ui/src/app/assets/components/asset-details/asset-details.component.ts index 5b7028ef92..234072c8f8 100644 --- a/ui/src/app/assets/components/asset-details/asset-details.component.ts +++ b/ui/src/app/assets/components/asset-details/asset-details.component.ts @@ -17,10 +17,13 @@ */ import { Component, OnInit } from '@angular/core'; -import { SpBreadcrumbService } from '@streampipes/shared-ui'; +import { + SpAssetBrowserService, + SpBreadcrumbService, +} from '@streampipes/shared-ui'; import { ActivatedRoute } from '@angular/router'; -import { AssetConstants } from '../../constants/asset.constants'; import { + AssetConstants, AssetSiteDesc, GenericStorageService, SpAsset, @@ -28,7 +31,6 @@ import { } from '@streampipes/platform-services'; import { SpAssetRoutes } from '../../assets.routes'; import { zip } from 'rxjs'; -import { SpAssetBrowserService } from '../../../core-ui/asset-browser/asset-browser.service'; @Component({ selector: 'sp-asset-details', diff --git a/ui/src/app/assets/components/asset-overview/asset-overview.component.ts b/ui/src/app/assets/components/asset-overview/asset-overview.component.ts index 219c0551e2..d96db14773 100644 --- a/ui/src/app/assets/components/asset-overview/asset-overview.component.ts +++ b/ui/src/app/assets/components/asset-overview/asset-overview.component.ts @@ -19,13 +19,14 @@ import { Component, OnInit } from '@angular/core'; import { MatTableDataSource } from '@angular/material/table'; import { + AssetConstants, GenericStorageService, SpAssetModel, } from '@streampipes/platform-services'; -import { AssetConstants } from '../../constants/asset.constants'; import { DialogService, PanelType, + SpAssetBrowserService, SpBreadcrumbService, } from '@streampipes/shared-ui'; import { SpAssetRoutes } from '../../assets.routes'; @@ -36,7 +37,6 @@ import { DataExportService } from '../../../configuration/export/data-export.ser import { mergeMap } from 'rxjs/operators'; import { saveAs } from 'file-saver'; import { IdGeneratorService } from '../../../core-services/id-generator/id-generator.service'; -import { SpAssetBrowserService } from '../../../core-ui/asset-browser/asset-browser.service'; @Component({ selector: 'sp-asset-overview', diff --git a/ui/src/app/assets/dialog/asset-upload/asset-upload-dialog.component.ts b/ui/src/app/assets/dialog/asset-upload/asset-upload-dialog.component.ts index 090b1bc477..7c17908de5 100644 --- a/ui/src/app/assets/dialog/asset-upload/asset-upload-dialog.component.ts +++ b/ui/src/app/assets/dialog/asset-upload/asset-upload-dialog.component.ts @@ -19,7 +19,7 @@ import { Component } from '@angular/core'; import { DialogRef } from '@streampipes/shared-ui'; import { GenericStorageService } from '@streampipes/platform-services'; -import { AssetConstants } from '../../constants/asset.constants'; +import { AssetConstants } from '../../../../../projects/streampipes/platform-services/src/lib/model/assets/asset.constants'; @Component({ selector: 'sp-file-upload-dialog-component', diff --git a/ui/src/app/configuration/dialog/manage-site/manage-site-dialog.component.ts b/ui/src/app/configuration/dialog/manage-site/manage-site-dialog.component.ts index 0c69f44770..4fce563f0b 100644 --- a/ui/src/app/configuration/dialog/manage-site/manage-site-dialog.component.ts +++ b/ui/src/app/configuration/dialog/manage-site/manage-site-dialog.component.ts @@ -23,7 +23,7 @@ import { GenericStorageService, LocationConfig, } from '@streampipes/platform-services'; -import { AssetConstants } from '../../../assets/constants/asset.constants'; +import { AssetConstants } from '../../../../../projects/streampipes/platform-services/src/lib/model/assets/asset.constants'; @Component({ selector: 'sp-manage-site-dialog-component', diff --git a/ui/src/app/configuration/sites-configuration/site-area-configuration/site-area-configuration.component.ts b/ui/src/app/configuration/sites-configuration/site-area-configuration/site-area-configuration.component.ts index d0de6e25e9..c6944829d6 100644 --- a/ui/src/app/configuration/sites-configuration/site-area-configuration/site-area-configuration.component.ts +++ b/ui/src/app/configuration/sites-configuration/site-area-configuration/site-area-configuration.component.ts @@ -22,7 +22,7 @@ import { GenericStorageService, LocationConfig, } from '@streampipes/platform-services'; -import { AssetConstants } from '../../../assets/constants/asset.constants'; +import { AssetConstants } from '../../../../../projects/streampipes/platform-services/src/lib/model/assets/asset.constants'; import { MatTableDataSource } from '@angular/material/table'; import { ManageSiteDialogComponent } from '../../dialog/manage-site/manage-site-dialog.component'; import { DialogService, PanelType } from '@streampipes/shared-ui'; diff --git a/ui/src/app/core-ui/core-ui.module.ts b/ui/src/app/core-ui/core-ui.module.ts index f44ef42248..bf9a91ff30 100644 --- a/ui/src/app/core-ui/core-ui.module.ts +++ b/ui/src/app/core-ui/core-ui.module.ts @@ -116,16 +116,6 @@ import { StaticTreeInputNodeDetailsComponent } from './static-properties/static- import { SingleMarkerMapComponent } from './single-marker-map/single-marker-map.component'; import { LeafletModule } from '@asymmetrik/ngx-leaflet'; import { StaticTreeInputTextEditorComponent } from './static-properties/static-runtime-resolvable-tree-input/static-tree-input-text-editor/static-tree-input-text-editor.component'; -import { AssetBrowserComponent } from './asset-browser/asset-browser.component'; -import { AssetBrowserToolbarComponent } from './asset-browser/asset-browser-toolbar/asset-browser-toolbar.component'; -import { AssetBrowserHierarchyComponent } from './asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component'; -import { AssetBrowserNodeComponent } from './asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component'; -import { AssetBrowserFilterComponent } from './asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component'; -import { AssetBrowserFilterLabelsComponent } from './asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component'; -import { AssetBrowserFilterSitesComponent } from './asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component'; -import { AssetBrowserFilterTypeComponent } from './asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component'; -import { AssetBrowserFilterOuterComponent } from './asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component'; -import { AssetBrowserNodeInfoComponent } from './asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component'; @NgModule({ imports: [ @@ -178,16 +168,6 @@ import { AssetBrowserNodeInfoComponent } from './asset-browser/asset-browser-hie LeafletModule, ], declarations: [ - AssetBrowserComponent, - AssetBrowserFilterComponent, - AssetBrowserFilterLabelsComponent, - AssetBrowserFilterOuterComponent, - AssetBrowserFilterSitesComponent, - AssetBrowserFilterTypeComponent, - AssetBrowserHierarchyComponent, - AssetBrowserNodeComponent, - AssetBrowserNodeInfoComponent, - AssetBrowserToolbarComponent, DataDownloadDialogComponent, DateInputComponent, DisplayRecommendedPipe, @@ -243,7 +223,6 @@ import { AssetBrowserNodeInfoComponent } from './asset-browser/asset-browser-hie ], providers: [MatDatepickerModule, DisplayRecommendedPipe], exports: [ - AssetBrowserComponent, DataDownloadDialogComponent, DateInputComponent, PipelineElementTemplateConfigComponent,
