From 844971e241e0312479ea67859db80dbfc6e98d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 21 Dec 2021 16:32:02 +0200 Subject: [PATCH 1/7] Dossier template info --- .../base-screen/base-screen.component.ts | 2 - .../modules/account/account-routing.module.ts | 2 +- .../user-profile-screen.component.ts | 22 ++-- .../notification-preferences.service.ts | 18 ++-- .../app/modules/admin/admin-routing.module.ts | 18 +++- .../admin-side-nav.component.ts | 1 + .../src/app/modules/admin/admin.module.ts | 17 +-- .../base-admin-screen.component.html | 27 +---- .../base-admin-screen.component.scss | 3 + .../base-admin-screen.component.ts | 1 - ...ase-dossier-template-screen.component.html | 26 +++++ .../base-dossier-template-screen.component.ts | 7 ++ .../admin-breadcrumbs.component.ts | 21 ---- ...ssier-template-breadcrumbs.component.html} | 11 +- ...ssier-template-breadcrumbs.component.scss} | 0 .../dossier-template-breadcrumbs.component.ts | 32 ++++++ .../add-edit-dictionary-dialog.component.html | 2 +- ...it-dossier-attribute-dialog.component.html | 2 +- ...dit-dossier-template-dialog.component.html | 2 +- ...-edit-dossier-template-dialog.component.ts | 1 - ...-edit-file-attribute-dialog.component.html | 2 +- .../edit-color-dialog.component.html | 2 +- .../default-colors-screen.component.html | 2 +- .../dictionary-listing-screen.component.html | 80 +++++++------- .../dictionary-listing-screen.component.ts | 77 +++++--------- .../dictionary-overview-screen.component.html | 2 +- ...r-attributes-listing-screen.component.html | 2 +- ...er-templates-listing-screen.component.html | 100 ------------------ ...er-templates-listing-screen.component.html | 47 ++++++++ ...er-templates-listing-screen.component.scss | 6 ++ ...sier-templates-listing-screen.component.ts | 30 +----- .../dossier-templates-listing.module.ts | 16 +++ .../table-item/table-item.component.html | 35 ++++++ .../table-item/table-item.component.scss} | 0 .../table-item/table-item.component.ts | 28 +++++ ...e-attributes-listing-screen.component.html | 2 +- .../info/dossier-template-info.module.ts | 13 +++ ...ossier-template-info-screen.component.html | 41 +++++++ ...ossier-template-info-screen.component.scss | 30 ++++++ .../dossier-template-info-screen.component.ts | 26 +++++ .../reports/reports-screen.component.html | 2 +- .../screens/rules/rules-screen.component.html | 2 +- .../watermark/watermark-screen.component.html | 2 +- .../dossier-template-actions.component.html | 0 .../dossier-template-actions.component.scss | 0 .../dossier-template-actions.component.ts | 10 +- .../admin/shared/shared-admin.module.ts | 14 +++ .../edit-dossier-dialog.component.html | 2 +- .../document-info/document-info.component.ts | 2 +- .../shared/services/dictionary.service.ts | 98 +++++++++-------- .../entity-services/dossier-stats.service.ts | 46 +------- .../dossier-template-stats.service.ts | 12 +++ .../dossier-templates.service.ts | 23 ++-- .../entity-services/dossiers.service.ts | 2 +- apps/red-ui/src/assets/config/config.json | 4 +- apps/red-ui/src/assets/i18n/en.json | 9 ++ libs/common-ui | 2 +- .../dossier-template-stats.model.ts | 23 ++++ .../dossier-template-stats.ts | 12 +++ .../dossier-template.model.ts | 4 +- .../src/lib/dossier-templates/index.ts | 2 + 61 files changed, 608 insertions(+), 419 deletions(-) create mode 100644 apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.html create mode 100644 apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.ts delete mode 100644 apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.ts rename apps/red-ui/src/app/modules/admin/components/{breadcrumbs/admin-breadcrumbs.component.html => dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html} (72%) rename apps/red-ui/src/app/modules/admin/components/{breadcrumbs/admin-breadcrumbs.component.scss => dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.scss} (100%) create mode 100644 apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts delete mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html create mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html create mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.scss rename apps/red-ui/src/app/modules/admin/screens/{dossier-template-listing => dossier-templates-listing/dossier-templates-listing-screen}/dossier-templates-listing-screen.component.ts (78%) create mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts create mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.html rename apps/red-ui/src/app/modules/admin/screens/{dossier-template-listing/dossier-templates-listing-screen.component.scss => dossier-templates-listing/table-item/table-item.component.scss} (100%) create mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts create mode 100644 apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts create mode 100644 apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html create mode 100644 apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.scss create mode 100644 apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts rename apps/red-ui/src/app/modules/admin/{ => shared}/components/dossier-template-actions/dossier-template-actions.component.html (100%) rename apps/red-ui/src/app/modules/admin/{ => shared}/components/dossier-template-actions/dossier-template-actions.component.scss (100%) rename apps/red-ui/src/app/modules/admin/{ => shared}/components/dossier-template-actions/dossier-template-actions.component.ts (87%) create mode 100644 apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts create mode 100644 apps/red-ui/src/app/services/entity-services/dossier-template-stats.service.ts create mode 100644 libs/red-domain/src/lib/dossier-templates/dossier-template-stats.model.ts create mode 100644 libs/red-domain/src/lib/dossier-templates/dossier-template-stats.ts diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts index 759273a83..3392423a7 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts @@ -9,7 +9,6 @@ import { TranslateService } from '@ngx-translate/core'; import { SpotlightSearchAction } from '@components/spotlight-search/spotlight-search-action'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { filter, map, startWith } from 'rxjs/operators'; -import { DossiersService } from '@services/entity-services/dossiers.service'; import { shareDistinctLast } from '@iqser/common-ui'; import { BreadcrumbsService } from '@services/breadcrumbs.service'; @@ -77,7 +76,6 @@ export class BaseScreenComponent { constructor( readonly appStateService: AppStateService, - readonly dossiersService: DossiersService, readonly userService: UserService, readonly userPreferenceService: UserPreferenceService, readonly titleService: Title, diff --git a/apps/red-ui/src/app/modules/account/account-routing.module.ts b/apps/red-ui/src/app/modules/account/account-routing.module.ts index 9c77d73a2..56164ffa9 100644 --- a/apps/red-ui/src/app/modules/account/account-routing.module.ts +++ b/apps/red-ui/src/app/modules/account/account-routing.module.ts @@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router'; import { CompositeRouteGuard } from '@iqser/common-ui'; import { AuthGuard } from '../auth/auth.guard'; import { RedRoleGuard } from '../auth/red-role.guard'; -import { AppStateGuard } from '../../state/app-state.guard'; +import { AppStateGuard } from '@state/app-state.guard'; import { BaseAccountScreenComponent } from './base-account-screen/base-account-screen-component'; const routes = [ diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts index 8c3d896bf..6531660b4 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts @@ -5,8 +5,8 @@ import { TranslateService } from '@ngx-translate/core'; import { LoadingService } from '@iqser/common-ui'; import { IProfile } from '@red/domain'; import { languagesTranslations } from '../../../translations/languages-translations'; -import { PermissionsService } from '../../../../../services/permissions.service'; -import { UserService } from '../../../../../services/user.service'; +import { PermissionsService } from '@services/permissions.service'; +import { UserService } from '@services/user.service'; import { ConfigService } from '../../../../../services/config.service'; import { LanguageService } from '../../../../../i18n/language.service'; @@ -40,15 +40,6 @@ export class UserProfileScreenComponent implements OnInit { ); } - private _getForm(): FormGroup { - return this._formBuilder.group({ - email: [undefined, [Validators.required, Validators.email]], - firstName: [undefined], - lastName: [undefined], - language: [undefined], - }); - } - get languageChanged(): boolean { return this._profileModel['language'] !== this.form.get('language').value; } @@ -98,6 +89,15 @@ export class UserProfileScreenComponent implements OnInit { this._initializeForm(); } + private _getForm(): FormGroup { + return this._formBuilder.group({ + email: [undefined, [Validators.required, Validators.email]], + firstName: [undefined], + lastName: [undefined], + language: [undefined], + }); + } + private _initializeForm(): void { try { this._profileModel = { diff --git a/apps/red-ui/src/app/modules/account/services/notification-preferences.service.ts b/apps/red-ui/src/app/modules/account/services/notification-preferences.service.ts index acd23a718..0d875dfed 100644 --- a/apps/red-ui/src/app/modules/account/services/notification-preferences.service.ts +++ b/apps/red-ui/src/app/modules/account/services/notification-preferences.service.ts @@ -1,7 +1,7 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService } from '@iqser/common-ui'; import { Observable, of } from 'rxjs'; -import { UserService } from '../../../services/user.service'; +import { UserService } from '@services/user.service'; import { EmailNotificationScheduleTypes, INotificationPreferences } from '@red/domain'; import { catchError } from 'rxjs/operators'; @@ -11,14 +11,6 @@ export class NotificationPreferencesService extends GenericService { - return super.get().pipe(catchError(() => of(this._defaultPreferences))); - } - - update(notificationPreferences: INotificationPreferences): Observable { - return super._post(notificationPreferences); - } - private get _defaultPreferences(): INotificationPreferences { return { emailNotificationType: EmailNotificationScheduleTypes.INSTANT, @@ -28,4 +20,12 @@ export class NotificationPreferencesService extends GenericService { + return super.get().pipe(catchError(() => of(this._defaultPreferences))); + } + + update(notificationPreferences: INotificationPreferences): Observable { + return super._post(notificationPreferences); + } } diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts index 74ee574cc..f9335bfd3 100644 --- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts @@ -3,7 +3,6 @@ import { AuthGuard } from '../auth/auth.guard'; import { CompositeRouteGuard } from '@iqser/common-ui'; import { RedRoleGuard } from '../auth/red-role.guard'; import { AppStateGuard } from '@state/app-state.guard'; -import { DossierTemplatesListingScreenComponent } from './screens/dossier-template-listing/dossier-templates-listing-screen.component'; import { DictionaryListingScreenComponent } from './screens/dictionary-listing/dictionary-listing-screen.component'; import { DictionaryOverviewScreenComponent } from './screens/dictionary-overview/dictionary-overview-screen.component'; import { PendingChangesGuard } from '@guards/can-deactivate.guard'; @@ -21,6 +20,7 @@ import { DossierAttributesListingScreenComponent } from './screens/dossier-attri import { TrashScreenComponent } from './screens/trash/trash-screen.component'; import { GeneralConfigScreenComponent } from './screens/general-config/general-config-screen.component'; import { BaseAdminScreenComponent } from './base-admin-screen/base-admin-screen.component'; +import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-screen/base-dossier-template-screen.component'; const routes: Routes = [ { path: '', redirectTo: 'dossier-templates', pathMatch: 'full' }, @@ -29,15 +29,25 @@ const routes: Routes = [ children: [ { path: '', - component: DossierTemplatesListingScreenComponent, + component: BaseAdminScreenComponent, canActivate: [CompositeRouteGuard], data: { routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard], }, + loadChildren: () => + import('./screens/dossier-templates-listing/dossier-templates-listing.module').then( + m => m.DossierTemplatesListingModule, + ), }, { path: ':dossierTemplateId', children: [ + { + path: 'info', + canActivate: [CompositeRouteGuard], + component: BaseDossierTemplateScreenComponent, + loadChildren: () => import('./screens/info/dossier-template-info.module').then(m => m.DossierTemplateInfoModule), + }, { path: 'dictionaries', children: [ @@ -111,11 +121,11 @@ const routes: Routes = [ }, { path: 'justifications', - component: BaseAdminScreenComponent, + component: BaseDossierTemplateScreenComponent, canActivate: [CompositeRouteGuard], loadChildren: () => import('./screens/justifications/justifications.module').then(m => m.JustificationsModule), }, - { path: '', redirectTo: 'dictionaries', pathMatch: 'full' }, + { path: '', redirectTo: 'info', pathMatch: 'full' }, ], }, ], diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts index 8dd9f629d..382f10309 100644 --- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts +++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts @@ -50,6 +50,7 @@ export class AdminSideNavComponent implements OnInit { }, ], dossierTemplates: [ + { screen: 'info', label: _('dossier-template-info') }, { screen: 'dictionaries', label: _('dictionaries') }, { screen: 'rules', 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 7fcf4642b..81a7a91b0 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'; import { AdminRoutingModule } from './admin-routing.module'; import { RulesScreenComponent } from './screens/rules/rules-screen.component'; import { SharedModule } from '@shared/shared.module'; -import { DossierTemplatesListingScreenComponent } from './screens/dossier-template-listing/dossier-templates-listing-screen.component'; import { AuditScreenComponent } from './screens/audit/audit-screen.component'; import { DefaultColorsScreenComponent } from './screens/default-colors/default-colors-screen.component'; import { DictionaryListingScreenComponent } from './screens/dictionary-listing/dictionary-listing-screen.component'; @@ -13,8 +12,7 @@ import { FileAttributesListingScreenComponent } from './screens/file-attributes- import { LicenseInformationScreenComponent } from './screens/license-information/license-information-screen.component'; import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component'; import { WatermarkScreenComponent } from './screens/watermark/watermark-screen.component'; -import { AdminBreadcrumbsComponent } from './components/breadcrumbs/admin-breadcrumbs.component'; -import { DossierTemplateActionsComponent } from './components/dossier-template-actions/dossier-template-actions.component'; +import { DossierTemplateBreadcrumbsComponent } from './components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component'; import { ColorPickerModule } from 'ngx-color-picker'; import { AddEditFileAttributeDialogComponent } from './dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component'; import { AddEditDossierTemplateDialogComponent } from './dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component'; @@ -48,6 +46,8 @@ import { SmtpConfigService } from './services/smtp-config.service'; import { UploadDictionaryDialogComponent } from './dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component'; import { GeneralConfigFormComponent } from './screens/general-config/general-config-form/general-config-form.component'; import { SmtpFormComponent } from './screens/general-config/smtp-form/smtp-form.component'; +import { SharedAdminModule } from './shared/shared-admin.module'; +import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-screen/base-dossier-template-screen.component'; const dialogs = [ AddEditDossierTemplateDialogComponent, @@ -64,7 +64,6 @@ const dialogs = [ ]; const screens = [ - DossierTemplatesListingScreenComponent, RulesScreenComponent, AuditScreenComponent, DefaultColorsScreenComponent, @@ -82,8 +81,7 @@ const screens = [ ]; const components = [ - AdminBreadcrumbsComponent, - DossierTemplateActionsComponent, + DossierTemplateBreadcrumbsComponent, ComboChartComponent, ComboSeriesVerticalComponent, UsersStatsComponent, @@ -92,14 +90,17 @@ const components = [ ResetPasswordComponent, UserDetailsComponent, BaseAdminScreenComponent, + BaseDossierTemplateScreenComponent, + GeneralConfigFormComponent, + SmtpFormComponent, ...dialogs, ...screens, ]; @NgModule({ - declarations: [...components, GeneralConfigFormComponent, SmtpFormComponent], + declarations: [...components], providers: [AdminDialogService, AuditService, DigitalSignatureService, LicenseReportService, RulesService, SmtpConfigService], - imports: [CommonModule, SharedModule, AdminRoutingModule, NgxChartsModule, ColorPickerModule, MonacoEditorModule], + imports: [CommonModule, SharedModule, AdminRoutingModule, SharedAdminModule, NgxChartsModule, ColorPickerModule, MonacoEditorModule], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.html b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.html index e4f858437..4f54ba8f4 100644 --- a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.html @@ -1,26 +1,5 @@ - +
-
-
- + -
- - - -
-
- -
-
- - - - -
-
+ diff --git a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.scss b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.scss index e69de29bb..e7a72018d 100644 --- a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.scss @@ -0,0 +1,3 @@ +:host { + display: flex; +} diff --git a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts index fd4af2801..f15acbbb4 100644 --- a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts @@ -1,7 +1,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; @Component({ - selector: 'redaction-base-admin-screen', templateUrl: './base-admin-screen.component.html', styleUrls: ['./base-admin-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.html b/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.html new file mode 100644 index 000000000..ee08d19cc --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.html @@ -0,0 +1,26 @@ + + +
+
+ + +
+ + + +
+
+ +
+
+ + + + +
+
diff --git a/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.ts b/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.ts new file mode 100644 index 000000000..298ec017c --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.ts @@ -0,0 +1,7 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; + +@Component({ + templateUrl: './base-dossier-template-screen.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class BaseDossierTemplateScreenComponent {} diff --git a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.ts b/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.ts deleted file mode 100644 index 3c1d06a08..000000000 --- a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { AppStateService } from '@state/app-state.service'; -import { UserPreferenceService } from '@services/user-preference.service'; -import { PermissionsService } from '@services/permissions.service'; -import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; - -@Component({ - selector: 'redaction-admin-breadcrumbs', - templateUrl: './admin-breadcrumbs.component.html', - styleUrls: ['./admin-breadcrumbs.component.scss'], -}) -export class AdminBreadcrumbsComponent { - @Input() root = false; - - constructor( - readonly userPreferenceService: UserPreferenceService, - readonly permissionService: PermissionsService, - readonly appStateService: AppStateService, - readonly dossierTemplatesService: DossierTemplatesService, - ) {} -} diff --git a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html similarity index 72% rename from apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html rename to apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html index 1afff1dac..4378310a0 100644 --- a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html +++ b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html @@ -6,10 +6,11 @@ translate="dossier-templates" > - - - - {{ activeDossierTemplate.name }} + + + + + {{ dossierTemplate.name }} @@ -17,7 +18,7 @@ ; + + constructor( + readonly userPreferenceService: UserPreferenceService, + readonly permissionService: PermissionsService, + readonly appStateService: AppStateService, + readonly dossierTemplatesService: DossierTemplatesService, + private readonly _route: ActivatedRoute, + ) { + this.dossierTemplate$ = _route.paramMap.pipe( + map(params => params.get('dossierTemplateId')), + switchMap((dossierTemplateId: string) => this.dossierTemplatesService.getEntityChanged$(dossierTemplateId)), + ); + } +} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html index 2e69716c7..903caceaf 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html @@ -95,7 +95,7 @@
-
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html index ab55a854a..0eaf795a8 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html @@ -35,7 +35,7 @@
-
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html index a8ee5cdf2..abf0d181d 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html @@ -87,7 +87,7 @@
-
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts index 39025d390..bcc25ee74 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts @@ -95,7 +95,6 @@ export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent { validTo: this.hasValidTo ? this.form.get('validTo').value : null, }; await this._dossierTemplatesService.createOrUpdate(dossierTemplate).toPromise(); - await this._dossierTemplatesService.loadAll().toPromise(); await this._appStateService.loadDictionaryData(); this.dialogRef.close(true); } catch (error: any) { diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html index 4715598f6..82f32ef3e 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html @@ -84,7 +84,7 @@
-
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html index 1d42f37a4..9e4bcb124 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html @@ -28,7 +28,7 @@
-
diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html index 8e7cd2833..747671e52 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html @@ -1,6 +1,6 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html index b30f090a1..20cb45626 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html @@ -1,6 +1,6 @@
- +
@@ -78,51 +78,53 @@
- -
-
-
-
-
- {{ dict.label }} -
-
-
- - {{ dict.entries?.length }} + + +
+
+
+
+
+ {{ dict.label }}
-
- - {{ 'dictionary-listing.case-sensitive' | translate }} +
+
+ + {{ templateStats.dictionarySummary(dict.type)?.entriesCount || 0 }} +
+
+ + {{ 'dictionary-listing.case-sensitive' | translate }} +
-
-
- {{ dict.rank }} -
+
+ {{ dict.rank }} +
-
- -
+
+ +
-
-
- +
+
+ - + +
-
- + + diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts index 07c195482..b861512e8 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts @@ -1,8 +1,6 @@ import { Component, forwardRef, Injector, OnInit } from '@angular/core'; import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/simple-doughnut-chart.component'; import { AppStateService } from '@state/app-state.service'; -import { catchError, defaultIfEmpty, tap } from 'rxjs/operators'; -import { forkJoin, of } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; import { CircleButtonTypes, @@ -17,14 +15,11 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { DictionaryService } from '@shared/services/dictionary.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { Dictionary } from '@red/domain'; - -const toChartConfig = (dict: Dictionary): DoughnutChartConfig => ({ - value: dict.entries?.length ?? 0, - color: dict.hexColor, - label: dict.label, - key: dict.type, -}); +import { Dictionary, DossierTemplateStats } from '@red/domain'; +import { Observable } from 'rxjs'; +import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; +import { ActivatedRoute } from '@angular/router'; +import { tap } from 'rxjs/operators'; @Component({ templateUrl: './dictionary-listing-screen.component.html', @@ -42,6 +37,8 @@ export class DictionaryListingScreenComponent extends ListingComponent; + templateStats: DossierTemplateStats; constructor( protected readonly _injector: Injector, @@ -52,13 +49,18 @@ export class DictionaryListingScreenComponent extends ListingComponent (this.templateStats = stats))); } - ngOnInit(): void { - this._loadDictionaryData(); + async ngOnInit(): Promise { + await this._loadDictionaryData(false); } openDeleteDictionariesDialog($event?: MouseEvent, types = this.listingService.selected) { @@ -70,9 +72,7 @@ export class DictionaryListingScreenComponent extends ListingComponent { this._loadingService.start(); - await this._appStateService.loadDictionaryData(); - this._loadDictionaryData(false); - this._calculateData(); + await this._loadDictionaryData(); this._loadingService.stop(); }, ); } - private _loadDictionaryData(loadEntries = true): void { + private async _loadDictionaryData(refresh = true): Promise { + if (refresh) { + await this._appStateService.loadDictionaryData(); + } + const appStateDictionaryData = this._appStateService.dictionaryData[this._dossierTemplatesService.activeDossierTemplateId]; const entities = Object.values(appStateDictionaryData).filter(d => !d.virtual); + this.entitiesService.setEntities(entities); - if (!loadEntries) { - this.entitiesService.setEntities( - entities.map(dict => { - dict.entries = this.allEntities.find(d => d.type === dict.type)?.entries || []; - return dict; - }), - ); - } else { - this.entitiesService.setEntities(entities); - } - - if (!loadEntries) { - return; - } - - const dataObs = this.allEntities.map(dict => - this._dictionaryService.getForType(this._dossierTemplatesService.activeDossierTemplateId, dict.type).pipe( - tap(values => (dict.entries = [...values.entries] ?? [])), - catchError(() => { - dict.entries = []; - return of({}); - }), - ), - ); - - forkJoin(dataObs) - .pipe(defaultIfEmpty(null)) - .subscribe(() => this._calculateData()); + this._calculateData(); } private _calculateData(): void { - this.chartData = this.allEntities.map(dict => toChartConfig(dict)); + this.chartData = this.allEntities.map(dict => ({ + value: this.templateStats.dictionarySummary(dict.type).entriesCount ?? 0, + color: dict.hexColor, + label: dict.label, + key: dict.type, + })); this.chartData.sort((a, b) => (a.label < b.label ? -1 : 1)); this._loadingService.stop(); } diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html index d7c10b8b8..8a3b92a69 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html @@ -1,6 +1,6 @@
- +
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html deleted file mode 100644 index f32777255..000000000 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html +++ /dev/null @@ -1,100 +0,0 @@ -
-
- - - -
- - -
-
- -
-
-
-
- - - - - - - - - - -
- - - -
- - - -
-
-
- {{ dossierTemplate.name }} -
-
-
- - {{ 'dossier-templates-listing.dictionaries' | translate: { length: dossierTemplate.dictionariesCount } }} -
-
-
- -
- -
- -
-
- {{ dossierTemplate.dateAdded | date: 'd MMM. yyyy' }} -
-
- -
-
- {{ dossierTemplate.dateModified | date: 'd MMM. yyyy' }} -
- -
-
- diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html new file mode 100644 index 000000000..3ee132dc1 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html @@ -0,0 +1,47 @@ + + + + + + + + + +
+ + + +
+ + + + + diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.scss new file mode 100644 index 000000000..2ec996eec --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.scss @@ -0,0 +1,6 @@ +:host { + display: flex; + flex-direction: column; + flex-grow: 1; + overflow: hidden; +} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.ts similarity index 78% rename from apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts rename to apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.ts index 94dbda669..8dd983991 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.ts @@ -1,7 +1,7 @@ -import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, forwardRef, Injector } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; import { UserPreferenceService } from '@services/user-preference.service'; -import { AdminDialogService } from '../../services/admin-dialog.service'; +import { AdminDialogService } from '../../../services/admin-dialog.service'; import { DossierTemplate } from '@red/domain'; import { CircleButtonTypes, @@ -29,7 +29,7 @@ import { HttpStatusCode } from '@angular/common/http'; { provide: ListingComponent, useExisting: forwardRef(() => DossierTemplatesListingScreenComponent) }, ], }) -export class DossierTemplatesListingScreenComponent extends ListingComponent implements OnInit { +export class DossierTemplatesListingScreenComponent extends ListingComponent { readonly iconButtonTypes = IconButtonTypes; readonly circleButtonTypes = CircleButtonTypes; readonly currentUser = this._userService.currentUser; @@ -55,10 +55,6 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent { this._loadingService.loadWhile(this._deleteTemplates()); @@ -66,23 +62,7 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent { - this.loadDossierTemplateStats(); - }); - } - - loadDossierTemplateStats() { - this.entitiesService.all.forEach(rs => { - const dictionaries = this._appStateService.dictionaryData[rs.dossierTemplateId]; - if (dictionaries) { - rs.dictionariesCount = Object.keys(dictionaries) - .map(key => dictionaries[key]) - .filter(d => !d.virtual || d.type === 'false_positive').length; - } else { - rs.dictionariesCount = 0; - rs.totalDictionaryEntries = 0; - } - }); + this._dialogService.openDialog('addEditDossierTemplate', null, null); } private async _deleteTemplates(templateIds = this.listingService.selected.map(d => d.dossierTemplateId)) { @@ -96,8 +76,6 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent +
+ {{ dossierTemplate.name }} +
+
+
+ + {{ 'dossier-templates-listing.dictionaries' | translate: { length: stats.numberOfDictionaries } }} +
+
+
+ +
+ +
+ +
+
+ {{ dossierTemplate.dateAdded | date: 'd MMM. yyyy' }} +
+
+ +
+
+ {{ dossierTemplate.dateModified | date: 'd MMM. yyyy' }} +
+ +
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss rename to apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.scss diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts new file mode 100644 index 000000000..1121f9ffe --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts @@ -0,0 +1,28 @@ +import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; +import { DossierTemplate, DossierTemplateStats } from '@red/domain'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; +import { switchMap } from 'rxjs/operators'; + +@Component({ + selector: 'redaction-table-item [dossierTemplate]', + templateUrl: './table-item.component.html', + styleUrls: ['./table-item.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class TableItemComponent implements OnChanges { + @Input() dossierTemplate!: DossierTemplate; + + readonly stats$: Observable; + private readonly _ngOnChanges$ = new BehaviorSubject(undefined); + + constructor(readonly dossierTemplateStatsService: DossierTemplateStatsService) { + this.stats$ = this._ngOnChanges$.pipe(switchMap(id => this.dossierTemplateStatsService.watch$(id))); + } + + ngOnChanges() { + if (this.dossierTemplate) { + this._ngOnChanges$.next(this.dossierTemplate.id); + } + } +} diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html index f820ff322..d9746c4ff 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html @@ -1,6 +1,6 @@
- +
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 new file mode 100644 index 000000000..01a475122 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +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'; + +const routes = [{ path: '', component: DossierTemplateInfoScreenComponent }]; + +@NgModule({ + declarations: [DossierTemplateInfoScreenComponent], + imports: [RouterModule.forChild(routes), CommonModule, SharedModule], +}) +export class DossierTemplateInfoModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html new file mode 100644 index 000000000..df33b171d --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html @@ -0,0 +1,41 @@ +
+ +
{{ dossierTemplate.name }}
+ +
+ + + +
+
+ + {{ 'dossier-template-info-screen.dictionaries' | translate: { count: stats.numberOfDictionaries } }} +
+ +
+ + {{ 'dossier-template-info-screen.created-on' | translate: { date: dossierTemplate.dateAdded | date: 'd MMM. yyyy' } }} +
+ +
+ + {{ 'dossier-template-info-screen.entries' | translate: { count: stats.numberOfEntries } }} +
+ +
+ + {{ 'dossier-template-info-screen.modified-on' | translate: { date: dossierTemplate.dateModified | date: 'd MMM. yyyy' } }} +
+
+ +
+ +
+ +
{{ dossierTemplate.description }}
+ +
diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.scss new file mode 100644 index 000000000..f26f4b8f0 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.scss @@ -0,0 +1,30 @@ +@use 'variables'; +@use 'common-mixins'; + +:host { + display: flex; + flex-grow: 1; + overflow: hidden; +} + +.content-container { + flex: 1; + padding: 30px; + overflow: auto; + @include common-mixins.scroll-bar; +} + +.heading { + display: flex; + align-items: center; + margin-top: 40px; + margin-bottom: 8px; +} + +.stats-subtitle { + margin-top: 16px; + display: grid; + grid-template-columns: repeat(2, max-content); + grid-row-gap: 8px; + grid-column-gap: 40px; +} diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts new file mode 100644 index 000000000..3e5c91093 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts @@ -0,0 +1,26 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; +import { ActivatedRoute } from '@angular/router'; +import { Observable } from 'rxjs'; +import { DossierTemplate, DossierTemplateStats } from '@red/domain'; +import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; + +@Component({ + templateUrl: './dossier-template-info-screen.component.html', + styleUrls: ['./dossier-template-info-screen.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class DossierTemplateInfoScreenComponent { + dossierTemplate$: Observable; + dossierTemplateStats$: Observable; + + constructor( + private readonly _dossierTemplatesService: DossierTemplatesService, + private readonly _dossierTemplateStatsService: DossierTemplateStatsService, + private readonly _route: ActivatedRoute, + ) { + const dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); + this.dossierTemplate$ = this._dossierTemplatesService.getEntityChanged$(dossierTemplateId); + this.dossierTemplateStats$ = this._dossierTemplateStatsService.watch$(dossierTemplateId); + } +} diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html index d4cfbba47..e676105d7 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html @@ -1,6 +1,6 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html index faea56034..78fd087bd 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html @@ -1,6 +1,6 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html index b15fe1963..b279ead7e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html @@ -1,6 +1,6 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.html b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.html rename to apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.scss b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.scss rename to apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.scss diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts similarity index 87% rename from apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts rename to apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts index b435bca35..965870639 100644 --- a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts @@ -1,7 +1,7 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; import { Router } from '@angular/router'; -import { AdminDialogService } from '../../services/admin-dialog.service'; +import { AdminDialogService } from '../../../services/admin-dialog.service'; import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { UserService } from '@services/user.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -18,7 +18,6 @@ export class DossierTemplateActionsComponent implements OnInit { readonly currentUser = this._userService.currentUser; @Input() dossierTemplateId: string; - @Output() readonly loadDossierTemplatesData = new EventEmitter(); constructor( private readonly _router: Router, @@ -39,9 +38,7 @@ export class DossierTemplateActionsComponent implements OnInit { } openEditDossierTemplateDialog($event: any) { - this._dialogService.openDialog('addEditDossierTemplate', $event, this.dossierTemplate, () => { - this.loadDossierTemplatesData.emit(); - }); + this._dialogService.openDialog('addEditDossierTemplate', $event, this.dossierTemplate, () => {}); } openDeleteDossierTemplateDialog($event?: MouseEvent) { @@ -54,7 +51,6 @@ export class DossierTemplateActionsComponent implements OnInit { .then(async () => { await this._dossierTemplatesService.loadAll().toPromise(); await this._appStateService.loadDictionaryData(); - this.loadDossierTemplatesData.emit(); await this._router.navigate(['main', 'admin']); }) .catch(error => { diff --git a/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts b/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts new file mode 100644 index 000000000..09552f814 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SharedModule } from '@shared/shared.module'; +import { DossierTemplateActionsComponent } from './components/dossier-template-actions/dossier-template-actions.component'; + +const components = [DossierTemplateActionsComponent]; + +@NgModule({ + declarations: [...components], + exports: [...components], + providers: [], + imports: [CommonModule, SharedModule], +}) +export class SharedAdminModule {} diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html index 8b9f90c77..c43e2df9e 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html @@ -49,7 +49,7 @@
- { - constructor(private readonly _toaster: Toaster, protected readonly _injector: Injector) { + constructor( + private readonly _toaster: Toaster, + protected readonly _injector: Injector, + private readonly _dossierTemplateStatsService: DossierTemplateStatsService, + ) { super(_injector, Dictionary, 'dictionary'); } @@ -31,7 +36,9 @@ export class DictionaryService extends EntitiesService deleteDictionaries(@RequiredParam() body: List, @RequiredParam() dossierTemplateId: string, dossierId?: string) { const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; const url = `${this._defaultModelPath}/type/${dossierTemplateId}/delete`; - return this._post(body, url, queryParams); + return this._post(body, url, queryParams).pipe( + switchMap(dictionaries => this._dossierTemplateStatsService.getFor([dossierTemplateId]).pipe(mapTo(dictionaries))), + ); } /** @@ -63,7 +70,9 @@ export class DictionaryService extends EntitiesService ) { const url = `${this._defaultModelPath}/type/${type}/${dossierTemplateId}`; const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; - return this._post(body, url, queryParams); + return this._post(body, url, queryParams).pipe( + switchMap(dictionary => this._dossierTemplateStatsService.getFor([dossierTemplateId]).pipe(mapTo(dictionary))), + ); } /** @@ -78,43 +87,11 @@ export class DictionaryService extends EntitiesService * Creates entry type with colors, hint and caseInsensitive */ @Validate() - addDictionary(@RequiredParam() body: IDictionary, dossierId?: string) { + addDictionary(@RequiredParam() dictionary: IDictionary, dossierId?: string) { const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; - return this._post(body, `${this._defaultModelPath}/type`, queryParams); - } - - /** - * Add dictionary entries with entry type. - */ - @Validate() - addEntry( - @RequiredParam() body: List, - @RequiredParam() dossierTemplateId: string, - @RequiredParam() type: string, - dossierId?: string, - removeCurrent?: boolean, - ) { - const queryParams: List = [ - { key: 'dossierId', value: dossierId }, - { key: 'removeCurrent', value: removeCurrent }, - ]; - const url = `${this._defaultModelPath}/${type}/${dossierTemplateId}`; - return this._post(body, url, queryParams); - } - - /** - * Delete dictionary entries with entry type. - */ - @Validate() - deleteEntries( - @RequiredParam() body: List, - @RequiredParam() dossierTemplateId: string, - @RequiredParam() type: string, - @RequiredParam() dossierId?: string, - ) { - const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; - const url = `${this._defaultModelPath}/delete/${type}/${dossierTemplateId}`; - return this._post(body, url, queryParams); + return this._post(dictionary, `${this._defaultModelPath}/type`, queryParams).pipe( + switchMap(() => this._dossierTemplateStatsService.getFor([dictionary.dossierTemplateId])), + ); } saveEntries( @@ -134,14 +111,15 @@ export class DictionaryService extends EntitiesService const invalidRowsExist = entriesToAdd.filter(e => e.length < MIN_WORD_LENGTH); if (invalidRowsExist.length === 0) { // can add at least 1 - block UI - let obs: Observable; + let obs: Observable; if (entriesToAdd.length > 0) { - obs = this.addEntry(entriesToAdd, dossierTemplateId, type, dossierId, true); + obs = this._addEntry(entriesToAdd, dossierTemplateId, type, dossierId, true); } else { - obs = this.deleteEntries(initialEntries, dossierTemplateId, type, dossierId); + obs = this._deleteEntries(initialEntries, dossierTemplateId, type, dossierId); } return obs.pipe( + switchMap(dictionary => this._dossierTemplateStatsService.getFor([dossierTemplateId]).pipe(mapTo(dictionary))), tap( () => { if (showToast) { @@ -157,4 +135,38 @@ export class DictionaryService extends EntitiesService return throwError('Entries too short'); } } + + /** + * Add dictionary entries with entry type. + */ + @Validate() + private _addEntry( + @RequiredParam() body: List, + @RequiredParam() dossierTemplateId: string, + @RequiredParam() type: string, + dossierId?: string, + removeCurrent?: boolean, + ) { + const queryParams: List = [ + { key: 'dossierId', value: dossierId }, + { key: 'removeCurrent', value: removeCurrent }, + ]; + const url = `${this._defaultModelPath}/${type}/${dossierTemplateId}`; + return this._post(body, url, queryParams); + } + + /** + * Delete dictionary entries with entry type. + */ + @Validate() + private _deleteEntries( + @RequiredParam() body: List, + @RequiredParam() dossierTemplateId: string, + @RequiredParam() type: string, + @RequiredParam() dossierId?: string, + ) { + const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined; + const url = `${this._defaultModelPath}/delete/${type}/${dossierTemplateId}`; + return this._post(body, url, queryParams); + } } diff --git a/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts index aeb845a64..a475edf96 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts @@ -1,48 +1,12 @@ -import { Injectable } from '@angular/core'; -import { HeadersConfiguration, mapEach, RequiredParam, Validate } from '@iqser/common-ui'; -import { BehaviorSubject, Observable } from 'rxjs'; +import { Injectable, Injector } from '@angular/core'; +import { StatsService } from '@iqser/common-ui'; import { DossierStats, IDossierStats } from '@red/domain'; -import { HttpClient } from '@angular/common/http'; -import { tap } from 'rxjs/operators'; @Injectable({ providedIn: 'root', }) -export class DossierStatsService { - private readonly _map = new Map>(); - - constructor(private readonly _http: HttpClient) {} - - @Validate() - getFor(@RequiredParam() dossierIds: string[]): Observable { - const request = this._http.post(`/${encodeURI('dossier-stats')}`, dossierIds, { - headers: HeadersConfiguration.getHeaders(), - observe: 'body', - }); - - return request.pipe( - mapEach(entity => new DossierStats(entity)), - tap(entities => entities.forEach(entity => this.set(entity))), - ); - } - - get(key: string): DossierStats { - return this._map.get(key)?.value; - } - - set(stats: DossierStats): void { - if (!this._map.has(stats.dossierId)) { - this._map.set(stats.dossierId, new BehaviorSubject(stats)); - return; - } - - const old = this.get(stats.dossierId); - if (JSON.stringify(old) !== JSON.stringify(stats)) { - this._map.get(stats.dossierId).next(stats); - } - } - - watch$(key: string): Observable { - return this._map.get(key)?.asObservable(); +export class DossierStatsService extends StatsService { + constructor(protected readonly _injector: Injector) { + super(_injector, 'dossierId', DossierStats, 'dossier-stats'); } } diff --git a/apps/red-ui/src/app/services/entity-services/dossier-template-stats.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-template-stats.service.ts new file mode 100644 index 000000000..94f63af75 --- /dev/null +++ b/apps/red-ui/src/app/services/entity-services/dossier-template-stats.service.ts @@ -0,0 +1,12 @@ +import { Injectable, Injector } from '@angular/core'; +import { StatsService } from '@iqser/common-ui'; +import { DossierTemplateStats, IDossierTemplateStats } from '@red/domain'; + +@Injectable({ + providedIn: 'root', +}) +export class DossierTemplateStatsService extends StatsService { + constructor(protected readonly _injector: Injector) { + super(_injector, 'dossierTemplateId', DossierTemplateStats, 'dossier-template-stats'); + } +} diff --git a/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts index 9847d6945..299578629 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts @@ -1,11 +1,12 @@ -import { EntitiesService, List, RequiredParam, Validate } from '@iqser/common-ui'; +import { EntitiesService, List, mapEach, RequiredParam, Validate } from '@iqser/common-ui'; import { DossierTemplate, IDossierTemplate } from '@red/domain'; import { Injectable, Injector } from '@angular/core'; import { BehaviorSubject, forkJoin, Observable } from 'rxjs'; import { FileAttributesService } from './file-attributes.service'; import { ActivationEnd, Router } from '@angular/router'; import { currentComponentRoute } from '@utils/functions'; -import { map, switchMap } from 'rxjs/operators'; +import { mapTo, switchMap, tap } from 'rxjs/operators'; +import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; @Injectable({ providedIn: 'root', @@ -18,6 +19,7 @@ export class DossierTemplatesService extends EntitiesService { const getAttributes = (entities: DossierTemplate[]) => entities.map(e => this._fileAttributesService.getFileAttributesConfig(e.id)); - return super.loadAll().pipe( - switchMap(entities => forkJoin(getAttributes(entities))), - map(() => this.all), + const dossierTemplateIds = (templates: DossierTemplate[]) => templates.map(d => d.id); + return this.getAll().pipe( + mapEach(entity => new DossierTemplate(entity)), + /* Load stats before updating entities */ + switchMap(templates => + forkJoin([this._dossierTemplateStatsService.getFor(dossierTemplateIds(templates)), ...getAttributes(templates)]).pipe( + mapTo(templates), + ), + ), + tap(templates => this.setEntities(templates)), ); } delete(body: List): Observable { - return super._post(body, `${this._defaultModelPath}/delete`); + return super._post(body, `${this._defaultModelPath}/delete`).pipe(switchMap(() => this.loadAll())); } @Validate() createOrUpdate(@RequiredParam() body: IDossierTemplate) { - return this._post(body); + return this._post(body).pipe(switchMap(() => this.loadAll())); } } diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index 7f4bbdc68..5ebc6885f 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -30,7 +30,7 @@ export class DossiersService extends EntitiesService { } loadAll(): Observable { - const dossierIds = (dossiers: Dossier[]) => dossiers.map(d => d.dossierId); + const dossierIds = (dossiers: Dossier[]) => dossiers.map(d => d.id); return this.getAll().pipe( mapEach(entity => new Dossier(entity)), /* Load stats before updating entities */ diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index c5a78443c..6befaaf58 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-03.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 1.5, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-03.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural" } diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 510458983..d47271e28 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -776,6 +776,15 @@ "under-review": "Under Review", "upload-files": "Drag & drop files anywhere..." }, + "dossier-template-info": "Info", + "dossier-template-info-screen": { + "created-by": "Created by", + "created-on": "Created on: {date}", + "description": "Description", + "dictionaries": "{count} {count, plural, one{dictionary} other{dictionaries}}", + "entries": "{count} {count, plural, one{entry} other{entries}}", + "modified-on": "Modified on: {date}" + }, "dossier-templates": "Dossier Templates", "dossier-templates-listing": { "action": { diff --git a/libs/common-ui b/libs/common-ui index 51f3d7502..f4ffa08f8 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 51f3d7502b5545663afa2fa0a62abc3578f92905 +Subproject commit f4ffa08f867558f1835b19428442935c62187e66 diff --git a/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.model.ts b/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.model.ts new file mode 100644 index 000000000..ad19e2a82 --- /dev/null +++ b/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.model.ts @@ -0,0 +1,23 @@ +import { DictionarySummary, IDossierTemplateStats } from './dossier-template-stats'; + +export class DossierTemplateStats implements IDossierTemplateStats { + readonly dossierTemplateId: string; + readonly dictionarySummaryList: DictionarySummary[]; + readonly numberOfDictionaries: number; + + readonly numberOfEntries: number; + private readonly _dictionarySummaryMap = new Map(); + + constructor(stats: IDossierTemplateStats) { + this.dossierTemplateId = stats.dossierTemplateId; + this.dictionarySummaryList = stats.dictionarySummaryList; + this.numberOfDictionaries = stats.numberOfDictionaries; + + this.numberOfEntries = this.dictionarySummaryList.reduce((counter, summary) => counter + summary.entriesCount, 0); + this.dictionarySummaryList.forEach(summary => this._dictionarySummaryMap.set(summary.type, summary)); + } + + dictionarySummary(type: string): DictionarySummary | undefined { + return this._dictionarySummaryMap.get(type); + } +} diff --git a/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.ts b/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.ts new file mode 100644 index 000000000..2bd8b9cda --- /dev/null +++ b/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.ts @@ -0,0 +1,12 @@ +export interface DictionarySummary { + readonly entriesCount: number; + readonly id: string; + readonly name: string; + readonly type: string; +} + +export interface IDossierTemplateStats { + readonly dossierTemplateId: string; + readonly dictionarySummaryList: DictionarySummary[]; + readonly numberOfDictionaries: number; +} diff --git a/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts b/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts index f47b5bed9..3e9e58ae9 100644 --- a/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts +++ b/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts @@ -14,8 +14,6 @@ export class DossierTemplate implements IDossierTemplate, IListable { readonly reportTemplateIds?: List; readonly validFrom?: string; readonly validTo?: string; - dictionariesCount = 0; - totalDictionaryEntries = 0; constructor(dossierTemplate: IDossierTemplate) { this.createdBy = dossierTemplate.createdBy; @@ -40,6 +38,6 @@ export class DossierTemplate implements IDossierTemplate, IListable { } get routerLink(): string { - return `/main/admin/dossier-templates/${this.dossierTemplateId}/dictionaries`; + return `/main/admin/dossier-templates/${this.dossierTemplateId}`; } } diff --git a/libs/red-domain/src/lib/dossier-templates/index.ts b/libs/red-domain/src/lib/dossier-templates/index.ts index 24c0bba3f..1e5fdfe97 100644 --- a/libs/red-domain/src/lib/dossier-templates/index.ts +++ b/libs/red-domain/src/lib/dossier-templates/index.ts @@ -1,2 +1,4 @@ export * from './dossier-template'; export * from './dossier-template.model'; +export * from './dossier-template-stats'; +export * from './dossier-template-stats.model'; From 0e5b5349cdf686187857c5d7d0f3890c74a5d035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 22 Dec 2021 12:39:12 +0200 Subject: [PATCH 2/7] Edit dossier template from info --- .../add-edit-dossier-template-dialog.component.ts | 5 ++++- .../dossier-template-info-screen.component.html | 7 ++++++- .../dossier-template-info-screen.component.ts | 14 +++++++++++++- .../dossier-template-actions.component.ts | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts index bcc25ee74..f42bebd94 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts @@ -7,7 +7,7 @@ import { Moment } from 'moment'; import { applyIntervalConstraints } from '@utils/date-inputs-utils'; import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { BaseDialogComponent, Toaster } from '@iqser/common-ui'; +import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DownloadFileType, IDossierTemplate } from '@red/domain'; import { HttpStatusCode } from '@angular/common/http'; @@ -34,6 +34,7 @@ export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent { private readonly _toaster: Toaster, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _formBuilder: FormBuilder, + private readonly _loadingService: LoadingService, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly dossierTemplate: IDossierTemplate, ) { @@ -87,6 +88,7 @@ export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent { } async save() { + this._loadingService.start(); try { const dossierTemplate = { dossierTemplateId: this.dossierTemplate?.dossierTemplateId, @@ -104,6 +106,7 @@ export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent { : _('add-edit-dossier-template.error.generic'); this._toaster.error(message, { error }); } + this._loadingService.stop(); } private _getForm(): FormGroup { diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html index df33b171d..898a71ccb 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html @@ -33,7 +33,12 @@
- +
{{ dossierTemplate.description }}
diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts index 3e5c91093..71bc240d0 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts @@ -4,6 +4,9 @@ import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs'; import { DossierTemplate, DossierTemplateStats } from '@red/domain'; import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; +import { AdminDialogService } from '../../../services/admin-dialog.service'; +import { tap } from 'rxjs/operators'; +import { PermissionsService } from '@services/permissions.service'; @Component({ templateUrl: './dossier-template-info-screen.component.html', @@ -13,14 +16,23 @@ import { DossierTemplateStatsService } from '@services/entity-services/dossier-t export class DossierTemplateInfoScreenComponent { dossierTemplate$: Observable; dossierTemplateStats$: Observable; + private _dossierTemplate: DossierTemplate; constructor( private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _dossierTemplateStatsService: DossierTemplateStatsService, + private readonly _dialogService: AdminDialogService, private readonly _route: ActivatedRoute, + readonly permissionsService: PermissionsService, ) { const dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); - this.dossierTemplate$ = this._dossierTemplatesService.getEntityChanged$(dossierTemplateId); + this.dossierTemplate$ = this._dossierTemplatesService + .getEntityChanged$(dossierTemplateId) + .pipe(tap(dossierTemplate => (this._dossierTemplate = dossierTemplate))); this.dossierTemplateStats$ = this._dossierTemplateStatsService.watch$(dossierTemplateId); } + + openEditDossierTemplateDialog($event: any) { + this._dialogService.openDialog('addEditDossierTemplate', $event, this._dossierTemplate); + } } diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts index 965870639..ad67cb3f9 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts @@ -38,7 +38,7 @@ export class DossierTemplateActionsComponent implements OnInit { } openEditDossierTemplateDialog($event: any) { - this._dialogService.openDialog('addEditDossierTemplate', $event, this.dossierTemplate, () => {}); + this._dialogService.openDialog('addEditDossierTemplate', $event, this.dossierTemplate); } openDeleteDossierTemplateDialog($event?: MouseEvent) { From a1c6b0ace1d9253470f0e14893b8890570aa20e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 22 Dec 2021 18:20:27 +0200 Subject: [PATCH 3/7] Improvement --- .../dossier-template-info-screen.component.html | 2 +- .../dossier-template-info-screen.component.ts | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html index 898a71ccb..35f01af0d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html @@ -34,7 +34,7 @@
; dossierTemplateStats$: Observable; - private _dossierTemplate: DossierTemplate; constructor( private readonly _dossierTemplatesService: DossierTemplatesService, @@ -26,13 +24,11 @@ export class DossierTemplateInfoScreenComponent { readonly permissionsService: PermissionsService, ) { const dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); - this.dossierTemplate$ = this._dossierTemplatesService - .getEntityChanged$(dossierTemplateId) - .pipe(tap(dossierTemplate => (this._dossierTemplate = dossierTemplate))); + this.dossierTemplate$ = this._dossierTemplatesService.getEntityChanged$(dossierTemplateId); this.dossierTemplateStats$ = this._dossierTemplateStatsService.watch$(dossierTemplateId); } - openEditDossierTemplateDialog($event: any) { - this._dialogService.openDialog('addEditDossierTemplate', $event, this._dossierTemplate); + openEditDossierTemplateDialog($event: any, dossierTemplate: DossierTemplate) { + this._dialogService.openDialog('addEditDossierTemplate', $event, dossierTemplate); } } From 0c3fd7d57bb91193a6131335980641f1d14d973d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 12 Jan 2022 18:22:30 +0200 Subject: [PATCH 4/7] Fix rebase: common --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index f4ffa08f8..51f3d7502 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit f4ffa08f867558f1835b19428442935c62187e66 +Subproject commit 51f3d7502b5545663afa2fa0a62abc3578f92905 From 37c77761bc8ce011b9829683f8083e927bd0a630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 12 Jan 2022 21:07:12 +0200 Subject: [PATCH 5/7] Fix config --- apps/red-ui/src/assets/config/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 6befaaf58..c5a78443c 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dev-03.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 1.5, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-03.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural" } From 1c4b2080bec2bad7fc269c1d6d324ec9c62669f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 25 Jan 2022 09:54:50 +0200 Subject: [PATCH 6/7] Update backend url --- apps/red-ui/src/assets/config/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 37f55bf22..6a7817a2f 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://aks-staging.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-04.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://aks-staging.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-04.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "USE_SESSION_FOR_DOWNLOAD": false From 8eab831a5b669bc3500aab637b6326b067bbecfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 25 Jan 2022 10:09:55 +0200 Subject: [PATCH 7/7] Update common --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 95644f59e..650c16b80 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 95644f59e4e32517d76e0bd9267805a88ebdd8d1 +Subproject commit 650c16b80387943f1de0efa876215559f56d123b