From 16815cc343adba1a1bd7b6356f59acfbcf190c25 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Wed, 15 Mar 2023 23:33:13 +0200 Subject: [PATCH] RED-3800: remove buttons module --- apps/red-ui/src/app/app.module.ts | 2 ++ .../src/app/modules/account/account.module.ts | 13 ++++++++--- .../notifications/notifications.module.ts | 3 ++- .../user-profile/user-profile.module.ts | 3 ++- .../src/app/modules/admin/admin.module.ts | 8 +++++-- .../dossier-templates-listing.module.ts | 6 +++-- .../admin/screens/entities/entities.module.ts | 3 ++- .../info/dossier-template-info.module.ts | 3 +-- ...d-edit-justification-dialog.component.html | 3 +-- .../justifications/justifications.module.ts | 13 +++++++++-- .../admin/screens/reports/reports.module.ts | 6 ++--- .../rules-screen/rules-screen.component.ts | 1 - .../admin/screens/rules/rules.module.ts | 6 ++--- .../paginator/paginator.component.html | 6 +++-- .../screens/watermark/watermark.module.ts | 18 +++++++++++---- .../src/app/modules/archive/archive.module.ts | 11 ++++----- .../template-stats.component.html | 12 ++++++---- .../app/modules/dashboard/dashboard.module.ts | 4 ++-- .../file-attribute.component.html | 23 ++++++++++--------- .../dossier-overview.module.ts | 8 +++---- .../dossiers-listing.module.ts | 4 ---- .../file-preview/file-preview.module.ts | 14 ++++++----- .../shared-dossiers/shared-dossiers.module.ts | 6 +++-- .../src/app/modules/shared/shared.module.ts | 7 ++++-- .../trash-table-item.component.html | 4 ++-- .../src/app/modules/trash/trash.module.ts | 4 ++-- .../file-upload-download.module.ts | 4 ++-- libs/common-ui | 2 +- 28 files changed, 118 insertions(+), 79 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 0bfe6c1e0..2b93c463a 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -9,6 +9,7 @@ import { MissingTranslationHandler } from '@ngx-translate/core'; import { BASE_HREF, CachingModule, + CircleButtonComponent, CommonUiModule, IqserHelpModeModule, IqserLoadingModule, @@ -153,6 +154,7 @@ export const appModuleFactory = (config: AppConfig) => { } as ILoggerConfig, }, }), + CircleButtonComponent, ], 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 df77271c3..c9faf70ec 100644 --- a/apps/red-ui/src/app/modules/account/account.module.ts +++ b/apps/red-ui/src/app/modules/account/account.module.ts @@ -6,13 +6,20 @@ 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 { IqserSharedModule } from '@iqser/common-ui'; -import { IqserHelpModeModule } from '@iqser/common-ui'; +import { IconButtonComponent, IqserHelpModeModule, IqserSharedModule } from '@iqser/common-ui'; import { PreferencesComponent } from './screens/preferences/preferences.component'; @NgModule({ declarations: [AccountSideNavComponent, BaseAccountScreenComponent, PreferencesComponent], - imports: [CommonModule, SharedModule, AccountRoutingModule, TranslateModule, IqserSharedModule, IqserHelpModeModule], + imports: [ + CommonModule, + SharedModule, + AccountRoutingModule, + TranslateModule, + IqserSharedModule, + IqserHelpModeModule, + IconButtonComponent, + ], providers: [NotificationPreferencesService], }) export class AccountModule {} diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts b/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts index 4621b45c0..5cdaf8a16 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts @@ -5,11 +5,12 @@ import { SharedModule } from '@shared/shared.module'; import { NotificationsScreenComponent } from './notifications-screen/notifications-screen.component'; import { PendingChangesGuard } from '@guards/can-deactivate.guard'; import { TranslateModule } from '@ngx-translate/core'; +import { IconButtonComponent } from '@iqser/common-ui'; const routes = [{ path: '', component: NotificationsScreenComponent, canDeactivate: [PendingChangesGuard] }]; @NgModule({ declarations: [NotificationsScreenComponent], - imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule], + imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule, IconButtonComponent], }) export class NotificationsModule {} diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts index 6ef42fa66..72f352ea7 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts @@ -7,12 +7,13 @@ import { PendingChangesGuard } from '@guards/can-deactivate.guard'; import { TranslateModule } from '@ngx-translate/core'; import { ConfirmPasswordDialogComponent } from './confirm-password-dialog/confirm-password-dialog.component'; import { UserProfileDialogService } from './services/user-profile-dialog.service'; +import { CircleButtonComponent, IconButtonComponent } from '@iqser/common-ui'; const routes = [{ path: '', component: UserProfileScreenComponent, canDeactivate: [PendingChangesGuard] }]; @NgModule({ declarations: [UserProfileScreenComponent, ConfirmPasswordDialogComponent], - imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule], + imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule, IconButtonComponent, CircleButtonComponent], providers: [UserProfileDialogService], }) export class UserProfileModule {} 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 96ae930b9..ddabd1f2a 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -42,8 +42,10 @@ import { ConfigureCertificateDialogComponent } from './dialogs/configure-digital import { PkcsSignatureConfigurationComponent } from './dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component'; import { KmsSignatureConfigurationComponent } from './dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component'; import { + ChevronButtonComponent, + CircleButtonComponent, HumanizePipe, - IqserButtonsModule, + IconButtonComponent, IqserEmptyStatesModule, IqserHelpModeModule, IqserInputsModule, @@ -113,7 +115,6 @@ const components = [ IqserUsersModule, TranslateModule, HumanizePipe, - IqserButtonsModule, IqserListingModule, IqserScrollbarModule, IqserInputsModule, @@ -125,6 +126,9 @@ const components = [ AdminSideNavComponent, DossierTemplateActionsComponent, DossierTemplateBreadcrumbsComponent, + IconButtonComponent, + CircleButtonComponent, + ChevronButtonComponent, ], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts index aab8e565e..82f18874d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts @@ -5,7 +5,8 @@ import { SharedModule } from '@shared/shared.module'; import { TableItemComponent } from './table-item/table-item.component'; import { DossierTemplatesListingScreenComponent } from './dossier-templates-listing-screen/dossier-templates-listing-screen.component'; import { - IqserButtonsModule, + CircleButtonComponent, + IconButtonComponent, IqserHelpModeModule, IqserInputsModule, IqserListingModule, @@ -26,11 +27,12 @@ const routes = [{ path: '', component: DossierTemplatesListingScreenComponent }] IqserUsersModule, TranslateModule, IqserInputsModule, - IqserButtonsModule, IqserListingModule, IqserHelpModeModule, IqserPermissionsModule, DossierTemplateActionsComponent, + CircleButtonComponent, + IconButtonComponent, ], }) export class DossierTemplatesListingModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts index 25cc0a68b..ca43a2617 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts @@ -7,7 +7,7 @@ import { PendingChangesGuard } from '@guards/can-deactivate.guard'; import { EntityInfoComponent } from './screens/entity-info/entity-info.component'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { TranslateModule } from '@ngx-translate/core'; -import { IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule } from '@iqser/common-ui'; +import { IconButtonComponent, IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule } from '@iqser/common-ui'; const routes: Routes = [ { path: '', redirectTo: 'info', pathMatch: 'full' }, @@ -44,6 +44,7 @@ const routes: Routes = [ IqserScrollbarModule, IqserHelpModeModule, IqserPermissionsModule, + IconButtonComponent, ], }) export class EntitiesModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts index bd74d6021..fc4f7af02 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { DossierTemplateInfoScreenComponent } from './info-screen/dossier-template-info-screen.component'; import { RouterModule } from '@angular/router'; import { SharedModule } from '@shared/shared.module'; -import { IqserButtonsModule, IqserHelpModeModule, IqserScrollbarModule, IqserUsersModule } from '@iqser/common-ui'; +import { IqserHelpModeModule, IqserScrollbarModule, IqserUsersModule } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; const routes = [{ path: '', component: DossierTemplateInfoScreenComponent }]; @@ -16,7 +16,6 @@ const routes = [{ path: '', component: DossierTemplateInfoScreenComponent }]; SharedModule, IqserUsersModule, TranslateModule, - IqserButtonsModule, IqserScrollbarModule, IqserHelpModeModule, ], diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html index e5bb07198..a236f7090 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html @@ -48,8 +48,7 @@ [label]="'add-edit-justification.actions.save' | translate" [submit]="true" [type]="iconButtonTypes.primary" - > - + >
diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts index 5d0ff0eec..91f85d329 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications.module.ts @@ -7,13 +7,22 @@ import { TableItemComponent } from './table-item/table-item.component'; import { JustificationsDialogService } from './justifications-dialog.service'; import { AddEditJustificationDialogComponent } from './add-edit-justification-dialog/add-edit-justification-dialog.component'; import { TranslateModule } from '@ngx-translate/core'; -import { IqserButtonsModule, IqserListingModule } from '@iqser/common-ui'; +import { CircleButtonComponent, IconButtonComponent, IqserListingModule, IqserScrollbarModule } from '@iqser/common-ui'; const routes = [{ path: '', component: JustificationsScreenComponent }]; @NgModule({ declarations: [JustificationsScreenComponent, TableItemComponent, AddEditJustificationDialogComponent], - imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule, IqserButtonsModule, IqserListingModule], + imports: [ + RouterModule.forChild(routes), + CommonModule, + SharedModule, + TranslateModule, + IqserListingModule, + IconButtonComponent, + CircleButtonComponent, + IqserScrollbarModule, + ], providers: [JustificationsDialogService], }) export class JustificationsModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts index 6be448070..437cdf0ac 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts @@ -1,10 +1,9 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@shared/shared.module'; import { ReportsScreenComponent } from './reports-screen/reports-screen.component'; import { TranslateModule } from '@ngx-translate/core'; -import { IqserButtonsModule, IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule } from '@iqser/common-ui'; +import { CircleButtonComponent, IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule } from '@iqser/common-ui'; const routes = [{ path: '', component: ReportsScreenComponent }]; @@ -13,12 +12,11 @@ const routes = [{ path: '', component: ReportsScreenComponent }]; imports: [ RouterModule.forChild(routes), CommonModule, - SharedModule, TranslateModule, - IqserButtonsModule, IqserScrollbarModule, IqserHelpModeModule, IqserPermissionsModule, + CircleButtonComponent, ], }) export class ReportsModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts index 2e41aafe2..c819bdd82 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts @@ -13,7 +13,6 @@ import IModelDeltaDecoration = monaco.editor.IModelDeltaDecoration; import IStandaloneEditorConstructionOptions = monaco.editor.IStandaloneEditorConstructionOptions; @Component({ - selector: 'redaction-rules-screen', templateUrl: './rules-screen.component.html', styleUrls: ['./rules-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts b/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts index 7b8d87b2f..bd26cc278 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts @@ -1,17 +1,17 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@shared/shared.module'; import { RulesScreenComponent } from './rules-screen/rules-screen.component'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { PendingChangesGuard } from '@guards/can-deactivate.guard'; import { TranslateModule } from '@ngx-translate/core'; -import { IqserButtonsModule } from '@iqser/common-ui'; +import { IconButtonComponent } from '@iqser/common-ui'; +import { FormsModule } from '@angular/forms'; const routes = [{ path: '', component: RulesScreenComponent, canDeactivate: [PendingChangesGuard] }]; @NgModule({ declarations: [RulesScreenComponent], - imports: [RouterModule.forChild(routes), CommonModule, SharedModule, MonacoEditorModule, TranslateModule, IqserButtonsModule], + imports: [RouterModule.forChild(routes), CommonModule, MonacoEditorModule, TranslateModule, IconButtonComponent, FormsModule], }) export class RulesModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html index 896efd4d0..7c177e1ea 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/paginator/paginator.component.html @@ -1,10 +1,12 @@ @@ -42,7 +44,7 @@ [config]="translateChartService.translateDossierStates(dossierTemplate.dossiersChartConfig, dossierTemplate.id)" [radius]="63" [strokeWidth]="15" - [subtitles]="['dossier-template-stats.active-dossiers' | translate: { count: dossierTemplate.numberOfActiveDossiers }]" + [subtitles]="['dossier-template-stats.active-dossiers' | translate : { count: dossierTemplate.numberOfActiveDossiers }]" direction="row" totalType="sum" > diff --git a/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts b/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts index 6197c84c7..8bc4f730f 100644 --- a/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts +++ b/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts @@ -6,7 +6,7 @@ import { SharedModule } from '@shared/shared.module'; import { TemplateStatsComponent } from './components/template-stats/template-stats.component'; import { BreadcrumbTypes } from '@red/domain'; import { TranslateModule } from '@ngx-translate/core'; -import { IqserButtonsModule, IqserHelpModeModule, IqserPermissionsModule } from '@iqser/common-ui'; +import { IconButtonComponent, IqserHelpModeModule, IqserPermissionsModule } from '@iqser/common-ui'; const routes = [ { @@ -25,9 +25,9 @@ const routes = [ CommonModule, SharedModule, TranslateModule, - IqserButtonsModule, IqserHelpModeModule, IqserPermissionsModule, + IconButtonComponent, ], }) export class DashboardModule {} diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html index 69898c796..33c2410ec 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html @@ -5,35 +5,36 @@ -
+
-
+
- + +
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 3e2a64bfb..59075ab62 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 @@ -1,9 +1,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@shared/shared.module'; import { - IqserButtonsModule, + CircleButtonComponent, IqserHelpModeModule, IqserIconsModule, IqserInputsModule, @@ -26,6 +25,7 @@ import { WorkflowItemComponent } from './components/workflow-item/workflow-item. import { DossierOverviewScreenHeaderComponent } from './components/screen-header/dossier-overview-screen-header.component'; import { ViewModeSelectionComponent } from './components/view-mode-selection/view-mode-selection.component'; import { FileAttributeComponent } from './components/table-item/file-attribute/file-attribute.component'; +import { SharedModule } from '@shared/shared.module'; const routes: Routes = [ { @@ -54,19 +54,19 @@ const routes: Routes = [ imports: [ RouterModule.forChild(routes), CommonModule, - SharedModule, SharedDossiersModule, IqserIconsModule, TranslateModule, IqserHelpModeModule, IqserUsersModule, IqserListingModule, - IqserButtonsModule, IqserLoadingModule, IqserSharedModule, IqserScrollbarModule, IqserPermissionsModule, IqserInputsModule, + SharedModule, + CircleButtonComponent, ], }) 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 7bfb2c734..af6f75cfc 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 @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { CompositeRouteGuard, - IqserButtonsModule, IqserHelpModeModule, IqserIconsModule, IqserListingModule, @@ -10,7 +9,6 @@ import { IqserScrollbarModule, IqserSharedModule, IqserUsersModule, - LogPipe, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossiersListingScreenComponent } from './screen/dossiers-listing-screen.component'; @@ -53,12 +51,10 @@ const routes: Routes = [ TranslateModule, IqserHelpModeModule, IqserUsersModule, - IqserButtonsModule, IqserListingModule, IqserScrollbarModule, IqserSharedModule, IqserPermissionsModule, - LogPipe, ], }) 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 578db0e0e..db2a9712d 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 @@ -2,7 +2,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { CapitalizePipe, - IqserButtonsModule, + CircleButtonComponent, + IconButtonComponent, IqserEmptyStatesModule, IqserFiltersModule, IqserHelpModeModule, @@ -16,8 +17,6 @@ import { } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@shared/shared.module'; -import { SharedDossiersModule } from '../shared-dossiers/shared-dossiers.module'; import { FilePreviewScreenComponent } from './file-preview-screen.component'; import { FileWorkloadComponent } from './components/file-workload/file-workload.component'; import { AnnotationDetailsComponent } from './components/annotation-details/annotation-details.component'; @@ -55,6 +54,8 @@ import { RssDialogComponent } from './dialogs/rss-dialog/rss-dialog.component'; import { ReadonlyBannerComponent } from './components/readonly-banner/readonly-banner.component'; import { SuggestionsService } from './services/suggestions.service'; import { PagesComponent } from './components/pages/pages.component'; +import { SharedModule } from '@shared/shared.module'; +import { SharedDossiersModule } from '../shared-dossiers/shared-dossiers.module'; const routes: Routes = [ { @@ -108,15 +109,12 @@ const components = [ imports: [ RouterModule.forChild(routes), CommonModule, - SharedModule, - SharedDossiersModule, IqserIconsModule, TranslateModule, OverlayModule, IqserHelpModeModule, IqserUsersModule, CapitalizePipe, - IqserButtonsModule, IqserInputsModule, IqserSharedModule, IqserUploadFileModule, @@ -124,6 +122,10 @@ const components = [ IqserFiltersModule, IqserScrollbarModule, IqserPermissionsModule, + SharedModule, + CircleButtonComponent, + SharedDossiersModule, + IconButtonComponent, ], providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard, SuggestionsService], }) 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 0659a7b1b..b5728738f 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 @@ -13,7 +13,8 @@ import { DateColumnComponent } from './components/date-column/date-column.compon import { FileAssignService } from './services/file-assign.service'; import { DictionaryDetailsDialogComponent } from './dialogs/edit-dossier-dialog/dictionary/dictionary-details-dialog/dictionary-details-dialog.component'; import { - IqserButtonsModule, + CircleButtonComponent, + IconButtonComponent, IqserEmptyStatesModule, IqserHelpModeModule, IqserInputsModule, @@ -49,12 +50,13 @@ const services = [FileAssignService]; IqserHelpModeModule, IqserUsersModule, TranslateModule, - IqserButtonsModule, IqserEmptyStatesModule, IqserSharedModule, IqserInputsModule, IqserScrollbarModule, IqserPermissionsModule, + IconButtonComponent, + CircleButtonComponent, ], }) 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 c605caf46..0d5ed600a 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -9,7 +9,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AnnotationIconComponent } from './components/annotation-icon/annotation-icon.component'; import { DonutChartComponent } from './components/donut-chart/donut-chart.component'; import { - IqserButtonsModule, + CircleButtonComponent, + IconButtonComponent, IqserHelpModeModule, IqserPermissionsModule, IqserScrollbarModule, @@ -74,7 +75,7 @@ const utils = [DatePipe, NavigateLastDossiersScreenDirective, LongPressDirective const services = [SharedDialogService]; -const modules = [MatConfigModule, ScrollingModule, IconsModule, FormsModule, IqserButtonsModule, ReactiveFormsModule, ColorPickerModule]; +const modules = [MatConfigModule, ScrollingModule, IconsModule, FormsModule, ReactiveFormsModule, ColorPickerModule]; const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent]; @@ -92,6 +93,8 @@ const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent]; IqserScrollbarModule, IqserPermissionsModule, ...deleteThisWhenAllComponentsAreStandalone, + CircleButtonComponent, + IconButtonComponent, ], exports: [...modules, ...components, ...utils, ...deleteThisWhenAllComponentsAreStandalone], providers: [ diff --git a/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html b/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html index 6b289c9ac..c328c4ca3 100644 --- a/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html +++ b/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html @@ -29,13 +29,13 @@
- {{ item.softDeletedTime | date: 'exactDate' }} + {{ item.softDeletedTime | date : 'exactDate' }}
- {{ item.restoreDate | date: 'timeFromNow' }} + {{ item.restoreDate | date : 'timeFromNow' }}