From dc7b2e2041dc20ea6f51943fd647d7da43416eec Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 17 Mar 2023 22:57:22 +0200 Subject: [PATCH] RED-3800: update common-ui --- apps/red-ui/src/app/app.module.ts | 6 ++++-- apps/red-ui/src/app/modules/account/account.module.ts | 4 ++-- apps/red-ui/src/app/modules/admin/admin.module.ts | 2 -- .../modules/dossier-overview/dossier-overview.module.ts | 4 ++-- .../modules/dossiers-listing/dossiers-listing.module.ts | 4 ++-- .../src/app/modules/file-preview/file-preview.module.ts | 4 ++-- apps/red-ui/src/app/modules/search/search.module.ts | 4 ++-- .../app/modules/shared-dossiers/shared-dossiers.module.ts | 8 ++++++-- apps/red-ui/src/app/modules/shared/shared.module.ts | 4 ++-- libs/common-ui | 2 +- 10 files changed, 23 insertions(+), 19 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 11165b505..7f37bb617 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -16,13 +16,14 @@ import { IqserLoadingModule, IqserPermissionsModule, IqserPermissionsService, - IqserSharedModule, IqserTranslateModule, IqserUsersModule, LanguageService, + LogoComponent, MAX_RETRIES_ON_SERVER_ERROR, SERVER_ERROR_SKIP_PATHS, ServerErrorInterceptor, + SkeletonComponent, ToastComponent, } from '@iqser/common-ui'; import { ToastrModule } from 'ngx-toastr'; @@ -103,7 +104,6 @@ export const appModuleFactory = (config: AppConfig) => { existingUserService: UserService, existingRoleGuard: RedRoleGuard, }), - IqserSharedModule, CachingModule.forRoot(UI_CACHES), IqserHelpModeModule.forRoot(links), PdfViewerModule, @@ -157,6 +157,8 @@ export const appModuleFactory = (config: AppConfig) => { }), CircleButtonComponent, EmptyStateComponent, + SkeletonComponent, + LogoComponent, ], providers: [ { diff --git a/apps/red-ui/src/app/modules/account/account.module.ts b/apps/red-ui/src/app/modules/account/account.module.ts index c9faf70ec..a8b2382fa 100644 --- a/apps/red-ui/src/app/modules/account/account.module.ts +++ b/apps/red-ui/src/app/modules/account/account.module.ts @@ -6,7 +6,7 @@ import { AccountSideNavComponent } from './account-side-nav/account-side-nav.com import { BaseAccountScreenComponent } from './base-account-screen/base-account-screen-component'; import { NotificationPreferencesService } from './services/notification-preferences.service'; import { TranslateModule } from '@ngx-translate/core'; -import { IconButtonComponent, IqserHelpModeModule, IqserSharedModule } from '@iqser/common-ui'; +import { IconButtonComponent, IqserHelpModeModule, SideNavComponent } from '@iqser/common-ui'; import { PreferencesComponent } from './screens/preferences/preferences.component'; @NgModule({ @@ -16,9 +16,9 @@ import { PreferencesComponent } from './screens/preferences/preferences.componen SharedModule, AccountRoutingModule, TranslateModule, - IqserSharedModule, IqserHelpModeModule, IconButtonComponent, + SideNavComponent, ], providers: [NotificationPreferencesService], }) diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index b053b7a0a..c054923e9 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -52,7 +52,6 @@ import { IqserListingModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUploadFileModule, IqserUsersModule, } from '@iqser/common-ui'; @@ -119,7 +118,6 @@ const components = [ IqserScrollbarModule, IqserInputsModule, IqserUploadFileModule, - IqserSharedModule, IqserHelpModeModule, IqserPermissionsModule, AdminSideNavComponent, diff --git a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts index 0f963631a..4f3239d04 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts @@ -9,8 +9,8 @@ import { IqserLoadingModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUsersModule, + StatusBarComponent, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossierOverviewScreenComponent } from './screen/dossier-overview-screen.component'; @@ -59,12 +59,12 @@ const routes: Routes = [ IqserUsersModule, IqserListingModule, IqserLoadingModule, - IqserSharedModule, IqserScrollbarModule, IqserPermissionsModule, IqserInputsModule, SharedModule, CircleButtonComponent, + StatusBarComponent, ], }) export class DossierOverviewModule {} diff --git a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts index e357f9a02..51e67e566 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts @@ -6,8 +6,8 @@ import { IqserListingModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUsersModule, + StatusBarComponent, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossiersListingScreenComponent } from './screen/dossiers-listing-screen.component'; @@ -51,8 +51,8 @@ const routes: Routes = [ IqserUsersModule, IqserListingModule, IqserScrollbarModule, - IqserSharedModule, IqserPermissionsModule, + StatusBarComponent, ], }) export class DossiersListingModule {} diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts b/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts index 802ec7310..4b2817e9a 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts @@ -10,9 +10,9 @@ import { IqserInputsModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUploadFileModule, IqserUsersModule, + StatusBarComponent, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { RouterModule, Routes } from '@angular/router'; @@ -114,7 +114,6 @@ const components = [ IqserUsersModule, CapitalizePipe, IqserInputsModule, - IqserSharedModule, IqserUploadFileModule, IqserFiltersModule, IqserScrollbarModule, @@ -124,6 +123,7 @@ const components = [ SharedDossiersModule, IconButtonComponent, EmptyStateComponent, + StatusBarComponent, ], providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard, SuggestionsService], }) diff --git a/apps/red-ui/src/app/modules/search/search.module.ts b/apps/red-ui/src/app/modules/search/search.module.ts index 7a3f551fa..94862be23 100644 --- a/apps/red-ui/src/app/modules/search/search.module.ts +++ b/apps/red-ui/src/app/modules/search/search.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchScreenComponent } from './search-screen/search-screen.component'; import { RouterModule } from '@angular/router'; -import { IqserListingModule, IqserSharedModule, IqserUsersModule } from '@iqser/common-ui'; +import { IqserListingModule, IqserUsersModule, StatusBarComponent } from '@iqser/common-ui'; import { SharedModule } from '@shared/shared.module'; import { TranslateModule } from '@ngx-translate/core'; import { SearchItemTemplateComponent } from './search-item-template/search-item-template.component'; @@ -18,7 +18,7 @@ const routes = [{ path: '', component: SearchScreenComponent }]; IqserUsersModule, TranslateModule, IqserListingModule, - IqserSharedModule, + StatusBarComponent, ], }) export class SearchModule {} diff --git a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts index 9cea2ae59..e4538aff3 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts @@ -20,8 +20,10 @@ import { IqserInputsModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUsersModule, + SideNavComponent, + SmallChipComponent, + StatusBarComponent, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossiersListingActionsComponent } from './components/dossiers-listing-actions/dossiers-listing-actions.component'; @@ -50,13 +52,15 @@ const services = [FileAssignService]; IqserHelpModeModule, IqserUsersModule, TranslateModule, - IqserSharedModule, IqserInputsModule, IqserScrollbarModule, IqserPermissionsModule, IconButtonComponent, CircleButtonComponent, EmptyStateComponent, + SmallChipComponent, + StatusBarComponent, + SideNavComponent, ], }) export class SharedDossiersModule {} diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts index 0d5ed600a..c423823d2 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -14,8 +14,8 @@ import { IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule, - IqserSharedModule, IqserUsersModule, + SmallChipComponent, } from '@iqser/common-ui'; import { SelectComponent } from './components/select/select.component'; import { NavigateLastDossiersScreenDirective } from './directives/navigate-last-dossiers-screen.directive'; @@ -89,12 +89,12 @@ const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent]; RouterModule, IqserHelpModeModule, IqserUsersModule, - IqserSharedModule, IqserScrollbarModule, IqserPermissionsModule, ...deleteThisWhenAllComponentsAreStandalone, CircleButtonComponent, IconButtonComponent, + SmallChipComponent, ], exports: [...modules, ...components, ...utils, ...deleteThisWhenAllComponentsAreStandalone], providers: [ diff --git a/libs/common-ui b/libs/common-ui index 87b19da9a..8ac6f5831 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 87b19da9a900cbc9de8af666612bbae7aedff900 +Subproject commit 8ac6f583197b4b3771d7db403eccb99926714fbc