From 89ebc1fa17b2bd0135aa680f87a729578155e0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 17 May 2022 13:45:05 +0300 Subject: [PATCH 01/13] RED-4006: Fixed config loader --- apps/red-ui/src/app/modules/auth/auth.module.ts | 9 ++++++--- apps/red-ui/src/app/services/config.service.ts | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/apps/red-ui/src/app/modules/auth/auth.module.ts b/apps/red-ui/src/app/modules/auth/auth.module.ts index 11bab1020..579141b47 100644 --- a/apps/red-ui/src/app/modules/auth/auth.module.ts +++ b/apps/red-ui/src/app/modules/auth/auth.module.ts @@ -5,6 +5,7 @@ import { HttpClientModule } from '@angular/common/http'; import { KeycloakAngularModule, KeycloakOptions, KeycloakService } from 'keycloak-angular'; import { ConfigService } from '@services/config.service'; import { BASE_HREF } from '../../tokens'; +import { firstValueFrom } from 'rxjs'; function getKeycloakOptions(configService: ConfigService, baseUrl: string) { let url: string = configService.values.OAUTH_URL; @@ -36,9 +37,11 @@ function configureAutomaticRedirectToLoginScreen(keyCloakService: KeycloakServic export function keycloakInitializer(keycloakService: KeycloakService, configService: ConfigService, baseUrl: string): () => Promise { return () => - keycloakService - .init(getKeycloakOptions(configService, baseUrl)) - .then(() => configureAutomaticRedirectToLoginScreen(keycloakService)); + firstValueFrom(configService.loadLocalConfig()).then(() => + keycloakService + .init(getKeycloakOptions(configService, baseUrl)) + .then(() => configureAutomaticRedirectToLoginScreen(keycloakService)), + ); } @NgModule({ diff --git a/apps/red-ui/src/app/services/config.service.ts b/apps/red-ui/src/app/services/config.service.ts index 98c9d80ff..3ba92c7bd 100644 --- a/apps/red-ui/src/app/services/config.service.ts +++ b/apps/red-ui/src/app/services/config.service.ts @@ -20,8 +20,6 @@ export class ConfigService { private readonly _titleService: Title, ) { this._checkFrontendVersion(); - - console.log('[REDACTION] Started with config: ', this._values); } private _values: AppConfig = { ...envConfig, FRONTEND_APP_VERSION: version } as const; @@ -32,9 +30,18 @@ export class ConfigService { loadAppConfig(): Observable { return this._httpClient.get('/app-config').pipe( - tap(appConfig => { - console.log('[REDACTION] Loaded app config: ', appConfig); - this._values = { ...this._values, ...appConfig }; + tap(config => { + console.log('[REDACTION] Loaded config: ', config); + this._values = { ...this._values, ...config }; + }), + ); + } + + loadLocalConfig(): Observable { + return this._httpClient.get('/assets/config/config.json').pipe( + tap(config => { + console.log('[REDACTION] Started with local config: ', config); + this._values = config; }), ); } From 1176d032e20661194f4f7ed0894286a3adbd42bc Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 17 May 2022 12:47:37 +0200 Subject: [PATCH 02/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3266 -> 3267 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c55b9aaf..99bd04093 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.486.0", + "version": "3.487.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 13200c6c5c380dcb4c200782c1b641c84f6af3b5..bd79f1660ecfd318df7a4bc23cea82832c758e45 100644 GIT binary patch delta 309 zcmV-50m}Zu8N(TncYjywmAhWQupK*a?H4HcQLq`5re?T8=%<+Kf3Yle`OA-*J!GW* zSlaM(`Foz@pXL8kl%w*mNQ@&U+m=yXf7l#cz$<@B{+?^Q>t6o;+6Vcsg1~!$?2k*T zx%{8Y|4o$QswNCw{^gr5t;e9MQ)SeH`BBS23;23_pBU-{JD|>ea=PYKAL>eu}C77t2zYzx=4#Lq_V4 zr43J)zvr%JhAD2{f z`9GKcn<&LqO&GfT%Qs(Io6A=hZ|J@(Du$XWdwH2MR@U3=>wl!kS-sp9#V#Ybr1df? z_Sc{g?r##jr`f}2e=14->#uQMZz;ps;%=9+H}=A_?N|1~7r%k{U5Ved_}##-Bl^b7axy<5!-D@lAjCJP9lNja|o GPyhf^HljEH From e66916843abf2f82c31d3b23a5e962f4a550f237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 18 May 2022 14:48:45 +0300 Subject: [PATCH 03/13] RED-3800: Moved all translations in one folder --- .eslintrc.json | 4 ++-- apps/red-ui/src/app/models/file/annotation.wrapper.ts | 2 +- .../base-account-screen/base-account-screen-component.ts | 6 +++--- .../notifications-screen/notifications-screen.component.ts | 5 ++--- .../user-profile-screen/user-profile-screen.component.ts | 2 +- .../admin/admin-side-nav/admin-side-nav.component.ts | 2 +- .../add-edit-dossier-attribute-dialog.component.ts | 2 +- .../add-edit-dossier-template-dialog.component.ts | 2 +- .../add-edit-file-attribute-dialog.component.ts | 2 +- .../user-details/user-details.component.ts | 2 +- .../edit-color-dialog/edit-color-dialog.component.ts | 2 +- .../file-attributes-configurations-dialog.component.ts | 2 +- .../active-fields-listing.component.ts | 2 +- .../modules/admin/screens/audit/audit-screen.component.ts | 2 +- .../default-colors/default-colors-screen.component.ts | 2 +- .../dossier-attributes-listing-screen.component.ts | 2 +- .../table-item/table-item.component.ts | 2 +- .../file-attributes-listing-screen.component.ts | 2 +- .../info-screen/dossier-template-info-screen.component.ts | 2 +- .../app/modules/admin/screens/permissions/config.service.ts | 2 +- .../permissions-screen/permissions-screen.component.ts | 2 +- .../reports/reports-screen/reports-screen.component.ts | 2 +- .../screens/user-listing/user-listing-screen.component.ts | 2 +- .../components/dossier-details/dossier-details.component.ts | 2 +- .../src/app/modules/dossier-overview/config.service.ts | 4 ++-- .../add-dossier-dialog/add-dossier-dialog.component.ts | 2 +- .../edit-dossier-download-package.component.ts | 2 +- .../dossier/services/annotation-processing.service.ts | 2 +- .../src/app/modules/dossiers-listing/config.service.ts | 4 ++-- .../annotation-details/annotation-details.component.ts | 2 +- .../components/user-management/user-management.component.ts | 2 +- .../highlight-action-dialog.component.ts | 2 +- .../recategorize-image-dialog.component.ts | 2 +- .../file-preview/services/manual-redaction.service.ts | 2 +- .../modules/search/search-screen/search-screen.component.ts | 2 +- apps/red-ui/src/app/services/notifications.service.ts | 2 +- apps/red-ui/src/app/services/translate-chart.service.ts | 4 ++-- apps/red-ui/src/app/translations/account-translations.ts | 6 ++++++ .../admin => }/translations/admin-side-nav-translations.ts | 0 .../translations/audit-categories-translations.ts | 0 .../admin => }/translations/default-colors-translations.ts | 0 .../translations/dossier-attribute-types-translations.ts | 0 .../translations/dossier-template-status-translations.ts | 0 .../file-attribute-encoding-types-translations.ts | 0 .../translations/file-attribute-types-translations.ts | 0 .../translations/image-categories-translations.ts | 0 .../account => }/translations/languages-translations.ts | 0 .../notifications-settings-translations.ts} | 4 +--- .../admin => }/translations/permissions-translations.ts | 0 .../translations/placeholders-descriptions-translations.ts | 0 .../dossier => }/translations/workload-translations.ts | 0 apps/red-ui/src/assets/i18n/de.json | 2 -- apps/red-ui/src/assets/i18n/en.json | 2 -- tsconfig.base.json | 1 + 54 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 apps/red-ui/src/app/translations/account-translations.ts rename apps/red-ui/src/app/{modules/admin => }/translations/admin-side-nav-translations.ts (100%) rename apps/red-ui/src/app/{modules/admin => }/translations/audit-categories-translations.ts (100%) rename apps/red-ui/src/app/{modules/admin => }/translations/default-colors-translations.ts (100%) rename apps/red-ui/src/app/{modules/admin => }/translations/dossier-attribute-types-translations.ts (100%) rename apps/red-ui/src/app/{modules/admin => }/translations/dossier-template-status-translations.ts (100%) rename apps/red-ui/src/app/{modules/admin => }/translations/file-attribute-encoding-types-translations.ts (100%) rename apps/red-ui/src/app/{modules/admin => }/translations/file-attribute-types-translations.ts (100%) rename apps/red-ui/src/app/{modules/dossier => }/translations/image-categories-translations.ts (100%) rename apps/red-ui/src/app/{modules/account => }/translations/languages-translations.ts (100%) rename apps/red-ui/src/app/{modules/account/translations/notifications-translations.ts => translations/notifications-settings-translations.ts} (91%) rename apps/red-ui/src/app/{modules/admin => }/translations/permissions-translations.ts (100%) rename apps/red-ui/src/app/{modules/admin => }/translations/placeholders-descriptions-translations.ts (100%) rename apps/red-ui/src/app/{modules/dossier => }/translations/workload-translations.ts (100%) diff --git a/.eslintrc.json b/.eslintrc.json index cf034af7e..41d05771e 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -20,8 +20,8 @@ "@models/**", "@environments/**", "@shared/**", - "@app-config/**", - "@upload-download/**" + "@upload-download/**", + "@translations/**" ], "depConstraints": [ { diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index 0ce9794ae..2bde17f99 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -1,4 +1,4 @@ -import { annotationTypesTranslations, SuggestionAddFalsePositive } from '../../translations/annotation-types-translations'; +import { annotationTypesTranslations, SuggestionAddFalsePositive } from '@translations/annotation-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Highlight, IComment, IManualChange, IPoint, IRectangle, LogEntryStatus, ManualRedactionType } from '@red/domain'; import { RedactionLogEntry } from '@models/file/redaction-log.entry'; diff --git a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts index c87363a82..2bb8b28f8 100644 --- a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts +++ b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, OnInit, ViewContainerRef } from '@angular/core'; import { Router } from '@angular/router'; -import { notificationsTranslations } from '../translations/notifications-translations'; +import { accountTranslations } from '@translations/account-translations'; @Component({ selector: 'redaction-base-account-screen', @@ -9,8 +9,8 @@ import { notificationsTranslations } from '../translations/notifications-transla changeDetection: ChangeDetectionStrategy.OnPush, }) export class BaseAccountScreenComponent implements OnInit { - readonly translations = notificationsTranslations; - path: string; + readonly translations = accountTranslations; + readonly path: string; constructor(private readonly _router: Router, private readonly _hostRef: ViewContainerRef) { this.path = this._router.url.split('/').pop(); diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts index 26e1acfd4..a953d41c1 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts @@ -1,6 +1,5 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { notificationsTranslations } from '../../../translations/notifications-translations'; import { NotificationPreferencesService } from '../../../services/notification-preferences.service'; import { BaseFormComponent, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -11,9 +10,9 @@ import { NotificationGroupsValues, } from '@red/domain'; import { firstValueFrom } from 'rxjs'; +import { notificationsSettingsTranslations } from '@translations/notifications-settings-translations'; @Component({ - selector: 'redaction-notifications-screen', templateUrl: './notifications-screen.component.html', styleUrls: ['./notifications-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, @@ -23,7 +22,7 @@ export class NotificationsScreenComponent extends BaseFormComponent implements O readonly notificationCategories = NotificationCategoriesValues; readonly notificationGroupsKeys = NotificationGroupsKeys; readonly notificationGroupsValues = NotificationGroupsValues; - readonly translations = notificationsTranslations; + readonly translations = notificationsSettingsTranslations; constructor( private readonly _toaster: Toaster, 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 8960ad039..176c40a34 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 @@ -4,7 +4,7 @@ import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { BaseFormComponent, LoadingService } from '@iqser/common-ui'; import { IProfile } from '@red/domain'; -import { languagesTranslations } from '../../../translations/languages-translations'; +import { languagesTranslations } from '@translations/languages-translations'; import { PermissionsService } from '@services/permissions.service'; import { UserService } from '@services/user.service'; import { ConfigService } from '@services/config.service'; 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 e8b16024c..5efadeea0 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 @@ -1,7 +1,7 @@ import { Component, HostBinding, Input, OnInit } from '@angular/core'; import { UserPreferenceService } from '@services/user-preference.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { adminSideNavTranslations } from '../translations/admin-side-nav-translations'; +import { adminSideNavTranslations } from '@translations/admin-side-nav-translations'; import { UserService } from '@services/user.service'; import { ActivatedRoute } from '@angular/router'; import { AdminSideNavType, AdminSideNavTypes, ENTITY_TYPE } from '@red/domain'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts index 1c1e6b7ee..85d308415 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts @@ -5,7 +5,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { BaseDialogComponent, IqserEventTarget, LoadingService, Toaster } from '@iqser/common-ui'; import { HttpErrorResponse } from '@angular/common/http'; import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; -import { dossierAttributeTypesTranslations } from '../../translations/dossier-attribute-types-translations'; +import { dossierAttributeTypesTranslations } from '@translations/dossier-attribute-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @Component({ 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 e98272044..912338014 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 @@ -2,7 +2,7 @@ import { Component, Inject, Injector } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { applyIntervalConstraints } from '@utils/date-inputs-utils'; -import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; +import { downloadTypesTranslations } from '@translations/download-types-translations'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts index ebc79cfcf..d3272ca17 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/c import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { FileAttributeConfigTypes, IFileAttributeConfig } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { fileAttributeTypesTranslations } from '../../translations/file-attribute-types-translations'; +import { fileAttributeTypesTranslations } from '@translations/file-attribute-types-translations'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { BaseDialogComponent } from '@iqser/common-ui'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts index db3744411..a6a727295 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output } from '@a import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AdminDialogService } from '../../../services/admin-dialog.service'; import { BaseFormComponent, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; -import { rolesTranslations } from '../../../../../translations/roles-translations'; +import { rolesTranslations } from '@translations/roles-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { IProfileUpdateRequest, User } from '@red/domain'; import { UserService } from '@services/user.service'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts index 7c89dd81a..76ef7b7f5 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts @@ -4,7 +4,7 @@ import { DefaultColorType, IColors } from '@red/domain'; import { BaseDialogComponent, Toaster } from '@iqser/common-ui'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; -import { defaultColorsTranslations } from '../../translations/default-colors-translations'; +import { defaultColorsTranslations } from '@translations/default-colors-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DictionaryService } from '@services/entity-services/dictionary.service'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts index 45334ed9c..ed3d5232c 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/c import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { FileAttributeEncodingTypes, IFileAttributesConfig } from '@red/domain'; -import { fileAttributeEncodingTypesTranslations } from '../../translations/file-attribute-encoding-types-translations'; +import { fileAttributeEncodingTypesTranslations } from '@translations/file-attribute-encoding-types-translations'; import { BaseDialogComponent, Toaster } from '@iqser/common-ui'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts index f9b5f38ad..47303f061 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, forwardRef, Injector, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { CircleButtonTypes, DefaultListingServices, ListingComponent, TableColumnConfig } from '@iqser/common-ui'; -import { fileAttributeTypesTranslations } from '../../../translations/file-attribute-types-translations'; +import { fileAttributeTypesTranslations } from '@translations/file-attribute-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FileAttributeConfigTypes, IField } from '@red/domain'; diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts index 0d762101e..2d7f2c4f5 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts @@ -2,7 +2,7 @@ import { Component, forwardRef, Injector, OnDestroy, OnInit } from '@angular/cor import { FormBuilder, FormGroup } from '@angular/forms'; import { applyIntervalConstraints } from '@utils/date-inputs-utils'; import { DefaultListingServices, ListingComponent, LoadingService, TableColumnConfig } from '@iqser/common-ui'; -import { auditCategoriesTranslations } from '../../translations/audit-categories-translations'; +import { auditCategoriesTranslations } from '@translations/audit-categories-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { Audit, IAudit, IAuditResponse, IAuditSearchRequest } from '@red/domain'; diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts index a53a3774f..ce8d058d5 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts @@ -9,7 +9,7 @@ import { LoadingService, TableColumnConfig, } from '@iqser/common-ui'; -import { defaultColorsTranslations } from '../../translations/default-colors-translations'; +import { defaultColorsTranslations } from '@translations/default-colors-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { DictionaryService } from '@services/entity-services/dictionary.service'; diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts index c22cf5c3e..faa594f40 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts @@ -10,7 +10,7 @@ import { } from '@iqser/common-ui'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; -import { dossierAttributeTypesTranslations } from '../../translations/dossier-attribute-types-translations'; +import { dossierAttributeTypesTranslations } from '@translations/dossier-attribute-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { DOSSIER_TEMPLATE_ID, DossierAttributeConfig, IDossierAttributeConfig } from '@red/domain'; 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 index e7532490a..2c9f4c4e7 100644 --- 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 @@ -3,7 +3,7 @@ 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'; -import { dossierTemplateStatusTranslations } from '../../../translations/dossier-template-status-translations'; +import { dossierTemplateStatusTranslations } from '@translations/dossier-template-status-translations'; @Component({ selector: 'redaction-table-item [dossierTemplate]', diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts index 86985fe3a..d93717f5e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts @@ -19,7 +19,7 @@ import { TableColumnConfig, Toaster, } from '@iqser/common-ui'; -import { fileAttributeTypesTranslations } from '../../translations/file-attribute-types-translations'; +import { fileAttributeTypesTranslations } from '@translations/file-attribute-types-translations'; import { UserService } from '@services/user.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DOSSIER_TEMPLATE_ID, FileAttributeConfig, IFileAttributeConfig, IFileAttributesConfig, User } from '@red/domain'; 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 701d41570..0da291258 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 @@ -6,7 +6,7 @@ import { DOSSIER_TEMPLATE_ID, DossierTemplate, DossierTemplateStats } from '@red import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; import { AdminDialogService } from '../../../services/admin-dialog.service'; import { PermissionsService } from '@services/permissions.service'; -import { dossierTemplateStatusTranslations } from '../../../translations/dossier-template-status-translations'; +import { dossierTemplateStatusTranslations } from '@translations/dossier-template-status-translations'; @Component({ templateUrl: './dossier-template-info-screen.component.html', diff --git a/apps/red-ui/src/app/modules/admin/screens/permissions/config.service.ts b/apps/red-ui/src/app/modules/admin/screens/permissions/config.service.ts index d4b22c715..846024fd3 100644 --- a/apps/red-ui/src/app/modules/admin/screens/permissions/config.service.ts +++ b/apps/red-ui/src/app/modules/admin/screens/permissions/config.service.ts @@ -3,7 +3,7 @@ import { TableColumnConfig } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { PermissionsMapping } from '@red/domain'; import { PermissionsConfigurationMapService } from '@services/entity-permissions/permissions-configuration-map.service'; -import { permissionsTranslations } from '../../translations/permissions-translations'; +import { permissionsTranslations } from '@translations/permissions-translations'; @Injectable() export class ConfigService { diff --git a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts index d39ec4380..23e29aa0f 100644 --- a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts @@ -10,7 +10,7 @@ import { PermissionsConfigurationMapService } from '@services/entity-permissions import { firstValueFrom } from 'rxjs'; import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { tap } from 'rxjs/operators'; -import { permissionsTranslations } from '../../../translations/permissions-translations'; +import { permissionsTranslations } from '@translations/permissions-translations'; import { UserService } from '@services/user.service'; import { RouterHistoryService } from '@services/router-history.service'; diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts index 13860af28..5d54fbe82 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts @@ -6,7 +6,7 @@ import { PermissionsService } from '@services/permissions.service'; import { generalPlaceholdersDescriptionsTranslations, placeholdersDescriptionsTranslations, -} from '../../../translations/placeholders-descriptions-translations'; +} from '@translations/placeholders-descriptions-translations'; import { removeBraces } from '@utils/functions'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { AdminDialogService } from '../../../services/admin-dialog.service'; diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts index 7ae442fb7..8ad8b70c4 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts @@ -16,7 +16,7 @@ import { } from '@iqser/common-ui'; import { firstValueFrom, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { rolesTranslations } from '../../../../translations/roles-translations'; +import { rolesTranslations } from '@translations/roles-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { userTypeChecker, userTypeFilters } from '../../../../utils'; diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts index 261e7c10f..85f3bebd8 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts @@ -12,7 +12,7 @@ import { import { TranslateChartService } from '@services/translate-chart.service'; import { UserService } from '@services/user.service'; import { FilterService, ProgressBarConfigModel, shareLast, Toaster } from '@iqser/common-ui'; -import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ActivatedRoute } from '@angular/router'; import { firstValueFrom, Observable } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts index 4c81d4ecb..fc8c94544 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts @@ -12,14 +12,14 @@ import { WorkflowConfig, } from '@iqser/common-ui'; import { Dossier, File, IFileAttributeConfig, StatusSorter, WorkflowFileStatus, WorkflowFileStatuses } from '@red/domain'; -import { workflowFileStatusTranslations } from '../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { PermissionsService } from '@services/permissions.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; import { UserService } from '@services/user.service'; import { DossiersDialogService } from '../dossier/shared/services/dossiers-dialog.service'; import { annotationFilterChecker, RedactionFilterSorter } from '../../utils'; -import { workloadTranslations } from '../dossier/translations/workload-translations'; +import { workloadTranslations } from '@translations/workload-translations'; import { ConfigService as AppConfigService } from '@services/config.service'; import { BehaviorSubject, Observable } from 'rxjs'; import { BulkActionsService } from './services/bulk-actions.service'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 78d4443e0..075c4fe3e 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, Injector, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DOSSIER_TEMPLATE_ID, DownloadFileType, IDossierRequest, IDossierTemplate, IReportTemplate } from '@red/domain'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; +import { downloadTypesTranslations } from '@translations/download-types-translations'; import { BaseDialogComponent, IconButtonTypes, LoadingService, SaveOptions } from '@iqser/common-ui'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index 60a79f93f..7cb03d950 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { Dossier, DownloadFileType, IReportTemplate } from '@red/domain'; import { FormBuilder, FormGroup } from '@angular/forms'; import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface'; -import { downloadTypesTranslations } from '../../../../../translations/download-types-translations'; +import { downloadTypesTranslations } from '@translations/download-types-translations'; import { ReportTemplateService } from '@services/report-template.service'; import { PermissionsService } from '@services/permissions.service'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts index e3603fea0..a561060b2 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { SuperTypeSorter } from '@utils/sorters/super-type-sorter'; import { Filter, handleCheckedValue, IFilter, INestedFilter, NestedFilter } from '@iqser/common-ui'; -import { annotationTypesTranslations } from '../../../translations/annotation-types-translations'; +import { annotationTypesTranslations } from '@translations/annotation-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { IViewedPage } from '@red/domain'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; diff --git a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts index df6c1dcb1..f0a782079 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts @@ -5,9 +5,9 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; import { UserPreferenceService } from '@services/user-preference.service'; import { UserService } from '@services/user.service'; -import { workflowFileStatusTranslations } from '../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { dossierMemberChecker, dossierStateChecker, RedactionFilterSorter } from '../../utils'; -import { workloadTranslations } from '../dossier/translations/workload-translations'; +import { workloadTranslations } from '@translations/workload-translations'; import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; import { DossierStatesMapService } from '@services/entity-services/dossier-states-map.service'; import { DossiersDialogService } from '../dossier/shared/services/dossiers-dialog.service'; diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts index 98c6d1940..cb873d3a2 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { TranslateService } from '@ngx-translate/core'; -import { annotationChangesTranslations } from '../../../../translations/annotation-changes-translations'; +import { annotationChangesTranslations } from '@translations/annotation-changes-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { MultiSelectService } from '../../services/multi-select.service'; import { KeysOf, ListingService } from '@iqser/common-ui'; diff --git a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts index b2662eee7..4b7ed0e41 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Dossier, File, StatusBarConfigs, User } from '@red/domain'; import { List, LoadingService, Toaster } from '@iqser/common-ui'; import { PermissionsService } from '@services/permissions.service'; -import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { FilesService } from '@services/entity-services/files.service'; diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts index fe571896f..40d5fd376 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts @@ -6,7 +6,7 @@ import { BaseDialogComponent, LoadingService } from '@iqser/common-ui'; import { TextHighlightService } from '../../../dossier/services/text-highlight.service'; import { firstValueFrom } from 'rxjs'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; -import { highlightsTranslations } from '../../../../translations/highlights-translations'; +import { highlightsTranslations } from '@translations/highlights-translations'; export interface HighlightActionData { readonly operation: TextHighlightOperation; diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts index 910a627d4..2a1cfbbf6 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, Injector, OnInit } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; -import { imageCategoriesTranslations } from '../../../dossier/translations/image-categories-translations'; +import { imageCategoriesTranslations } from '@translations/image-categories-translations'; import { Dossier, ImageCategory } from '@red/domain'; import { BaseDialogComponent } from '@iqser/common-ui'; diff --git a/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts b/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts index d4421c017..46ac67e14 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts @@ -14,7 +14,7 @@ import { type AnnotationWrapper } from '@models/file/annotation.wrapper'; import { GenericService, List, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; import { map, tap } from 'rxjs/operators'; import { PermissionsService } from '@services/permissions.service'; -import { dictionaryActionsTranslations, manualRedactionActionsTranslations } from '../../../translations/annotation-actions-translations'; +import { dictionaryActionsTranslations, manualRedactionActionsTranslations } from '@translations/annotation-actions-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; diff --git a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts index 5eb38d153..84c70726e 100644 --- a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts +++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts @@ -14,7 +14,7 @@ import { combineLatest, Observable, of } from 'rxjs'; import { debounceTime, map, startWith, switchMap, tap } from 'rxjs/operators'; import { ActivatedRoute, Router } from '@angular/router'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { workflowFileStatusTranslations } from '../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { TranslateService } from '@ngx-translate/core'; import { RouterHistoryService } from '@services/router-history.service'; import { Dossier, DOSSIERS_ARCHIVE, IMatchedDocument, ISearchListItem, ISearchResponse } from '@red/domain'; diff --git a/apps/red-ui/src/app/services/notifications.service.ts b/apps/red-ui/src/app/services/notifications.service.ts index 2356cd6c1..f2eed9725 100644 --- a/apps/red-ui/src/app/services/notifications.service.ts +++ b/apps/red-ui/src/app/services/notifications.service.ts @@ -4,7 +4,7 @@ import { TranslateService } from '@ngx-translate/core'; import { EMPTY, iif, Observable, of, timer } from 'rxjs'; import { Dossier, INotification, Notification, NotificationTypes } from '@red/domain'; import { map, switchMap, tap } from 'rxjs/operators'; -import { notificationsTranslations } from '../translations/notifications-translations'; +import { notificationsTranslations } from '@translations/notifications-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import dayjs from 'dayjs'; diff --git a/apps/red-ui/src/app/services/translate-chart.service.ts b/apps/red-ui/src/app/services/translate-chart.service.ts index 71fb222b9..516c8a95c 100644 --- a/apps/red-ui/src/app/services/translate-chart.service.ts +++ b/apps/red-ui/src/app/services/translate-chart.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { DonutChartConfig } from '@red/domain'; import { TranslateService } from '@ngx-translate/core'; -import { rolesTranslations } from '../translations/roles-translations'; -import { workflowFileStatusTranslations } from '../translations/file-status-translations'; +import { rolesTranslations } from '@translations/roles-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { DossierStatesMapService } from './entity-services/dossier-states-map.service'; @Injectable({ diff --git a/apps/red-ui/src/app/translations/account-translations.ts b/apps/red-ui/src/app/translations/account-translations.ts new file mode 100644 index 000000000..ecd67aa2b --- /dev/null +++ b/apps/red-ui/src/app/translations/account-translations.ts @@ -0,0 +1,6 @@ +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; + +export const accountTranslations: Record = { + notifications: _('notifications-screen.title'), + 'user-profile': _('user-profile-screen.title'), +}; diff --git a/apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts b/apps/red-ui/src/app/translations/admin-side-nav-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts rename to apps/red-ui/src/app/translations/admin-side-nav-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts b/apps/red-ui/src/app/translations/audit-categories-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts rename to apps/red-ui/src/app/translations/audit-categories-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts b/apps/red-ui/src/app/translations/default-colors-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts rename to apps/red-ui/src/app/translations/default-colors-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts b/apps/red-ui/src/app/translations/dossier-attribute-types-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts rename to apps/red-ui/src/app/translations/dossier-attribute-types-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/dossier-template-status-translations.ts b/apps/red-ui/src/app/translations/dossier-template-status-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/dossier-template-status-translations.ts rename to apps/red-ui/src/app/translations/dossier-template-status-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/file-attribute-encoding-types-translations.ts b/apps/red-ui/src/app/translations/file-attribute-encoding-types-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/file-attribute-encoding-types-translations.ts rename to apps/red-ui/src/app/translations/file-attribute-encoding-types-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts b/apps/red-ui/src/app/translations/file-attribute-types-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts rename to apps/red-ui/src/app/translations/file-attribute-types-translations.ts diff --git a/apps/red-ui/src/app/modules/dossier/translations/image-categories-translations.ts b/apps/red-ui/src/app/translations/image-categories-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/translations/image-categories-translations.ts rename to apps/red-ui/src/app/translations/image-categories-translations.ts diff --git a/apps/red-ui/src/app/modules/account/translations/languages-translations.ts b/apps/red-ui/src/app/translations/languages-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/account/translations/languages-translations.ts rename to apps/red-ui/src/app/translations/languages-translations.ts diff --git a/apps/red-ui/src/app/modules/account/translations/notifications-translations.ts b/apps/red-ui/src/app/translations/notifications-settings-translations.ts similarity index 91% rename from apps/red-ui/src/app/modules/account/translations/notifications-translations.ts rename to apps/red-ui/src/app/translations/notifications-settings-translations.ts index 872a7afa3..c6b8f6cb1 100644 --- a/apps/red-ui/src/app/modules/account/translations/notifications-translations.ts +++ b/apps/red-ui/src/app/translations/notifications-settings-translations.ts @@ -1,6 +1,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -export const notificationsTranslations: { [key: string]: string } = { +export const notificationsSettingsTranslations: Record = { daily: _('notifications-screen.schedule.instant'), daily_summary: _('notifications-screen.schedule.daily'), weekly_summary: _('notifications-screen.schedule.weekly'), @@ -24,6 +24,4 @@ export const notificationsTranslations: { [key: string]: string } = { dossier: _('notifications-screen.groups.dossier'), document: _('notifications-screen.groups.document'), other: _('notifications-screen.groups.other'), - notifications: _('notifications-screen.title'), - 'user-profile': _('user-profile-screen.title'), } as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/permissions-translations.ts b/apps/red-ui/src/app/translations/permissions-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/permissions-translations.ts rename to apps/red-ui/src/app/translations/permissions-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts b/apps/red-ui/src/app/translations/placeholders-descriptions-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts rename to apps/red-ui/src/app/translations/placeholders-descriptions-translations.ts diff --git a/apps/red-ui/src/app/modules/dossier/translations/workload-translations.ts b/apps/red-ui/src/app/translations/workload-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/translations/workload-translations.ts rename to apps/red-ui/src/app/translations/workload-translations.ts diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 9b8ce8cdb..228749f47 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1531,8 +1531,6 @@ "backend-version": "Backend-Version der Anwendung", "chart": { "cumulative": "Seiten insgesamt", - "legend": "Legende", - "licensed-total": "Insgesamt lizensiert", "pages-per-month": "Seiten pro Monat", "total-pages": "Gesamtzahl der Seiten" }, diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 2df6a0b00..73a430802 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1531,8 +1531,6 @@ "backend-version": "Backend Application Version", "chart": { "cumulative": "Cumulative Pages", - "legend": "Legend", - "licensed-total": "Licensed Total", "pages-per-month": "Pages per Month", "total-pages": "Total Pages" }, diff --git a/tsconfig.base.json b/tsconfig.base.json index 9901520b5..e2bd919d0 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -27,6 +27,7 @@ "@red/domain": ["libs/red-domain/src/index.ts"], "@services/*": ["apps/red-ui/src/app/services/*"], "@shared/*": ["apps/red-ui/src/app/modules/shared/*"], + "@translations/*": ["apps/red-ui/src/app/translations/*"], "@upload-download/*": ["apps/red-ui/src/app/modules/upload-download/*"], "@utils/*": ["apps/red-ui/src/app/utils/*"] } From f60ca37f3fca4b30273ac01021cd0b729420fa30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 18 May 2022 15:51:29 +0300 Subject: [PATCH 04/13] RED-3800: Reorganize modules --- apps/red-ui/src/app/app-routing.module.ts | 34 ++++++++++++++- .../src/app/guards/dossier-files-guard.ts | 4 +- ...edit-dossier-attribute-dialog.component.ts | 2 +- ...ier-attributes-listing-screen.component.ts | 2 +- .../watermark-screen.component.ts | 2 +- .../template-stats.component.ts | 4 +- .../app/modules/dashboard/dashboard.module.ts | 3 +- .../dossier-details-stats.component.ts | 4 +- .../dossier-overview/config.service.ts | 2 +- .../dossier-overview.module.ts | 2 +- .../dossier-overview-screen.component.ts | 6 +-- .../services/bulk-actions.service.ts | 8 ++-- .../dossier/dossiers-routing.module.ts | 41 ------------------- .../app/modules/dossier/dossiers.module.ts | 12 ------ .../dossier/shared/shared-dossiers.module.ts | 37 ----------------- .../dossiers-listing-actions.component.ts | 4 +- .../dossiers-listing/config.service.ts | 4 +- .../dossiers-listing.module.ts | 2 +- .../dossiers-listing-screen.component.ts | 4 +- .../file-workload/file-workload.component.ts | 2 +- .../page-indicator.component.ts | 2 +- .../pdf-viewer/pdf-viewer.component.ts | 6 +-- .../user-management.component.ts | 4 +- .../document-info-dialog.component.ts | 2 +- .../highlight-action-dialog.component.ts | 2 +- .../import-redactions-dialog.ts | 2 +- .../file-preview/file-preview-providers.ts | 2 +- .../file-preview-screen.component.ts | 10 ++--- .../file-preview/file-preview.module.ts | 2 +- .../services/annotation-actions.service.ts | 2 +- .../services/annotation-draw.service.ts | 2 +- .../services/annotation-processing.service.ts | 4 +- .../services/document-info.service.ts | 2 +- .../services/file-data.service.ts | 8 ++-- .../services/file-preview-state.service.ts | 6 +-- .../services/page-rotation.service.ts | 6 +-- .../services/pdf-viewer.service.ts | 2 +- .../file-preview/services/stamp.service.ts | 2 +- .../file-preview/services/tooltips.service.ts | 2 +- .../services/viewer-header-config.service.ts | 2 +- .../utils/compare-mode.utils.ts | 2 +- .../{shared => utils}/constants.ts | 0 .../utils/pdf-calculation.utils.ts | 0 .../search-screen/search-screen.component.ts | 2 +- .../date-column/date-column.component.html | 0 .../date-column/date-column.component.scss | 0 .../date-column/date-column.component.ts | 0 .../file-actions/file-actions.component.html | 0 .../file-actions/file-actions.component.scss | 2 +- .../file-actions/file-actions.component.ts | 12 +++--- ...gn-reviewer-approver-dialog.component.html | 0 ...gn-reviewer-approver-dialog.component.scss | 0 ...sign-reviewer-approver-dialog.component.ts | 2 +- .../edit-dossier-attributes.component.html | 0 .../edit-dossier-attributes.component.scss | 0 .../edit-dossier-attributes.component.ts | 2 +- .../edit-dossier-dictionary.component.html | 0 .../edit-dossier-dictionary.component.scss | 0 .../edit-dossier-dictionary.component.ts | 0 ...it-dossier-download-package.component.html | 0 ...it-dossier-download-package.component.scss | 0 ...edit-dossier-download-package.component.ts | 0 .../edit-dossier-dialog.component.html | 0 .../edit-dossier-dialog.component.scss | 0 .../edit-dossier-dialog.component.ts | 0 .../edit-dossier-section.interface.ts | 0 .../edit-dossier-team.component.html | 0 .../edit-dossier-team.component.scss | 0 .../edit-dossier-team.component.ts | 0 .../edit-dossier-general-info.component.html | 0 .../edit-dossier-general-info.component.scss | 0 .../edit-dossier-general-info.component.ts | 2 +- .../services/dossiers-dialog.service.ts | 13 ++---- .../services/file-assign.service.ts | 2 +- .../shared-dossiers/shared-dossiers.module.ts | 35 ++++++++++++++++ .../team-members/team-members.component.ts | 2 +- .../add-dossier-dialog.component.html | 0 .../add-dossier-dialog.component.scss | 0 .../add-dossier-dialog.component.ts | 2 +- .../modules/shared/services/dialog.service.ts | 20 +++++++++ .../src/app/modules/shared/shared.module.ts | 2 + .../trash-screen/trash-screen.component.ts | 2 +- .../services/file-upload.service.ts | 4 +- .../src/app/services/breadcrumbs.service.ts | 2 +- .../dossiers/archived-dossiers.service.ts | 2 +- .../dossier-attributes.service.ts | 0 .../platform-search.service.ts | 4 +- .../services/entity-services/trash.service.ts | 2 +- .../entity-services}/watermark.service.ts | 0 .../file-management.service.ts | 4 +- .../files-map.service.ts | 0 .../files.service.ts | 4 +- .../files}/redaction-import.service.ts | 2 +- .../files}/redaction-log.service.ts | 0 .../files}/text-highlight.service.ts | 2 +- .../viewed-pages.service.ts | 0 .../src/app/services/permissions.service.ts | 2 +- .../src/app/services/reanalysis.service.ts | 4 +- 98 files changed, 187 insertions(+), 196 deletions(-) delete mode 100644 apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts delete mode 100644 apps/red-ui/src/app/modules/dossier/dossiers.module.ts delete mode 100644 apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts rename apps/red-ui/src/app/modules/{dossier => file-preview}/services/annotation-processing.service.ts (97%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/utils/compare-mode.utils.ts (97%) rename apps/red-ui/src/app/modules/file-preview/{shared => utils}/constants.ts (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/utils/pdf-calculation.utils.ts (100%) rename apps/red-ui/src/app/modules/{dossier/shared => shared-dossiers}/components/date-column/date-column.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/shared => shared-dossiers}/components/date-column/date-column.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/shared => shared-dossiers}/components/date-column/date-column.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/shared => shared-dossiers}/components/file-actions/file-actions.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/shared => shared-dossiers}/components/file-actions/file-actions.component.scss (86%) rename apps/red-ui/src/app/modules/{dossier/shared => shared-dossiers}/components/file-actions/file-actions.component.ts (97%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts (98%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts (98%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/edit-dossier-section.interface.ts (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => shared-dossiers}/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts (99%) rename apps/red-ui/src/app/modules/{dossier/shared => shared-dossiers}/services/dossiers-dialog.service.ts (58%) rename apps/red-ui/src/app/modules/{dossier/shared => shared-dossiers}/services/file-assign.service.ts (98%) create mode 100644 apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts rename apps/red-ui/src/app/modules/{dossier => shared}/dialogs/add-dossier-dialog/add-dossier-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => shared}/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => shared}/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts (98%) create mode 100644 apps/red-ui/src/app/modules/shared/services/dialog.service.ts rename apps/red-ui/src/app/{modules/shared/services/controller-wrappers => services/entity-services}/dossier-attributes.service.ts (100%) rename apps/red-ui/src/app/{modules/shared/services => services/entity-services}/watermark.service.ts (100%) rename apps/red-ui/src/app/services/{entity-services => files}/file-management.service.ts (94%) rename apps/red-ui/src/app/services/{entity-services => files}/files-map.service.ts (100%) rename apps/red-ui/src/app/services/{entity-services => files}/files.service.ts (96%) rename apps/red-ui/src/app/{modules/dossier/shared/services => services/files}/redaction-import.service.ts (96%) rename apps/red-ui/src/app/{modules/dossier/services => services/files}/redaction-log.service.ts (100%) rename apps/red-ui/src/app/{modules/dossier/services => services/files}/text-highlight.service.ts (96%) rename apps/red-ui/src/app/services/{entity-services => files}/viewed-pages.service.ts (100%) diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index 11fda4043..32afdf260 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -13,7 +13,8 @@ import { DossierTemplatesGuard } from '@guards/dossier-templates.guard'; import { DossierTemplateExistsGuard } from '@guards/dossier-template-exists.guard'; import { DashboardGuard } from '@guards/dashboard-guard.service'; import { TrashGuard } from '@guards/trash.guard'; -import { ARCHIVE_ROUTE, DOSSIER_TEMPLATE_ID, DOSSIERS_ARCHIVE, DOSSIERS_ROUTE } from '@red/domain'; +import { ARCHIVE_ROUTE, BreadcrumbTypes, DOSSIER_ID, DOSSIER_TEMPLATE_ID, DOSSIERS_ARCHIVE, DOSSIERS_ROUTE, FILE_ID } from '@red/domain'; +import { DossierFilesGuard } from '@guards/dossier-files-guard'; const routes: Routes = [ { @@ -79,7 +80,36 @@ const routes: Routes = [ children: [ { path: `${DOSSIERS_ROUTE}`, - loadChildren: () => import('./modules/dossier/dossiers.module').then(m => m.DossiersModule), + children: [ + { + path: `:${DOSSIER_ID}`, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [DossierFilesGuard], + breadcrumbs: [BreadcrumbTypes.dossierTemplate, BreadcrumbTypes.dossier], + dossiersService: ACTIVE_DOSSIERS_SERVICE, + }, + loadChildren: () => + import('./modules/dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule), + }, + { + path: `:${DOSSIER_ID}/file/:${FILE_ID}`, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [DossierFilesGuard], + breadcrumbs: [BreadcrumbTypes.dossierTemplate, BreadcrumbTypes.dossier, BreadcrumbTypes.file], + dossiersService: ACTIVE_DOSSIERS_SERVICE, + }, + loadChildren: () => import('./modules/file-preview/file-preview.module').then(m => m.FilePreviewModule), + }, + { + path: '', + pathMatch: 'full', + loadChildren: () => + import('./modules/dossiers-listing/dossiers-listing.module').then(m => m.DossiersListingModule), + data: { breadcrumbs: [BreadcrumbTypes.dossierTemplate] }, + }, + ], canActivate: [CompositeRouteGuard], data: { routeGuards: [DossiersGuard], diff --git a/apps/red-ui/src/app/guards/dossier-files-guard.ts b/apps/red-ui/src/app/guards/dossier-files-guard.ts index 4b0e5bd68..2b065449e 100644 --- a/apps/red-ui/src/app/guards/dossier-files-guard.ts +++ b/apps/red-ui/src/app/guards/dossier-files-guard.ts @@ -1,7 +1,7 @@ import { Injectable, Injector, ProviderToken } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; -import { FilesMapService } from '@services/entity-services/files-map.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesMapService } from '@services/files/files-map.service'; +import { FilesService } from '@services/files/files.service'; import { firstValueFrom } from 'rxjs'; import { DOSSIER_ID, DOSSIER_TEMPLATE_ID } from '@red/domain'; import { DossiersService } from '@services/dossiers/dossiers.service'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts index 85d308415..4f7a8fd7a 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts @@ -4,7 +4,7 @@ import { DossierAttributeConfigTypes, FileAttributeConfigTypes, IDossierAttribut import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { BaseDialogComponent, IqserEventTarget, LoadingService, Toaster } from '@iqser/common-ui'; import { HttpErrorResponse } from '@angular/common/http'; -import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; +import { DossierAttributesService } from '@services/entity-services/dossier-attributes.service'; import { dossierAttributeTypesTranslations } from '@translations/dossier-attribute-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts index faa594f40..9c7080f7d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts @@ -9,7 +9,7 @@ import { TableColumnConfig, } from '@iqser/common-ui'; import { AdminDialogService } from '../../services/admin-dialog.service'; -import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; +import { DossierAttributesService } from '@services/entity-services/dossier-attributes.service'; import { dossierAttributeTypesTranslations } from '@translations/dossier-attribute-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts index ce7d07ecc..75dba4ccc 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts @@ -9,7 +9,7 @@ import { DOSSIER_TEMPLATE_ID, IWatermark, WatermarkOrientation, WatermarkOrienta import { BASE_HREF } from '../../../../../tokens'; import { stampPDFPage } from '@utils/page-stamper'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { WatermarkService } from '@shared/services/watermark.service'; +import { WatermarkService } from '@services/entity-services/watermark.service'; import { firstValueFrom, Observable, of, switchMap } from 'rxjs'; import { catchError, tap } from 'rxjs/operators'; import { ActivatedRoute } from '@angular/router'; diff --git a/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.ts b/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.ts index 9c233ce5f..fe324c754 100644 --- a/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.ts +++ b/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { DashboardStats } from '@red/domain'; import { IconButtonTypes } from '@iqser/common-ui'; -import { DossiersDialogService } from '../../../dossier/shared/services/dossiers-dialog.service'; import { TranslateService } from '@ngx-translate/core'; import { TranslateChartService } from '@services/translate-chart.service'; import { PermissionsService } from '@services/permissions.service'; +import { SharedDialogService } from '@shared/services/dialog.service'; @Component({ selector: 'redaction-template-stats [stats]', @@ -18,7 +18,7 @@ export class TemplateStatsComponent { @Input() stats: DashboardStats; constructor( - private readonly _dialogService: DossiersDialogService, + private readonly _dialogService: SharedDialogService, private readonly _translateService: TranslateService, readonly translateChartService: TranslateChartService, readonly permissionsService: PermissionsService, 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 db67fc124..3acd8ffa0 100644 --- a/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts +++ b/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts @@ -4,7 +4,6 @@ import { DashboardScreenComponent } from './dashboard-screen/dashboard-screen.co import { RouterModule } from '@angular/router'; import { SharedModule } from '../shared/shared.module'; import { TemplateStatsComponent } from './components/template-stats/template-stats.component'; -import { SharedDossiersModule } from '../dossier/shared/shared-dossiers.module'; import { BreadcrumbTypes } from '@red/domain'; const routes = [ @@ -19,6 +18,6 @@ const routes = [ @NgModule({ declarations: [DashboardScreenComponent, TemplateStatsComponent], - imports: [RouterModule.forChild(routes), CommonModule, SharedModule, SharedDossiersModule], + imports: [RouterModule.forChild(routes), CommonModule, SharedModule], }) export class DashboardModule {} diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts index 3263d871c..561cb7575 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { Dossier, DossierAttributeWithValue, DossierStats } from '@red/domain'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; import { firstValueFrom, Observable } from 'rxjs'; import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; -import { DossiersDialogService } from '../../../dossier/shared/services/dossiers-dialog.service'; +import { DossiersDialogService } from '../../../shared-dossiers/services/dossiers-dialog.service'; @Component({ selector: 'redaction-dossier-details-stats', diff --git a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts index fc8c94544..7ea4cf40a 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts @@ -17,7 +17,7 @@ import { PermissionsService } from '@services/permissions.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; import { UserService } from '@services/user.service'; -import { DossiersDialogService } from '../dossier/shared/services/dossiers-dialog.service'; +import { DossiersDialogService } from '../shared-dossiers/services/dossiers-dialog.service'; import { annotationFilterChecker, RedactionFilterSorter } from '../../utils'; import { workloadTranslations } from '@translations/workload-translations'; import { ConfigService as AppConfigService } from '@services/config.service'; 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 9a0011201..7454dd399 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts @@ -9,7 +9,7 @@ import { DossierOverviewBulkActionsComponent } from './components/bulk-actions/d import { DossierDetailsComponent } from './components/dossier-details/dossier-details.component'; import { DossierDetailsStatsComponent } from './components/dossier-details-stats/dossier-details-stats.component'; import { TableItemComponent } from './components/table-item/table-item.component'; -import { SharedDossiersModule } from '../dossier/shared/shared-dossiers.module'; +import { SharedDossiersModule } from '../shared-dossiers/shared-dossiers.module'; import { FileWorkloadComponent } from './components/table-item/file-workload/file-workload.component'; import { WorkflowItemComponent } from './components/workflow-item/workflow-item.component'; import { DossierOverviewScreenHeaderComponent } from './components/screen-header/dossier-overview-screen-header.component'; diff --git a/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.ts index c0d6e5cf5..330bb820c 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.ts @@ -22,7 +22,7 @@ import { TableComponent, WorkflowConfig, } from '@iqser/common-ui'; -import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; +import { DossierAttributesService } from '@services/entity-services/dossier-attributes.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { PermissionsService } from '@services/permissions.service'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; @@ -30,8 +30,8 @@ import { FileAttributesService } from '@services/entity-services/file-attributes import { ConfigService } from '../config.service'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; import { UserPreferenceService } from '@services/user-preference.service'; -import { FilesMapService } from '@services/entity-services/files-map.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesMapService } from '@services/files/files-map.service'; +import { FilesService } from '@services/files/files.service'; import { BulkActionsService } from '../services/bulk-actions.service'; import { DossiersService } from '@services/dossiers/dossiers.service'; import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider'; diff --git a/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts b/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts index 7877dd3c2..6528bc387 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; import { Dossier, File } from '@red/domain'; -import { DossiersDialogService } from '../../dossier/shared/services/dossiers-dialog.service'; +import { DossiersDialogService } from '../../shared-dossiers/services/dossiers-dialog.service'; import { ConfirmationDialogInput, LoadingService } from '@iqser/common-ui'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ReanalysisService } from '@services/reanalysis.service'; -import { FileManagementService } from '@services/entity-services/file-management.service'; +import { FileManagementService } from '@services/files/file-management.service'; import { firstValueFrom } from 'rxjs'; -import { FileAssignService } from '../../dossier/shared/services/file-assign.service'; +import { FileAssignService } from '../../shared-dossiers/services/file-assign.service'; @Injectable() export class BulkActionsService { diff --git a/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts deleted file mode 100644 index 18045c9ad..000000000 --- a/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { DossierFilesGuard } from '@guards/dossier-files-guard'; -import { CompositeRouteGuard } from '@iqser/common-ui'; -import { BreadcrumbTypes, DOSSIER_ID, FILE_ID } from '@red/domain'; -import { ACTIVE_DOSSIERS_SERVICE } from '../../tokens'; - -const routes: Routes = [ - { - path: `:${DOSSIER_ID}`, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [DossierFilesGuard], - breadcrumbs: [BreadcrumbTypes.dossierTemplate, BreadcrumbTypes.dossier], - dossiersService: ACTIVE_DOSSIERS_SERVICE, - }, - loadChildren: () => import('../dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule), - }, - { - path: `:${DOSSIER_ID}/file/:${FILE_ID}`, - canActivate: [CompositeRouteGuard], - data: { - routeGuards: [DossierFilesGuard], - breadcrumbs: [BreadcrumbTypes.dossierTemplate, BreadcrumbTypes.dossier, BreadcrumbTypes.file], - dossiersService: ACTIVE_DOSSIERS_SERVICE, - }, - loadChildren: () => import('../file-preview/file-preview.module').then(m => m.FilePreviewModule), - }, - { - path: '', - pathMatch: 'full', - loadChildren: () => import('../dossiers-listing/dossiers-listing.module').then(m => m.DossiersListingModule), - data: { breadcrumbs: [BreadcrumbTypes.dossierTemplate] }, - }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class DossiersRoutingModule {} diff --git a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts deleted file mode 100644 index 341703f9d..000000000 --- a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SharedModule } from '@shared/shared.module'; -import { DossiersRoutingModule } from './dossiers-routing.module'; -import { FileUploadDownloadModule } from '@upload-download/file-upload-download.module'; -import { OverlayModule } from '@angular/cdk/overlay'; -import { SharedDossiersModule } from './shared/shared-dossiers.module'; - -@NgModule({ - imports: [CommonModule, SharedModule, SharedDossiersModule, FileUploadDownloadModule, DossiersRoutingModule, OverlayModule], -}) -export class DossiersModule {} diff --git a/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts deleted file mode 100644 index 99ad2410c..000000000 --- a/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FileAssignService } from './services/file-assign.service'; -import { FileActionsComponent } from './components/file-actions/file-actions.component'; -import { SharedModule } from '@shared/shared.module'; -import { RedactionImportService } from './services/redaction-import.service'; -import { DossiersDialogService } from './services/dossiers-dialog.service'; -import { EditDossierDialogComponent } from '../dialogs/edit-dossier-dialog/edit-dossier-dialog.component'; -import { AddDossierDialogComponent } from '../dialogs/add-dossier-dialog/add-dossier-dialog.component'; -import { AssignReviewerApproverDialogComponent } from '../dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component'; -import { EditDossierGeneralInfoComponent } from '../dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component'; -import { EditDossierDownloadPackageComponent } from '../dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component'; -import { EditDossierDictionaryComponent } from '../dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component'; -import { EditDossierAttributesComponent } from '../dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component'; -import { EditDossierTeamComponent } from '../dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component'; -import { DateColumnComponent } from './components/date-column/date-column.component'; - -const components = [ - FileActionsComponent, - EditDossierGeneralInfoComponent, - EditDossierDownloadPackageComponent, - EditDossierDictionaryComponent, - EditDossierAttributesComponent, - EditDossierTeamComponent, - FileActionsComponent, - DateColumnComponent, -]; -const dialogs = [EditDossierDialogComponent, AddDossierDialogComponent, AssignReviewerApproverDialogComponent]; -const services = [DossiersDialogService, FileAssignService, RedactionImportService]; - -@NgModule({ - declarations: [...components, ...dialogs], - exports: [...components, ...dialogs], - providers: [...services], - imports: [CommonModule, SharedModule], -}) -export class SharedDossiersModule {} diff --git a/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts index a051138b8..c82be5443 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts @@ -3,10 +3,10 @@ import { PermissionsService } from '@services/permissions.service'; import { CircleButtonTypes, List, ScrollableParentView, ScrollableParentViews, StatusBarConfig } from '@iqser/common-ui'; import { UserService } from '@services/user.service'; import { Dossier, DossierStats, File } from '@red/domain'; -import { DossiersDialogService } from '../../../dossier/shared/services/dossiers-dialog.service'; +import { DossiersDialogService } from '../../../shared-dossiers/services/dossiers-dialog.service'; import { LongPressEvent } from '@shared/directives/long-press.directive'; import { UserPreferenceService } from '@services/user-preference.service'; -import { FilesMapService } from '@services/entity-services/files-map.service'; +import { FilesMapService } from '@services/files/files-map.service'; import { ReanalysisService } from '@services/reanalysis.service'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts index f0a782079..57f16329d 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts @@ -10,8 +10,8 @@ import { dossierMemberChecker, dossierStateChecker, RedactionFilterSorter } from import { workloadTranslations } from '@translations/workload-translations'; import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; import { DossierStatesMapService } from '@services/entity-services/dossier-states-map.service'; -import { DossiersDialogService } from '../dossier/shared/services/dossiers-dialog.service'; import { PermissionsService } from '@services/permissions.service'; +import { SharedDialogService } from '@shared/services/dialog.service'; @Injectable() export class ConfigService { @@ -21,7 +21,7 @@ export class ConfigService { private readonly _userService: UserService, private readonly _dossierStatsService: DossierStatsService, private readonly _dossierStatesMapService: DossierStatesMapService, - private readonly _dialogService: DossiersDialogService, + private readonly _dialogService: SharedDialogService, private readonly _permissionsService: PermissionsService, ) {} 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 fe7684c00..31099f90a 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 @@ -9,7 +9,7 @@ import { SharedModule } from '@shared/shared.module'; import { DossiersListingDetailsComponent } from './components/dossiers-listing-details/dossiers-listing-details.component'; import { ConfigService } from './config.service'; import { TableItemComponent } from './components/table-item/table-item.component'; -import { SharedDossiersModule } from '../dossier/shared/shared-dossiers.module'; +import { SharedDossiersModule } from '../shared-dossiers/shared-dossiers.module'; import { DossierWorkloadColumnComponent } from './components/dossier-workload-column/dossier-workload-column.component'; import { DossierDocumentsStatusComponent } from './components/dossier-documents-status/dossier-documents-status.component'; diff --git a/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts index 7b4bc11c6..120154962 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts @@ -6,9 +6,9 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ConfigService } from '../config.service'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { tap } from 'rxjs/operators'; -import { DossiersDialogService } from '../../dossier/shared/services/dossiers-dialog.service'; import { Router } from '@angular/router'; import { UserPreferenceService } from '@services/user-preference.service'; +import { SharedDialogService } from '@shared/services/dialog.service'; @Component({ templateUrl: './dossiers-listing-screen.component.html', @@ -33,7 +33,7 @@ export class DossiersListingScreenComponent extends ListingComponent im protected readonly _injector: Injector, private readonly _configService: ConfigService, readonly permissionsService: PermissionsService, - private readonly _dialogService: DossiersDialogService, + private readonly _dialogService: SharedDialogService, private readonly _activeDossiersService: ActiveDossiersService, private readonly _userPreferenceService: UserPreferenceService, ) { diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts index 9c6909607..178a1a1fa 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts @@ -11,7 +11,7 @@ import { ViewChild, } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; -import { AnnotationProcessingService } from '../../../dossier/services/annotation-processing.service'; +import { AnnotationProcessingService } from '../../services/annotation-processing.service'; import { MatDialogRef, MatDialogState } from '@angular/material/dialog'; import scrollIntoView from 'scroll-into-view-if-needed'; import { diff --git a/apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.ts b/apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.ts index 430b10af9..da9c727b0 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.ts @@ -11,7 +11,7 @@ import { } from '@angular/core'; import { PermissionsService } from '@services/permissions.service'; import { ConfigService } from '@services/config.service'; -import { ViewedPagesService } from '@services/entity-services/viewed-pages.service'; +import { ViewedPagesService } from '@services/files/viewed-pages.service'; import { IViewedPage } from '@red/domain'; import { AutoUnsubscribe } from '@iqser/common-ui'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; diff --git a/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts index 72fa76200..3f70aabed 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts @@ -29,15 +29,15 @@ import { ConfigService } from '@services/config.service'; import { AutoUnsubscribe, ConfirmationDialogInput, CustomError, ErrorService, LoadingService } from '@iqser/common-ui'; import { PdfViewer } from '../../services/pdf-viewer.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { toPosition } from '../../../dossier/utils/pdf-calculation.utils'; +import { toPosition } from '../../utils/pdf-calculation.utils'; import { ViewModeService } from '../../services/view-mode.service'; import { MultiSelectService } from '../../services/multi-select.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; import { map, switchMap, tap, withLatestFrom } from 'rxjs/operators'; import { PageRotationService } from '../../services/page-rotation.service'; -import { ALLOWED_KEYBOARD_SHORTCUTS, HeaderElements, TextPopups } from '../../shared/constants'; +import { ALLOWED_KEYBOARD_SHORTCUTS, HeaderElements, TextPopups } from '../../utils/constants'; import { FilePreviewDialogService } from '../../services/file-preview-dialog.service'; -import { loadCompareDocumentWrapper } from '../../../dossier/utils/compare-mode.utils'; +import { loadCompareDocumentWrapper } from '../../utils/compare-mode.utils'; import { from } from 'rxjs'; import { FileDataService } from '../../services/file-data.service'; import { ViewerHeaderConfigService } from '../../services/viewer-header-config.service'; diff --git a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts index 4b7ed0e41..e78e99557 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts @@ -5,13 +5,13 @@ import { PermissionsService } from '@services/permissions.service'; import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, combineLatest, combineLatestWith, firstValueFrom, Observable, switchMap } from 'rxjs'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; import { distinctUntilChanged, map } from 'rxjs/operators'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; -import { FileAssignService } from '../../../dossier/shared/services/file-assign.service'; +import { FileAssignService } from '../../../shared-dossiers/services/file-assign.service'; @Component({ selector: 'redaction-user-management', diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.ts index 2ba30fdeb..76543b25d 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.ts @@ -4,7 +4,7 @@ import { Dossier, File, IFileAttributeConfig } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; import { BaseDialogComponent } from '@iqser/common-ui'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts index 40d5fd376..6b0fa6079 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { TextHighlightOperation, TextHighlightOperationPages } from '@red/domain'; import { BaseDialogComponent, LoadingService } from '@iqser/common-ui'; -import { TextHighlightService } from '../../../dossier/services/text-highlight.service'; +import { TextHighlightService } from '@services/files/text-highlight.service'; import { firstValueFrom } from 'rxjs'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { highlightsTranslations } from '@translations/highlights-translations'; diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.ts index 2cffea8d5..52f036362 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.ts @@ -2,7 +2,7 @@ import { Component, ElementRef, Inject, Injector, ViewChild } from '@angular/cor import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { firstValueFrom } from 'rxjs'; -import { RedactionImportService } from '../../../dossier/shared/services/redaction-import.service'; +import { RedactionImportService } from '@services/files/redaction-import.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { HttpStatusCode } from '@angular/common/http'; diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts index 85e0bf603..76e503c9f 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts @@ -9,7 +9,7 @@ import { AnnotationActionsService } from './services/annotation-actions.service' import { FilePreviewStateService } from './services/file-preview-state.service'; import { AnnotationReferencesService } from './services/annotation-references.service'; import { EntitiesService, FilterService, ListingService, SearchService } from '@iqser/common-ui'; -import { AnnotationProcessingService } from '../dossier/services/annotation-processing.service'; +import { AnnotationProcessingService } from './services/annotation-processing.service'; import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider'; import { PageRotationService } from './services/page-rotation.service'; import { PdfViewer } from './services/pdf-viewer.service'; diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index a0e3efe9a..aed1919cb 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -22,17 +22,17 @@ import { MatDialogRef, MatDialogState } from '@angular/material/dialog'; import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { AnnotationDrawService } from './services/annotation-draw.service'; -import { AnnotationProcessingService } from '../dossier/services/annotation-processing.service'; +import { AnnotationProcessingService } from './services/annotation-processing.service'; import { File, ViewMode, ViewModes } from '@red/domain'; import { PermissionsService } from '@services/permissions.service'; import { combineLatest, firstValueFrom, Observable, of, pairwise } from 'rxjs'; import { UserPreferenceService } from '@services/user-preference.service'; import { download, handleFilterDelta } from '../../utils'; import { FileWorkloadComponent } from './components/file-workload/file-workload.component'; -import { FilesService } from '@services/entity-services/files.service'; -import { FileManagementService } from '@services/entity-services/file-management.service'; +import { FilesService } from '@services/files/files.service'; +import { FileManagementService } from '@services/files/file-management.service'; import { catchError, map, startWith, switchMap, tap } from 'rxjs/operators'; -import { FilesMapService } from '@services/entity-services/files-map.service'; +import { FilesMapService } from '@services/files/files-map.service'; import { ExcludedPagesService } from './services/excluded-pages.service'; import { ViewModeService } from './services/view-mode.service'; import { MultiSelectService } from './services/multi-select.service'; @@ -48,7 +48,7 @@ import { ComponentCanDeactivate } from '@guards/can-deactivate.guard'; import { PdfViewer } from './services/pdf-viewer.service'; import { FilePreviewDialogService } from './services/file-preview-dialog.service'; import { FileDataService } from './services/file-data.service'; -import { ActionsHelpModeKeys, ALL_HOTKEYS } from './shared/constants'; +import { ActionsHelpModeKeys, ALL_HOTKEYS } from './utils/constants'; import { NGXLogger } from 'ngx-logger'; import { StampService } from './services/stamp.service'; import Annotation = Core.Annotations.Annotation; 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 2b62af345..0adbf6a8a 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 @@ -4,7 +4,7 @@ import { IqserIconsModule } 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 '../dossier/shared/shared-dossiers.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'; diff --git a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts index 60d0a648b..d83263d47 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts @@ -19,7 +19,7 @@ import { IResizeRequest, TextHighlightOperation, } from '@red/domain'; -import { toPosition } from '../../dossier/utils/pdf-calculation.utils'; +import { toPosition } from '../utils/pdf-calculation.utils'; import { AnnotationDrawService } from './annotation-draw.service'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { diff --git a/apps/red-ui/src/app/modules/file-preview/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/file-preview/services/annotation-draw.service.ts index 3cfb56abf..521a4b6d0 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/annotation-draw.service.ts @@ -3,7 +3,7 @@ import { Core } from '@pdftron/webviewer'; import { hexToRgb } from '../../../utils'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { UserPreferenceService } from '@services/user-preference.service'; -import { RedactionLogService } from '../../dossier/services/redaction-log.service'; +import { RedactionLogService } from '@services/files/redaction-log.service'; import { environment } from '@environments/environment'; import { IRectangle, ISectionGrid, ISectionRectangle } from '@red/domain'; diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts b/apps/red-ui/src/app/modules/file-preview/services/annotation-processing.service.ts similarity index 97% rename from apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/annotation-processing.service.ts index a561060b2..4bda12b80 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/annotation-processing.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; -import { SuperTypeSorter } from '@utils/sorters/super-type-sorter'; +import { SuperTypeSorter } from '../../../utils'; import { Filter, handleCheckedValue, IFilter, INestedFilter, NestedFilter } from '@iqser/common-ui'; import { annotationTypesTranslations } from '@translations/annotation-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { IViewedPage } from '@red/domain'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; -import { FilePreviewStateService } from '../../file-preview/services/file-preview-state.service'; +import { FilePreviewStateService } from './file-preview-state.service'; @Injectable() export class AnnotationProcessingService { diff --git a/apps/red-ui/src/app/modules/file-preview/services/document-info.service.ts b/apps/red-ui/src/app/modules/file-preview/services/document-info.service.ts index db0e9ed95..08c4583ea 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/document-info.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/document-info.service.ts @@ -4,7 +4,7 @@ import { shareLast } from '@iqser/common-ui'; import { filter, map, startWith, tap, withLatestFrom } from 'rxjs/operators'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; -import { FilesMapService } from '@services/entity-services/files-map.service'; +import { FilesMapService } from '@services/files/files-map.service'; import { File, IFileAttributeConfig } from '@red/domain'; import { MultiSelectService } from './multi-select.service'; import { ExcludedPagesService } from './excluded-pages.service'; diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts index e764ba8df..730cb77bf 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts @@ -4,21 +4,21 @@ import { BehaviorSubject, firstValueFrom, iif, Observable, Subject } from 'rxjs' import { RedactionLogEntry } from '../../../models/file/redaction-log.entry'; import { Injectable, Injector } from '@angular/core'; import { FilePreviewStateService } from './file-preview-state.service'; -import { ViewedPagesService } from '@services/entity-services/viewed-pages.service'; +import { ViewedPagesService } from '@services/files/viewed-pages.service'; import { UserPreferenceService } from '@services/user-preference.service'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; import { map, switchMap, tap, withLatestFrom } from 'rxjs/operators'; import { PermissionsService } from '@services/permissions.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { EntitiesService, shareLast, Toaster } from '@iqser/common-ui'; -import { RedactionLogService } from '../../dossier/services/redaction-log.service'; -import { TextHighlightService } from '../../dossier/services/text-highlight.service'; +import { RedactionLogService } from '@services/files/redaction-log.service'; +import { TextHighlightService } from '@services/files/text-highlight.service'; import { ViewModeService } from './view-mode.service'; import { Core } from '@pdftron/webviewer'; import dayjs from 'dayjs'; import { NGXLogger } from 'ngx-logger'; import { MultiSelectService } from './multi-select.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; import Annotation = Core.Annotations.Annotation; const DELTA_VIEW_TIME = 10 * 60 * 1000; // 10 minutes; diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts index 4e09fa65a..c3bfcd7cd 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts @@ -2,15 +2,15 @@ import { Injectable, Injector } from '@angular/core'; import { combineLatest, firstValueFrom, from, merge, Observable, of, pairwise, Subject, switchMap } from 'rxjs'; import { Dictionary, Dossier, DOSSIER_ID, File, FILE_ID } from '@red/domain'; import { ActivatedRoute, Router } from '@angular/router'; -import { FilesMapService } from '@services/entity-services/files-map.service'; +import { FilesMapService } from '@services/files/files-map.service'; import { PermissionsService } from '@services/permissions.service'; import { boolFactory } from '@iqser/common-ui'; import { filter, map, startWith, tap, withLatestFrom } from 'rxjs/operators'; -import { FileManagementService } from '@services/entity-services/file-management.service'; +import { FileManagementService } from '@services/files/file-management.service'; import { dossiersServiceResolver } from '@services/entity-services/dossiers.service.provider'; import { wipeFilesCache } from '@red/cache'; import { DossiersService } from '@services/dossiers/dossiers.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; import { DictionaryService } from '@services/entity-services/dictionary.service'; @Injectable() diff --git a/apps/red-ui/src/app/modules/file-preview/services/page-rotation.service.ts b/apps/red-ui/src/app/modules/file-preview/services/page-rotation.service.ts index cf5d751db..06d9c0326 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/page-rotation.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/page-rotation.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, firstValueFrom, of } from 'rxjs'; import { RotationType, RotationTypes } from '@red/domain'; -import { FileManagementService } from '@services/entity-services/file-management.service'; +import { FileManagementService } from '@services/files/file-management.service'; import { FilePreviewStateService } from './file-preview-state.service'; import { distinctUntilChanged, map, switchMap, tap, withLatestFrom } from 'rxjs/operators'; import { PdfViewer } from './pdf-viewer.service'; -import { HeaderElements } from '../shared/constants'; +import { HeaderElements } from '../utils/constants'; import { ConfirmationDialogComponent, ConfirmationDialogInput, @@ -16,7 +16,7 @@ import { import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { MatDialog } from '@angular/material/dialog'; import { ViewerHeaderConfigService } from './viewer-header-config.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; const ACTION_BUTTONS = [HeaderElements.APPLY_ROTATION, HeaderElements.DISCARD_ROTATION]; const ONE_ROTATION_DEGREE = 90; diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-viewer.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-viewer.service.ts index c9e6d7470..7fad682ee 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/pdf-viewer.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-viewer.service.ts @@ -6,7 +6,7 @@ import { File } from '@red/domain'; import { Inject, Injectable } from '@angular/core'; import { BASE_HREF } from '../../../tokens'; import { environment } from '@environments/environment'; -import { DISABLED_HOTKEYS } from '../shared/constants'; +import { DISABLED_HOTKEYS } from '../utils/constants'; import { Observable, Subject } from 'rxjs'; import { NGXLogger } from 'ngx-logger'; import { map, tap } from 'rxjs/operators'; diff --git a/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts b/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts index 5119a9cf3..8d637229a 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts @@ -7,7 +7,7 @@ import { ViewModeService } from './view-mode.service'; import { TranslateService } from '@ngx-translate/core'; import { Core } from '@pdftron/webviewer'; import { firstValueFrom } from 'rxjs'; -import { WatermarkService } from '../../shared/services/watermark.service'; +import { WatermarkService } from '@services/entity-services/watermark.service'; import PDFNet = Core.PDFNet; @Injectable() diff --git a/apps/red-ui/src/app/modules/file-preview/services/tooltips.service.ts b/apps/red-ui/src/app/modules/file-preview/services/tooltips.service.ts index a99304094..5ce90ca03 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/tooltips.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/tooltips.service.ts @@ -1,7 +1,7 @@ import { Inject, Injectable } from '@angular/core'; import { PdfViewer } from './pdf-viewer.service'; import { UserPreferenceService } from '@services/user-preference.service'; -import { HeaderElements } from '../shared/constants'; +import { HeaderElements } from '../utils/constants'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; import { BASE_HREF } from '../../../tokens'; diff --git a/apps/red-ui/src/app/modules/file-preview/services/viewer-header-config.service.ts b/apps/red-ui/src/app/modules/file-preview/services/viewer-header-config.service.ts index 647620f42..80928ced2 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/viewer-header-config.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/viewer-header-config.service.ts @@ -1,6 +1,6 @@ import { ElementRef, Inject, Injectable, Injector } from '@angular/core'; import { IHeaderElement, RotationTypes } from '@red/domain'; -import { HeaderElements, HeaderElementType } from '../shared/constants'; +import { HeaderElements, HeaderElementType } from '../utils/constants'; import { TranslateService } from '@ngx-translate/core'; import { BASE_HREF } from '../../../tokens'; import { PdfViewer } from './pdf-viewer.service'; diff --git a/apps/red-ui/src/app/modules/dossier/utils/compare-mode.utils.ts b/apps/red-ui/src/app/modules/file-preview/utils/compare-mode.utils.ts similarity index 97% rename from apps/red-ui/src/app/modules/dossier/utils/compare-mode.utils.ts rename to apps/red-ui/src/app/modules/file-preview/utils/compare-mode.utils.ts index ff117e3cc..bd693a300 100644 --- a/apps/red-ui/src/app/modules/dossier/utils/compare-mode.utils.ts +++ b/apps/red-ui/src/app/modules/file-preview/utils/compare-mode.utils.ts @@ -1,4 +1,4 @@ -import { stampPDFPage } from '@utils/page-stamper'; +import { stampPDFPage } from '../../../utils'; import { Core, WebViewerInstance } from '@pdftron/webviewer'; import { File } from '@red/domain'; diff --git a/apps/red-ui/src/app/modules/file-preview/shared/constants.ts b/apps/red-ui/src/app/modules/file-preview/utils/constants.ts similarity index 100% rename from apps/red-ui/src/app/modules/file-preview/shared/constants.ts rename to apps/red-ui/src/app/modules/file-preview/utils/constants.ts diff --git a/apps/red-ui/src/app/modules/dossier/utils/pdf-calculation.utils.ts b/apps/red-ui/src/app/modules/file-preview/utils/pdf-calculation.utils.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/utils/pdf-calculation.utils.ts rename to apps/red-ui/src/app/modules/file-preview/utils/pdf-calculation.utils.ts diff --git a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts index 84c70726e..5eefcaee8 100644 --- a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts +++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts @@ -18,7 +18,7 @@ import { workflowFileStatusTranslations } from '@translations/file-status-transl import { TranslateService } from '@ngx-translate/core'; import { RouterHistoryService } from '@services/router-history.service'; import { Dossier, DOSSIERS_ARCHIVE, IMatchedDocument, ISearchListItem, ISearchResponse } from '@red/domain'; -import { FilesMapService } from '@services/entity-services/files-map.service'; +import { FilesMapService } from '@services/files/files-map.service'; import { PlatformSearchService } from '@services/entity-services/platform-search.service'; import { FeaturesService } from '@services/features.service'; import { DossiersCacheService } from '../../../services/dossiers/dossiers-cache.service'; diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.html b/apps/red-ui/src/app/modules/shared-dossiers/components/date-column/date-column.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.html rename to apps/red-ui/src/app/modules/shared-dossiers/components/date-column/date-column.component.html diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.scss b/apps/red-ui/src/app/modules/shared-dossiers/components/date-column/date-column.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.scss rename to apps/red-ui/src/app/modules/shared-dossiers/components/date-column/date-column.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/components/date-column/date-column.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.ts rename to apps/red-ui/src/app/modules/shared-dossiers/components/date-column/date-column.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html rename to apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.scss b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.scss similarity index 86% rename from apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.scss rename to apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.scss index 845f42238..593f3c7ae 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.scss +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.scss @@ -1,4 +1,4 @@ -@use 'common-mixins'; +@use 'libs/common-ui/src/assets/styles/common-mixins'; .file-actions { display: flex; diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts similarity index 97% rename from apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts rename to apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts index 6c9d9287d..3c12d7f43 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts @@ -14,17 +14,17 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { UserPreferenceService } from '@services/user-preference.service'; import { LongPressEvent } from '@shared/directives/long-press.directive'; -import { FileAssignService } from '../../services/file-assign.service'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; -import { FileManagementService } from '@services/entity-services/file-management.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FileManagementService } from '@services/files/file-management.service'; +import { FilesService } from '@services/files/files.service'; import { ReanalysisService, ReanalyzeQueryParams } from '@services/reanalysis.service'; import { Router } from '@angular/router'; -import { ExcludedPagesService } from '../../../../file-preview/services/excluded-pages.service'; -import { DocumentInfoService } from '../../../../file-preview/services/document-info.service'; +import { ExcludedPagesService } from '../../../file-preview/services/excluded-pages.service'; +import { DocumentInfoService } from '../../../file-preview/services/document-info.service'; import { ExpandableFileActionsComponent } from '@shared/components/expandable-file-actions/expandable-file-actions.component'; import { firstValueFrom, Observable } from 'rxjs'; -import { PageRotationService } from '../../../../file-preview/services/page-rotation.service'; +import { PageRotationService } from '../../../file-preview/services/page-rotation.service'; +import { FileAssignService } from '../../services/file-assign.service'; @Component({ selector: 'redaction-file-actions [file] [type] [dossier]', diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.scss b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.scss rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts similarity index 98% rename from apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts index 00fefd5c1..5751f277c 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts @@ -5,7 +5,7 @@ import { LoadingService, Toaster } from '@iqser/common-ui'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Dossier, File } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { PermissionsService } from '@services/permissions.service'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.scss b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.scss rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts similarity index 98% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts index 18f014353..f0d0bc050 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts @@ -4,7 +4,7 @@ import { Dossier, DossierAttributeConfigType, DossierAttributeConfigTypes, Dossi import { PermissionsService } from '@services/permissions.service'; import { CircleButtonTypes, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; +import { DossierAttributesService } from '@services/entity-services/dossier-attributes.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { firstValueFrom } from 'rxjs'; import dayjs from 'dayjs'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts 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/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.scss b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.scss rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-section.interface.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-section.interface.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-section.interface.ts rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-section.interface.ts diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts similarity index 99% rename from apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts rename to apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 407a1d3d6..ab160b462 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Dossier, DOSSIER_TEMPLATE_ID, IDossierRequest, IDossierTemplate } from '@red/domain'; import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface'; -import { DossiersDialogService } from '../../../shared/services/dossiers-dialog.service'; +import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; import { PermissionsService } from '@services/permissions.service'; import { Router } from '@angular/router'; import { MatDialogRef } from '@angular/material/dialog'; diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/dossiers-dialog.service.ts b/apps/red-ui/src/app/modules/shared-dossiers/services/dossiers-dialog.service.ts similarity index 58% rename from apps/red-ui/src/app/modules/dossier/shared/services/dossiers-dialog.service.ts rename to apps/red-ui/src/app/modules/shared-dossiers/services/dossiers-dialog.service.ts index 18811f5d5..0b55d8f20 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/services/dossiers-dialog.service.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/services/dossiers-dialog.service.ts @@ -1,12 +1,11 @@ import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { AddDossierDialogComponent } from '../../dialogs/add-dossier-dialog/add-dossier-dialog.component'; -import { EditDossierDialogComponent } from '../../dialogs/edit-dossier-dialog/edit-dossier-dialog.component'; -import { AssignReviewerApproverDialogComponent } from '../../dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component'; +import { EditDossierDialogComponent } from '../dialogs/edit-dossier-dialog/edit-dossier-dialog.component'; +import { AssignReviewerApproverDialogComponent } from '../dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component'; import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogConfig } from '@iqser/common-ui'; -import { ImportRedactionsDialogComponent } from '../../../file-preview/dialogs/import-redactions-dialog/import-redactions-dialog'; +import { ImportRedactionsDialogComponent } from '../../file-preview/dialogs/import-redactions-dialog/import-redactions-dialog'; -type DialogType = 'confirm' | 'editDossier' | 'addDossier' | 'assignFile' | 'importRedactions'; +type DialogType = 'confirm' | 'editDossier' | 'assignFile' | 'importRedactions'; @Injectable() export class DossiersDialogService extends DialogService { @@ -19,10 +18,6 @@ export class DossiersDialogService extends DialogService { component: EditDossierDialogComponent, dialogConfig: { ...largeDialogConfig }, }, - addDossier: { - component: AddDossierDialogComponent, - dialogConfig: { width: '900px', autoFocus: true }, - }, assignFile: { component: AssignReviewerApproverDialogComponent, dialogConfig: { disableClose: false }, diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts b/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts similarity index 98% rename from apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts rename to apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts index b346509a5..cd7b5ab51 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts @@ -3,7 +3,7 @@ import { UserService } from '@services/user.service'; import { Dossier, File } from '@red/domain'; import { DossiersDialogService } from './dossiers-dialog.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; import { ConfirmationDialogInput, LoadingService, Toaster } from '@iqser/common-ui'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { firstValueFrom, Observable } from 'rxjs'; 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 new file mode 100644 index 000000000..01d6b5d19 --- /dev/null +++ b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts @@ -0,0 +1,35 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FileActionsComponent } from './components/file-actions/file-actions.component'; +import { SharedModule } from '@shared/shared.module'; +import { DossiersDialogService } from './services/dossiers-dialog.service'; +import { EditDossierDialogComponent } from './dialogs/edit-dossier-dialog/edit-dossier-dialog.component'; +import { AssignReviewerApproverDialogComponent } from './dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component'; +import { EditDossierGeneralInfoComponent } from './dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component'; +import { EditDossierDownloadPackageComponent } from './dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component'; +import { EditDossierDictionaryComponent } from './dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component'; +import { EditDossierAttributesComponent } from './dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component'; +import { EditDossierTeamComponent } from './dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component'; +import { DateColumnComponent } from './components/date-column/date-column.component'; +import { FileAssignService } from './services/file-assign.service'; + +const components = [ + FileActionsComponent, + EditDossierGeneralInfoComponent, + EditDossierDownloadPackageComponent, + EditDossierDictionaryComponent, + EditDossierAttributesComponent, + EditDossierTeamComponent, + FileActionsComponent, + DateColumnComponent, +]; +const dialogs = [EditDossierDialogComponent, AssignReviewerApproverDialogComponent]; +const services = [DossiersDialogService, FileAssignService]; + +@NgModule({ + declarations: [...components, ...dialogs], + exports: [...components, ...dialogs], + providers: [...services], + imports: [CommonModule, SharedModule], +}) +export class SharedDossiersModule {} diff --git a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.ts b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.ts index 2ec1357f0..6286a58ea 100644 --- a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.ts @@ -1,7 +1,7 @@ import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import { CircleButtonTypes, List } from '@iqser/common-ui'; import { UserService } from '@services/user.service'; -import { DossiersDialogService } from '../../../dossier/shared/services/dossiers-dialog.service'; +import { DossiersDialogService } from '../../../shared-dossiers/services/dossiers-dialog.service'; @Component({ selector: 'redaction-team-members', diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html rename to apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss rename to apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts similarity index 98% rename from apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts rename to apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 075c4fe3e..8c29b9a20 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -10,7 +10,7 @@ import { ReportTemplateService } from '@services/report-template.service'; import { firstValueFrom } from 'rxjs'; import dayjs from 'dayjs'; import { Router } from '@angular/router'; -import { DossiersDialogService } from '../../shared/services/dossiers-dialog.service'; +import { DossiersDialogService } from '../../../shared-dossiers/services/dossiers-dialog.service'; interface DialogData { readonly dossierTemplateId?: string; diff --git a/apps/red-ui/src/app/modules/shared/services/dialog.service.ts b/apps/red-ui/src/app/modules/shared/services/dialog.service.ts new file mode 100644 index 000000000..9df4e14d7 --- /dev/null +++ b/apps/red-ui/src/app/modules/shared/services/dialog.service.ts @@ -0,0 +1,20 @@ +import { Injectable } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { AddDossierDialogComponent } from '../dialogs/add-dossier-dialog/add-dossier-dialog.component'; +import { DialogConfig, DialogService } from '@iqser/common-ui'; + +type DialogType = 'addDossier'; + +@Injectable() +export class SharedDialogService extends DialogService { + protected readonly _config: DialogConfig = { + addDossier: { + component: AddDossierDialogComponent, + dialogConfig: { width: '900px', autoFocus: true }, + }, + }; + + constructor(protected readonly _dialog: MatDialog) { + super(_dialog); + } +} 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 b6acecd3f..8fb14d8ad 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -34,6 +34,7 @@ import { DragDropFileUploadDirective } from '@shared/directives/drag-drop-file-u import { DossiersTypeSwitchComponent } from '@shared/components/dossiers-type-switch/dossiers-type-switch.component'; import { TranslateModule } from '@ngx-translate/core'; import { RouterModule } from '@angular/router'; +import { AddDossierDialogComponent } from '@shared/dialogs/add-dossier-dialog/add-dossier-dialog.component'; const buttons = [FileDownloadBtnComponent, UserButtonComponent]; @@ -55,6 +56,7 @@ const components = [ FileStatsComponent, FileNameColumnComponent, DossiersTypeSwitchComponent, + AddDossierDialogComponent, ...buttons, ]; diff --git a/apps/red-ui/src/app/modules/trash/trash-screen/trash-screen.component.ts b/apps/red-ui/src/app/modules/trash/trash-screen/trash-screen.component.ts index 5195787cd..c221547a8 100644 --- a/apps/red-ui/src/app/modules/trash/trash-screen/trash-screen.component.ts +++ b/apps/red-ui/src/app/modules/trash/trash-screen/trash-screen.component.ts @@ -14,7 +14,7 @@ import { distinctUntilChanged, map } from 'rxjs/operators'; import { RouterHistoryService } from '@services/router-history.service'; import { TrashItem } from '@red/domain'; import { TrashService } from '@services/entity-services/trash.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { TrashDialogService } from '../services/trash-dialog.service'; diff --git a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts index 9d669a7f3..27a4dc1b3 100644 --- a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts +++ b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts @@ -7,9 +7,9 @@ import { TranslateService } from '@ngx-translate/core'; import { IFileUploadResult } from '@red/domain'; import { isAcceptedFileType, isCsv } from '@utils/file-drop-utils'; import { ErrorMessageService, GenericService, HeadersConfiguration, RequiredParam, Validate } from '@iqser/common-ui'; -import { FilesMapService } from '@services/entity-services/files-map.service'; +import { FilesMapService } from '@services/files/files-map.service'; import { switchMap, tap, throttleTime } from 'rxjs/operators'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; import { UploadDownloadDialogService } from './upload-download-dialog.service'; export interface ActiveUpload { diff --git a/apps/red-ui/src/app/services/breadcrumbs.service.ts b/apps/red-ui/src/app/services/breadcrumbs.service.ts index 60d56a594..f4d640ff6 100644 --- a/apps/red-ui/src/app/services/breadcrumbs.service.ts +++ b/apps/red-ui/src/app/services/breadcrumbs.service.ts @@ -3,7 +3,7 @@ import { List } from '@iqser/common-ui'; import { ActivatedRouteSnapshot, IsActiveMatchOptions, NavigationEnd, Router } from '@angular/router'; import { BehaviorSubject, Observable, of } from 'rxjs'; import { filter, pluck } from 'rxjs/operators'; -import { FilesMapService } from '@services/entity-services/files-map.service'; +import { FilesMapService } from '@services/files/files-map.service'; import { TranslateService } from '@ngx-translate/core'; import { BreadcrumbTypes, DOSSIER_ID, DOSSIER_TEMPLATE_ID, DOSSIERS_ARCHIVE, FILE_ID } from '@red/domain'; import { DossiersService } from '@services/dossiers/dossiers.service'; diff --git a/apps/red-ui/src/app/services/dossiers/archived-dossiers.service.ts b/apps/red-ui/src/app/services/dossiers/archived-dossiers.service.ts index 74aadd218..a140a587e 100644 --- a/apps/red-ui/src/app/services/dossiers/archived-dossiers.service.ts +++ b/apps/red-ui/src/app/services/dossiers/archived-dossiers.service.ts @@ -5,7 +5,7 @@ import { Observable, of } from 'rxjs'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ActiveDossiersService } from './active-dossiers.service'; import { DossiersService } from './dossiers.service'; -import { FilesMapService } from '../entity-services/files-map.service'; +import { FilesMapService } from '../files/files-map.service'; import { FeaturesService } from '@services/features.service'; @Injectable({ providedIn: 'root' }) diff --git a/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-attributes.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts rename to apps/red-ui/src/app/services/entity-services/dossier-attributes.service.ts diff --git a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts index 671a4fdd1..7f51abf7c 100644 --- a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts +++ b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts @@ -3,8 +3,8 @@ import { GenericService } from '@iqser/common-ui'; import { Dossier, IMatchedDocument, ISearchInput, ISearchRequest, ISearchResponse } from '@red/domain'; import { Observable, of, zip } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; -import { FilesMapService } from './files-map.service'; -import { FilesService } from './files.service'; +import { FilesMapService } from '../files/files-map.service'; +import { FilesService } from '../files/files.service'; import { DossiersCacheService } from '../dossiers/dossiers-cache.service'; @Injectable({ providedIn: 'root' }) diff --git a/apps/red-ui/src/app/services/entity-services/trash.service.ts b/apps/red-ui/src/app/services/entity-services/trash.service.ts index 6aafce32d..4552f8ce8 100644 --- a/apps/red-ui/src/app/services/entity-services/trash.service.ts +++ b/apps/red-ui/src/app/services/entity-services/trash.service.ts @@ -10,7 +10,7 @@ import { ActiveDossiersService } from '@services/dossiers/active-dossiers.servic import { UserService } from '@services/user.service'; import { flatMap } from 'lodash-es'; import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; -import { FilesService } from '@services/entity-services/files.service'; +import { FilesService } from '@services/files/files.service'; @Injectable({ providedIn: 'root', diff --git a/apps/red-ui/src/app/modules/shared/services/watermark.service.ts b/apps/red-ui/src/app/services/entity-services/watermark.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/shared/services/watermark.service.ts rename to apps/red-ui/src/app/services/entity-services/watermark.service.ts diff --git a/apps/red-ui/src/app/services/entity-services/file-management.service.ts b/apps/red-ui/src/app/services/files/file-management.service.ts similarity index 94% rename from apps/red-ui/src/app/services/entity-services/file-management.service.ts rename to apps/red-ui/src/app/services/files/file-management.service.ts index a37a33a07..4d1d1ec9f 100644 --- a/apps/red-ui/src/app/services/entity-services/file-management.service.ts +++ b/apps/red-ui/src/app/services/files/file-management.service.ts @@ -3,8 +3,8 @@ import { Injectable, Injector } from '@angular/core'; import { HttpHeaders, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { FilesService } from '@services/entity-services/files.service'; -import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; +import { FilesService } from './files.service'; +import { DossierStatsService } from '../dossiers/dossier-stats.service'; import { File, IPageRotationRequest } from '@red/domain'; @Injectable({ diff --git a/apps/red-ui/src/app/services/entity-services/files-map.service.ts b/apps/red-ui/src/app/services/files/files-map.service.ts similarity index 100% rename from apps/red-ui/src/app/services/entity-services/files-map.service.ts rename to apps/red-ui/src/app/services/files/files-map.service.ts diff --git a/apps/red-ui/src/app/services/entity-services/files.service.ts b/apps/red-ui/src/app/services/files/files.service.ts similarity index 96% rename from apps/red-ui/src/app/services/entity-services/files.service.ts rename to apps/red-ui/src/app/services/files/files.service.ts index 9d8b48ef2..b48dbe7b5 100644 --- a/apps/red-ui/src/app/services/entity-services/files.service.ts +++ b/apps/red-ui/src/app/services/files/files.service.ts @@ -3,9 +3,9 @@ import { EntitiesService, List, mapEach, RequiredParam, Validate } from '@iqser/ import { File, IFile } from '@red/domain'; import { Observable } from 'rxjs'; import { UserService } from '../user.service'; -import { FilesMapService } from '@services/entity-services/files-map.service'; +import { FilesMapService } from './files-map.service'; import { map, switchMap, tap } from 'rxjs/operators'; -import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; +import { DossierStatsService } from '../dossiers/dossier-stats.service'; import { NGXLogger } from 'ngx-logger'; @Injectable({ diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/redaction-import.service.ts b/apps/red-ui/src/app/services/files/redaction-import.service.ts similarity index 96% rename from apps/red-ui/src/app/modules/dossier/shared/services/redaction-import.service.ts rename to apps/red-ui/src/app/services/files/redaction-import.service.ts index 18e420e42..6cfa06d2d 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/services/redaction-import.service.ts +++ b/apps/red-ui/src/app/services/files/redaction-import.service.ts @@ -1,7 +1,7 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, HeadersConfiguration, RequiredParam, Validate } from '@iqser/common-ui'; -@Injectable() +@Injectable({ providedIn: 'root' }) export class RedactionImportService extends GenericService { constructor(protected readonly _injector: Injector) { super(_injector, 'import-redactions'); diff --git a/apps/red-ui/src/app/modules/dossier/services/redaction-log.service.ts b/apps/red-ui/src/app/services/files/redaction-log.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/services/redaction-log.service.ts rename to apps/red-ui/src/app/services/files/redaction-log.service.ts diff --git a/apps/red-ui/src/app/modules/dossier/services/text-highlight.service.ts b/apps/red-ui/src/app/services/files/text-highlight.service.ts similarity index 96% rename from apps/red-ui/src/app/modules/dossier/services/text-highlight.service.ts rename to apps/red-ui/src/app/services/files/text-highlight.service.ts index b921265d9..4c55dba23 100644 --- a/apps/red-ui/src/app/modules/dossier/services/text-highlight.service.ts +++ b/apps/red-ui/src/app/services/files/text-highlight.service.ts @@ -3,7 +3,7 @@ import { GenericService, RequiredParam, Toaster, Validate } from '@iqser/common- import { Highlight, TextHighlightOperation, TextHighlightResponse } from '@red/domain'; import { catchError, map, tap } from 'rxjs/operators'; import { Observable, of } from 'rxjs'; -import { AnnotationWrapper } from '@models/file/annotation.wrapper'; +import { AnnotationWrapper } from '../../models/file/annotation.wrapper'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @Injectable({ diff --git a/apps/red-ui/src/app/services/entity-services/viewed-pages.service.ts b/apps/red-ui/src/app/services/files/viewed-pages.service.ts similarity index 100% rename from apps/red-ui/src/app/services/entity-services/viewed-pages.service.ts rename to apps/red-ui/src/app/services/files/viewed-pages.service.ts diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 1d367ab59..f87d59f30 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { UserService } from './user.service'; import { Dictionary, Dossier, DOSSIERS_ARCHIVE, File, IComment, IDossier } from '@red/domain'; -import { FilesMapService } from '@services/entity-services/files-map.service'; +import { FilesMapService } from '@services/files/files-map.service'; import { FeaturesService } from '@services/features.service'; @Injectable({ providedIn: 'root' }) diff --git a/apps/red-ui/src/app/services/reanalysis.service.ts b/apps/red-ui/src/app/services/reanalysis.service.ts index 243c98b21..4c5382c55 100644 --- a/apps/red-ui/src/app/services/reanalysis.service.ts +++ b/apps/red-ui/src/app/services/reanalysis.service.ts @@ -2,8 +2,8 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, List, QueryParam, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; import { Dossier, File, IPageExclusionRequest } from '@red/domain'; import { catchError, switchMap, tap } from 'rxjs/operators'; -import { FilesService } from './entity-services/files.service'; -import { FilesMapService } from './entity-services/files-map.service'; +import { FilesService } from './files/files.service'; +import { FilesMapService } from './files/files-map.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { of } from 'rxjs'; From 87eb6cab0cbca62b0529a9a4f5d86642d8d71ef5 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 18 May 2022 14:54:02 +0200 Subject: [PATCH 05/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3267 -> 3266 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 99bd04093..901fcc24e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.487.0", + "version": "3.488.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index bd79f1660ecfd318df7a4bc23cea82832c758e45..09bfce2c6c7f436566628281e1ebbc46e67d9aac 100644 GIT binary patch delta 2983 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�UgO`~Vd~xFKC1 z3`pPMlZls>9Pra{Baqj8TdRZ6@h~Ha8k$ZGYO-U)yR>e`@Z*5|K9OZbgqFL1?4eBi z<0hd4ft-oAOF$}bUk?YVYUdw-7rmhji+ih1aa`OTPE8JGnA?bn^QAz+mCxVrC>}DT zLEf(6V)ukh3?62JM^)OW0n?x-Pcn`SdCq?CG+32eIr#ReoN^CrM7Ux!(oTfb)4pMf zbRiEdgo^Ooy2LvoU$wMOI@>OP3x<)O=m@_?Mo_710A?%x>0$|S3PgZ!DY+AOWYmuB zg^R~gAG+U-lk=`Ke4ZPd}OdcYV7q+Ny!?UV1f&p1RdU1M1pb|st}<#1Q* zh$KY?h&5$NstDI)h~4a+6y=Q5u(P63*dMYD=u|ZNnEpQDZiBiB!V^P(pbDmiRFt29 z_Cef&?;bXM9(ZH4981$ROVb@lQ>cc}Uh%d%5v}yBlEzkve|jNLTn&)K$c;`()8VTp z?NB8tJX8Ro`abDUzq+Gnsk8mIi9LNk0JKfc++G zZQfGsW*aULP3pyPDL!^E+6NFBKMZC(#B5#2U>vap9=w#Ntwmz7hmu^4qsV@*R@~(& z!f%1d>0?>7Q)gq3?O1o_NQn<1A>(U}GlgG{5Zf`ny?{_)fmQ*3--~hltI=d2xl&`k z!H}AjTiyTW*Cc5)Ku@@soa?}l1z^~~SK_P#+T=B12TxjLi}q!BysmjK<<$S@zufYu z<72vGqPEYvNOBaQaE&KGP6kpZAonim6#VC0?wG-jXWigX;m^3Hp?06Vi=lU#cj00% zX6CJm0XomVIx&QQ_ndfH*PiYY#DLD@Hyxh9NXI15lZ@=GZ&?))i9x$XLbj|KDNo#( zo(Sk1Q$RB2ozDJ#*WtT{)cvhVV?NaPc#T**a)sjf&lX+<8TyYn*k!KrYHV*b6ME0r zxlA!-%F;Syv}G_EVLfEy!Eq%m;9zZ;y3Lt7pR7ZRg;Pe zEBiBVf(r6dXMx1a65eE$+gG_=mDg8!U6tQg`CV1eR|Q?ws;^qfs~_Ctu?T!_A>LR3`e* Date: Wed, 18 May 2022 16:08:10 +0300 Subject: [PATCH 06/13] RED-3800: fix --- apps/red-ui/src/app/modules/shared/shared.module.ts | 4 ++++ 1 file changed, 4 insertions(+) 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 8fb14d8ad..ed05b6c45 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -35,6 +35,7 @@ import { DossiersTypeSwitchComponent } from '@shared/components/dossiers-type-sw import { TranslateModule } from '@ngx-translate/core'; import { RouterModule } from '@angular/router'; import { AddDossierDialogComponent } from '@shared/dialogs/add-dossier-dialog/add-dossier-dialog.component'; +import { SharedDialogService } from '@shared/services/dialog.service'; const buttons = [FileDownloadBtnComponent, UserButtonComponent]; @@ -63,6 +64,8 @@ const components = [ const utils = [DatePipe, NamePipe, NavigateLastDossiersScreenDirective, LongPressDirective, DragDropFileUploadDirective]; +const services = [SharedDialogService]; + const modules = [MatConfigModule, ScrollingModule, IconsModule, FormsModule, ReactiveFormsModule, CommonUiModule]; @NgModule({ @@ -70,6 +73,7 @@ const modules = [MatConfigModule, ScrollingModule, IconsModule, FormsModule, Rea imports: [CommonModule, ...modules, MonacoEditorModule, TranslateModule, RouterModule], exports: [...modules, ...components, ...utils], providers: [ + ...services, { provide: MAT_DATE_FORMATS, useValue: { From bde56e7adaa86fa6735c87190eabc179e99a2dab Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 18 May 2022 15:10:27 +0200 Subject: [PATCH 07/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3266 -> 3267 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 901fcc24e..13f16fd54 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.488.0", + "version": "3.489.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 09bfce2c6c7f436566628281e1ebbc46e67d9aac..8622ebc975461a733f877d620537dee9007b344f 100644 GIT binary patch delta 106 zcmV-w0G0p38N(TncvjVVZLeO~jvYA83l#h)*bGWjGh89`Q%v>0SeCl{Zt!1|a`c;DP+@vCZuZ M2;{YPx&TlB0P7bt$N&HU delta 105 zcmV-v0G9v58NwNmcvV%f_MzUf13P$uf*%E&L1}7+D};WEss0zsQkTE{sM$kC>W`%j zPnW;v+0I%1KSenz|BA#oVzO-+)%AzX!3DhXr{wRsw!7}+zXH*N{8xdudV%b*&g}~b Lm86YK08jt`eUmtA From 64359316825b73ece5be07791db7aef3cb1949f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 18 May 2022 22:09:00 +0300 Subject: [PATCH 08/13] RED-4051: Update dictionary option when resizing annotation --- .../resize-annotation-dialog.component.html | 8 ++++++- .../resize-annotation-dialog.component.ts | 20 +++++++++++----- .../services/annotation-actions.service.ts | 23 ++++++++----------- .../services/annotations-listing.service.ts | 2 +- .../services/file-data.service.ts | 4 ++-- .../services/files/text-highlight.service.ts | 2 +- apps/red-ui/src/assets/config/config.json | 4 ++-- apps/red-ui/src/assets/i18n/de.json | 3 ++- apps/red-ui/src/assets/i18n/en.json | 3 ++- .../src/lib/redaction-log/resize.request.ts | 1 + 10 files changed, 42 insertions(+), 28 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html index dcdc1d4e3..3d03e1bb7 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html @@ -7,6 +7,12 @@ + +
+ + {{ 'resize-annotation-dialog.content.update-dictionary' | translate: { text: this.text } }} + +
@@ -17,5 +23,5 @@
- + diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts index 9df0e5e81..630415ce5 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts @@ -1,8 +1,8 @@ import { Component, Inject, Injector, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FormBuilder } from '@angular/forms'; -import { Dossier } from '@red/domain'; import { BaseDialogComponent } from '@iqser/common-ui'; +import { AnnotationWrapper } from '@models/file/annotation.wrapper'; @Component({ templateUrl: './resize-annotation-dialog.component.html', @@ -12,7 +12,7 @@ export class ResizeAnnotationDialogComponent extends BaseDialogComponent impleme private readonly _formBuilder: FormBuilder, protected readonly _injector: Injector, protected readonly _dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) private readonly _data: { dossier: Dossier }, + @Inject(MAT_DIALOG_DATA) private readonly _data: { annotation: AnnotationWrapper; text?: string }, ) { super(_injector, _dialogRef); } @@ -21,16 +21,24 @@ export class ResizeAnnotationDialogComponent extends BaseDialogComponent impleme return !this.valid; } + get text(): string { + return this._data.text; + } + ngOnInit() { super.ngOnInit(); - this.form = this._formBuilder.group({ comment: [null] }); + const controlsConfig = { comment: [null] }; + + if (this._data.annotation.isModifyDictionary) { + controlsConfig['updateDictionary'] = [false]; + } + + this.form = this._formBuilder.group(controlsConfig); this.initialFormValue = this.form.getRawValue(); } save() { - this._dialogRef.close({ - comment: this.form.get('comment').value, - }); + this._dialogRef.close(this.form.getRawValue()); } } diff --git a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts index d83263d47..d17b230d7 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts @@ -217,8 +217,8 @@ export class AnnotationActionsService { img: this._convertPath('/assets/icons/general/check.svg'), title: this._translateService.instant('annotation-actions.resize-accept.label'), onClick: () => - this._ngZone.run(() => { - this.acceptResize(null, firstAnnotation); + this._ngZone.run(async () => { + await this.acceptResize(null, firstAnnotation); }), }); availableActions.push({ @@ -412,22 +412,21 @@ export class AnnotationActionsService { this._pdf.annotationManager.selectAnnotation(viewerAnnotation); } - acceptResize($event: MouseEvent, annotationWrapper: AnnotationWrapper) { - const data = { dossier: this._dossier }; + async acceptResize($event: MouseEvent, annotation: AnnotationWrapper): Promise { const fileId = this._state.fileId; - this._dialogService.openDialog('resizeAnnotation', $event, data, async (result: { comment: string }) => { - const textAndPositions = await this._extractTextAndPositions(annotationWrapper.id); - const text = - annotationWrapper.value === 'Rectangle' ? 'Rectangle' : annotationWrapper.isImage ? 'Image' : textAndPositions.text; - + const textAndPositions = await this._extractTextAndPositions(annotation.id); + const text = annotation.value === 'Rectangle' ? 'Rectangle' : annotation.isImage ? 'Image' : textAndPositions.text; + const data = { annotation, text }; + this._dialogService.openDialog('resizeAnnotation', $event, data, async (result: { comment: string; updateDictionary: boolean }) => { const resizeRequest: IResizeRequest = { - annotationId: annotationWrapper.id, + annotationId: annotation.id, comment: result.comment, positions: textAndPositions.positions, value: text, + updateDictionary: result.updateDictionary, }; - this._processObsAndEmit(this._manualRedactionService.resizeOrSuggestResize([resizeRequest], data.dossier.id, fileId)); + this._processObsAndEmit(this._manualRedactionService.resizeOrSuggestResize([resizeRequest], this._dossier.id, fileId)); }); } @@ -559,8 +558,6 @@ export class AnnotationActionsService { words.push(...quadWords); } - console.log(words.join(' ')); - return { text: words.join(' '), positions: rectangles, diff --git a/apps/red-ui/src/app/modules/file-preview/services/annotations-listing.service.ts b/apps/red-ui/src/app/modules/file-preview/services/annotations-listing.service.ts index 657a30297..241920272 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/annotations-listing.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/annotations-listing.service.ts @@ -1,4 +1,4 @@ -import { AnnotationWrapper } from '../../../models/file/annotation.wrapper'; +import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { Injectable } from '@angular/core'; import { EntitiesService, FilterService, ListingService, SearchService } from '@iqser/common-ui'; import { filter, tap } from 'rxjs/operators'; diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts index 730cb77bf..6bbedecda 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts @@ -1,7 +1,7 @@ import { ChangeType, File, IRedactionLog, IRedactionLogEntry, IViewedPage, ViewMode, ViewModes } from '@red/domain'; -import { AnnotationWrapper } from '../../../models/file/annotation.wrapper'; +import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { BehaviorSubject, firstValueFrom, iif, Observable, Subject } from 'rxjs'; -import { RedactionLogEntry } from '../../../models/file/redaction-log.entry'; +import { RedactionLogEntry } from '@models/file/redaction-log.entry'; import { Injectable, Injector } from '@angular/core'; import { FilePreviewStateService } from './file-preview-state.service'; import { ViewedPagesService } from '@services/files/viewed-pages.service'; diff --git a/apps/red-ui/src/app/services/files/text-highlight.service.ts b/apps/red-ui/src/app/services/files/text-highlight.service.ts index 4c55dba23..b921265d9 100644 --- a/apps/red-ui/src/app/services/files/text-highlight.service.ts +++ b/apps/red-ui/src/app/services/files/text-highlight.service.ts @@ -3,7 +3,7 @@ import { GenericService, RequiredParam, Toaster, Validate } from '@iqser/common- import { Highlight, TextHighlightOperation, TextHighlightResponse } from '@red/domain'; import { catchError, map, tap } from 'rxjs/operators'; import { Observable, of } from 'rxjs'; -import { AnnotationWrapper } from '../../models/file/annotation.wrapper'; +import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @Injectable({ diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 322276d2f..f9a12cdad 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-05.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -16,7 +16,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-05.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview" diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 228749f47..a067e33ca 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1815,7 +1815,8 @@ "save": "Änderungen speichern" }, "content": { - "comment": "Kommentar" + "comment": "Kommentar", + "update-dictionary": "" }, "header": "Schwärzung ändern" }, diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 73a430802..2062802b5 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1815,7 +1815,8 @@ "save": "Save Changes" }, "content": { - "comment": "Comment" + "comment": "Comment", + "update-dictionary": "Update dictionary: {text}" }, "header": "Resize Redaction" }, diff --git a/libs/red-domain/src/lib/redaction-log/resize.request.ts b/libs/red-domain/src/lib/redaction-log/resize.request.ts index faf9331f8..1d89f755b 100644 --- a/libs/red-domain/src/lib/redaction-log/resize.request.ts +++ b/libs/red-domain/src/lib/redaction-log/resize.request.ts @@ -5,4 +5,5 @@ export interface IResizeRequest { comment: string; positions: IRectangle[]; value: string; + updateDictionary?: boolean; } From e73f8e79509fe10dd68f5e08e4b3f0b6ef0f5612 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 18 May 2022 21:12:54 +0200 Subject: [PATCH 09/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3267 -> 3264 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 13f16fd54..19899d061 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.489.0", + "version": "3.490.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 8622ebc975461a733f877d620537dee9007b344f..b50c756ec42b9a3a197b9706b5a7f03a3de92d44 100644 GIT binary patch delta 3219 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 F00343JUIXW delta 3222 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 Ix&TlB09E)q(*OVf From a6ab0b6f7d7e886c49e5c3088c756fff034990fe Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 19 May 2022 15:43:34 +0300 Subject: [PATCH 10/13] RED-3949: fix assigning under approval file to me --- .../services/file-assign.service.ts | 93 ++++++++++++------- apps/red-ui/src/assets/config/config.json | 4 +- apps/red-ui/src/assets/i18n/de.json | 4 + apps/red-ui/src/assets/i18n/en.json | 4 + 4 files changed, 71 insertions(+), 34 deletions(-) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts b/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts index cd7b5ab51..82269a1f3 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts @@ -1,44 +1,44 @@ import { Injectable } from '@angular/core'; import { UserService } from '@services/user.service'; -import { Dossier, File } from '@red/domain'; +import { Dossier, File, User } from '@red/domain'; import { DossiersDialogService } from './dossiers-dialog.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FilesService } from '@services/files/files.service'; import { ConfirmationDialogInput, LoadingService, Toaster } from '@iqser/common-ui'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; -import { firstValueFrom, Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { firstValueFrom } from 'rxjs'; + +const changeReviewerDialogInput = new ConfirmationDialogInput({ + title: _('confirmation-dialog.assign-file-to-me.title'), + question: _('confirmation-dialog.assign-file-to-me.question'), +}); + +const changeApproverDialogInput = new ConfirmationDialogInput({ + title: _('confirmation-dialog.assign-me-as-approver.title'), + question: _('confirmation-dialog.assign-me-as-approver.question'), +}); + +const atLeastOneAssignee = (files: File[]) => files.reduce((acc, fs) => acc || !!fs.assignee, false); @Injectable() export class FileAssignService { + readonly currentUser: User; + constructor( - private readonly _dialogService: DossiersDialogService, - private readonly _userService: UserService, - private readonly _filesService: FilesService, - private readonly _activeDossiersService: ActiveDossiersService, - private readonly _loadingService: LoadingService, + userService: UserService, private readonly _toaster: Toaster, - ) {} + private readonly _filesService: FilesService, + private readonly _loadingService: LoadingService, + private readonly _dialogService: DossiersDialogService, + private readonly _activeDossiersService: ActiveDossiersService, + ) { + this.currentUser = userService.currentUser; + } async assignToMe(files: File[]) { - return new Promise((resolve, reject) => { - const atLeastOneFileHasReviewer = files.reduce((acc, fs) => acc || !!fs.assignee, false); - if (atLeastOneFileHasReviewer) { - const data = new ConfirmationDialogInput({ - title: _('confirmation-dialog.assign-file-to-me.title'), - question: _('confirmation-dialog.assign-file-to-me.question'), - }); - this._dialogService.openDialog('confirm', null, data, () => { - firstValueFrom(this._assignReviewerToCurrentUser(files)) - .then(() => resolve()) - .catch(() => reject()); - }); - } else { - firstValueFrom(this._assignReviewerToCurrentUser(files)) - .then(() => resolve()) - .catch(() => reject()); - } - }); + const filesAreUnderApproval = files.reduce((acc, fs) => acc && fs.isUnderApproval, true); + + return filesAreUnderApproval ? this.#assignMeAsApprover(files) : this.#assignMeAsReviewer(files); } async assignReviewer($event: MouseEvent, file: File, ignoreChanged = false): Promise { @@ -49,10 +49,32 @@ export class FileAssignService { await this._assignFile('approver', $event, file, ignoreChanged); } + #assignMeAsReviewer(files: File[]) { + if (atLeastOneAssignee(files)) { + const cb = () => this.#assignReviewerToCurrentUser(files); + const ref = this._dialogService.openDialog('confirm', null, changeReviewerDialogInput, cb); + + return firstValueFrom(ref.afterClosed()); + } + + return this.#assignReviewerToCurrentUser(files); + } + + #assignMeAsApprover(files: File[]) { + if (atLeastOneAssignee(files)) { + const cb = () => this.#assignApproverToCurrentUser(files); + const ref = this._dialogService.openDialog('confirm', null, changeApproverDialogInput, cb); + + return firstValueFrom(ref.afterClosed()); + } + + return this.#assignApproverToCurrentUser(files); + } + private async _assignFile(mode: 'reviewer' | 'approver', $event: MouseEvent, file: File, ignoreChanged = false): Promise { $event?.stopPropagation(); - const currentUserId = this._userService.currentUser.id; + const currentUserId = this.currentUser.id; const currentDossier = this._activeDossiersService.find(file.dossierId); const eligibleUsersIds = this._getUserIds(mode, currentDossier); @@ -97,10 +119,17 @@ export class FileAssignService { return mode === 'approver' ? dossier.approverIds : dossier.memberIds; } - private _assignReviewerToCurrentUser(files: File[]): Observable { + async #assignReviewerToCurrentUser(files: File[]) { this._loadingService.start(); - return this._filesService - .setReviewerFor(files, files[0].dossierId, this._userService.currentUser.id) - .pipe(tap(() => this._loadingService.stop())); + const reviewer$ = this._filesService.setReviewerFor(files, files[0].dossierId, this.currentUser.id); + await firstValueFrom(reviewer$); + this._loadingService.stop(); + } + + async #assignApproverToCurrentUser(files: File[]) { + this._loadingService.start(); + const approver$ = this._filesService.setUnderApprovalFor(files, files[0].dossierId, this.currentUser.id); + await firstValueFrom(approver$); + this._loadingService.stop(); } } diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index f9a12cdad..322276d2f 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-05.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -16,7 +16,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-05.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview" diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index a067e33ca..2ac69a86c 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -554,6 +554,10 @@ "question": "Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?", "title": "Neuen Reviewer zuweisen" }, + "assign-me-as-approver": { + "question": "", + "title": "" + }, "compare-file": { "question": "Achtung!

Seitenzahl stimmt nicht überein, aktuelles Dokument hat {currentDocumentPageCount} Seite(n). Das hochgeladene Dokument hat {compareDocumentPageCount} Seite(n).

Möchten Sie fortfahren?", "title": "Vergleichen mit: {fileName}" diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 2062802b5..0948840e8 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -554,6 +554,10 @@ "question": "This document is currently reviewed by someone else. Do you want to become the reviewer and assign yourself to this document?", "title": "Re-assign user" }, + "assign-me-as-approver": { + "question": "This document is currently under approval by someone else. Do you want to become the approver and assign yourself to this document?", + "title": "Re-assign approver" + }, "compare-file": { "question": "Warning!

Number of pages does not match, current document has {currentDocumentPageCount} page(s). Uploaded document has {compareDocumentPageCount} page(s).

Do you wish to proceed?", "title": "Compare with file: {fileName}" From 898b9f632537b3522a260a77ab16379e27857320 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 19 May 2022 14:46:07 +0200 Subject: [PATCH 11/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3264 -> 3265 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 19899d061..5ddec9305 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.490.0", + "version": "3.491.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index b50c756ec42b9a3a197b9706b5a7f03a3de92d44..7355a0ba01669bce932bc47fe5be5e582051af24 100644 GIT binary patch literal 3265 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 Date: Fri, 20 May 2022 14:54:23 +0300 Subject: [PATCH 12/13] RED-4039: Paligo - reset checklist button position --- paligo-styles/manual.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/paligo-styles/manual.scss b/paligo-styles/manual.scss index 4e4360b74..638da21b9 100644 --- a/paligo-styles/manual.scss +++ b/paligo-styles/manual.scss @@ -39,6 +39,10 @@ main article { padding: 0; } +section { + position: relative; +} + section > .titlepage .title { margin: 24px 0 16px 0; } @@ -66,6 +70,12 @@ section > .titlepage .title { @include mixin.button; } +.checklist-reset-wrapper { + position: absolute; + right: 0; + top: 0; +} + .warning, .note, .important, From cb3c7d6789377a7fb16177b6bb5878e54a8091ac Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 20 May 2022 13:56:41 +0200 Subject: [PATCH 13/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3265 -> 3296 bytes paligo-theme/paligo-styles/redacto-theme.css | 10 ++++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5ddec9305..84d0e0e7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.491.0", + "version": "3.492.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 7355a0ba01669bce932bc47fe5be5e582051af24..ad8d96cfab89c76555e3f87db4b74c7e2c87cbf2 100644 GIT binary patch literal 3296 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 .titlepage .title { margin: 24px 0 16px 0; } @@ -479,6 +483,12 @@ section > .titlepage .title { color: #dd4d50; } +.checklist-reset-wrapper { + position: absolute; + right: 0; + top: 0; +} + .warning, .note, .important,