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 64a35aa14..6cceafce2 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
@@ -10,7 +10,8 @@ import { SearchService } from '@shared/services/search.service';
import { ScreenStateService } from '@shared/services/screen-state.service';
import { BaseListingComponent } from '@shared/base/base-listing.component';
import { DefaultColorType } from '@models/default-color-key.model';
-import { SortingService } from '../../../../services/sorting.service';
+import { SortingService } from '@services/sorting.service';
+import defaultColorsTranslations from '../../translations/default-colors-translations';
@Component({
templateUrl: './default-colors-screen.component.html',
@@ -25,6 +26,7 @@ export class DefaultColorsScreenComponent
}>
implements OnInit
{
+ translations = defaultColorsTranslations;
protected readonly _primaryKey = 'key';
private _colorsObj: Colors;
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
index fd1fdd8db..d0cb34314 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
@@ -12,7 +12,7 @@ import { LoadingService } from '@services/loading.service';
import { FilterService } from '@shared/services/filter.service';
import { SearchService } from '@shared/services/search.service';
import { ScreenStateService } from '@shared/services/screen-state.service';
-import { SortingService } from '../../../../services/sorting.service';
+import { SortingService } from '@services/sorting.service';
import { BaseListingComponent } from '@shared/base/base-listing.component';
import { AdminDialogService } from '../../services/admin-dialog.service';
diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts
index 0a2777a7a..fa45ccd87 100644
--- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts
@@ -1,11 +1,11 @@
import { Component, OnDestroy } from '@angular/core';
import { DigitalSignature, DigitalSignatureControllerService } from '@redaction/red-ui-http';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Toaster } from '../../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { PermissionsService } from '@services/permissions.service';
import { lastIndexOfEnd } from '@utils/functions';
-import { AutoUnsubscribeComponent } from '../../../shared/base/auto-unsubscribe.component';
-import { LoadingService } from '../../../../services/loading.service';
+import { AutoUnsubscribeComponent } from '@shared/base/auto-unsubscribe.component';
+import { LoadingService } from '@services/loading.service';
@Component({
selector: 'redaction-digital-signature-screen',
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html
index df5e1bf6e..c9bd4a764 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html
@@ -116,7 +116,7 @@
- {{ 'dossier-attribute-types.' + attribute.type | translate }}
+ {{ translations[attribute.type] | translate }}
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 fd9d9f10f..17ebdf541 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
@@ -5,12 +5,13 @@ import { AppStateService } from '@state/app-state.service';
import { ActivatedRoute } from '@angular/router';
import { AdminDialogService } from '../../services/admin-dialog.service';
import { LoadingService } from '@services/loading.service';
-import { SortingService } from '../../../../services/sorting.service';
+import { SortingService } from '@services/sorting.service';
import { FilterService } from '@shared/services/filter.service';
import { SearchService } from '@shared/services/search.service';
import { ScreenStateService } from '@shared/services/screen-state.service';
import { PermissionsService } from '@services/permissions.service';
import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service';
+import dossierAttributeTypesTranslations from '../../translations/dossier-attribute-types-translations';
@Component({
templateUrl: './dossier-attributes-listing-screen.component.html',
@@ -18,6 +19,7 @@ import { DossierAttributesService } from '@shared/services/controller-wrappers/d
providers: [FilterService, SearchService, ScreenStateService, SortingService]
})
export class DossierAttributesListingScreenComponent extends BaseListingComponent implements OnInit {
+ translations = dossierAttributeTypesTranslations;
protected readonly _primaryKey = 'label';
constructor(
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
index 769f22100..588e394e8 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
@@ -10,7 +10,7 @@ import { FilterService } from '@shared/services/filter.service';
import { SearchService } from '@shared/services/search.service';
import { ScreenStateService } from '@shared/services/screen-state.service';
import { BaseListingComponent } from '@shared/base/base-listing.component';
-import { SortingService } from '../../../../services/sorting.service';
+import { SortingService } from '@services/sorting.service';
@Component({
templateUrl: './dossier-templates-listing-screen.component.html',
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 c17f588f1..cc6a826ac 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
@@ -8,7 +8,7 @@ import { LoadingService } from '@services/loading.service';
import { FilterService } from '@shared/services/filter.service';
import { SearchService } from '@shared/services/search.service';
import { ScreenStateService } from '@shared/services/screen-state.service';
-import { SortingService } from '../../../../services/sorting.service';
+import { SortingService } from '@services/sorting.service';
import { BaseListingComponent } from '@shared/base/base-listing.component';
@Component({
diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts
index 398f76664..4b7b7d12d 100644
--- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts
@@ -4,9 +4,9 @@ import { LicenseReport, LicenseReportControllerService } from '@redaction/red-ui
import { AppConfigService } from '@app-config/app-config.service';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
-import { LoadingService } from '../../../../services/loading.service';
-import { ButtonConfig } from '../../../shared/components/page-header/models/button-config.model';
-import { IconButtonTypes } from '../../../shared/components/buttons/icon-button/icon-button.component';
+import { LoadingService } from '@services/loading.service';
+import { ButtonConfig } from '@shared/components/page-header/models/button-config.model';
+import { IconButtonTypes } from '@shared/components/buttons/icon-button/icon-button.component';
@Component({
selector: 'redaction-license-information-screen',
diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts
index 3558d2330..0041c99d9 100644
--- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts
@@ -1,7 +1,7 @@
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { PermissionsService } from '@services/permissions.service';
import { RulesControllerService } from '@redaction/red-ui-http';
-import { Toaster } from '../../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { TranslateService } from '@ngx-translate/core';
import { saveAs } from 'file-saver';
import { ComponentHasChanges } from '@guards/can-deactivate.guard';
diff --git a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.ts
index 33cef2580..5669469cb 100644
--- a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.ts
@@ -8,8 +8,8 @@ import {
SmtpConfigurationControllerService,
SMTPConfigurationModel
} from '@redaction/red-ui-http';
-import { Toaster } from '../../../../services/toaster.service';
-import { AutoUnsubscribeComponent } from '../../../shared/base/auto-unsubscribe.component';
+import { Toaster } from '@services/toaster.service';
+import { AutoUnsubscribeComponent } from '@shared/base/auto-unsubscribe.component';
@Component({
selector: 'redaction-smtp-config-screen',
diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
index f3f7572b7..562efdc83 100644
--- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
@@ -8,7 +8,7 @@ import * as moment from 'moment';
import { FilterService } from '@shared/services/filter.service';
import { SearchService } from '@shared/services/search.service';
import { ScreenStateService } from '@shared/services/screen-state.service';
-import { SortingService } from '../../../../services/sorting.service';
+import { SortingService } from '@services/sorting.service';
import { BaseListingComponent } from '@shared/base/base-listing.component';
import { DossiersService } from '../../../dossier/services/dossiers.service';
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts
index 627166a6e..ac29cfe69 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts
@@ -7,7 +7,7 @@ import { HttpClient } from '@angular/common/http';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { debounce } from '@utils/debounce';
import { WatermarkControllerService, WatermarkModelRes } from '@redaction/red-ui-http';
-import { Toaster } from '../../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { ActivatedRoute } from '@angular/router';
import { BASE_HREF } from '../../../../tokens';
import { stampPDFPage } from '../../../../utils/page-stamper';
diff --git a/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts b/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts
new file mode 100644
index 000000000..571ebbeae
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts
@@ -0,0 +1,18 @@
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+
+const auditCategoriesTranslations: { [key: string]: string } = {
+ allCategories: _('audit-screen.categories.all-categories'),
+ LICENSE: _('audit-screen.categories.license'),
+ DOWNLOAD: _('audit-screen.categories.download'),
+ AUDIT_LOG: _('audit-screen.categories.audit-log'),
+ PROJECT: _('audit-screen.categories.project'),
+ DOSSIER: _('audit-screen.categories.dossier'),
+ DICTIONARY: _('audit-screen.categories.dictionary'),
+ PROJECT_TEMPLATE: _('audit-screen.categories.project-template'),
+ USER: _('audit-screen.categories.user'),
+ DOCUMENT: _('audit-screen.categories.document'),
+ AUDIT: _('audit-screen.categories.audit'),
+ DOSSIER_TEMPLATE: _('audit-screen.categories.dossier-template')
+};
+
+export default auditCategoriesTranslations;
diff --git a/apps/red-ui/src/app/modules/admin/translations/default-color-translations.ts b/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts
similarity index 86%
rename from apps/red-ui/src/app/modules/admin/translations/default-color-translations.ts
rename to apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts
index fe4b1b65c..b3c9e7a63 100644
--- a/apps/red-ui/src/app/modules/admin/translations/default-color-translations.ts
+++ b/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts
@@ -1,7 +1,7 @@
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { DefaultColorType } from '@models/default-color-key.model';
-const translations: { [key in DefaultColorType]: string } = {
+const defaultColorsTranslations: { [key in DefaultColorType]: string } = {
analysisColor: _('default-colors-screen.types.analysisColor'),
defaultColor: _('default-colors-screen.types.defaultColor'),
dictionaryRequestColor: _('default-colors-screen.types.dictionaryRequestColor'),
@@ -13,4 +13,4 @@ const translations: { [key in DefaultColorType]: string } = {
updatedColor: _('default-colors-screen.types.updatedColor')
};
-export default translations;
+export default defaultColorsTranslations;
diff --git a/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts b/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts
new file mode 100644
index 000000000..8a3bf1c45
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts
@@ -0,0 +1,11 @@
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { DossierAttributeConfig } from '@redaction/red-ui-http';
+
+const dossierAttributeTypesTranslations: { [key in DossierAttributeConfig.TypeEnum]: string } = {
+ TEXT: _('dossier-attribute-types.text'),
+ NUMBER: _('dossier-attribute-types.number'),
+ DATE: _('dossier-attribute-types.date'),
+ IMAGE: _('dossier-attribute-types.image')
+};
+
+export default dossierAttributeTypesTranslations;
diff --git a/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts b/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts
index b905907b7..1bede8dac 100644
--- a/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts
@@ -6,9 +6,9 @@ import { FileStatusWrapper } from '@models/file/file-status.wrapper';
import { FileActionService } from '../../services/file-action.service';
import { from, Observable } from 'rxjs';
import { DossiersDialogService } from '../../services/dossiers-dialog.service';
-import { LoadingService } from '../../../../services/loading.service';
-import { ConfirmationDialogInput } from '../../../shared/dialogs/confirmation-dialog/confirmation-dialog.component';
-import { ScreenStateService } from '../../../shared/services/screen-state.service';
+import { LoadingService } from '@services/loading.service';
+import { ConfirmationDialogInput } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component';
+import { ScreenStateService } from '@shared/services/screen-state.service';
import { TranslateService } from '@ngx-translate/core';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
diff --git a/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.ts
index 5ad0f88f5..feb1885e7 100644
--- a/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.ts
@@ -7,8 +7,8 @@ import { TranslateChartService } from '@services/translate-chart.service';
import { StatusSorter } from '@utils/sorters/status-sorter';
import { UserService } from '@services/user.service';
import { User } from '@redaction/red-ui-http';
-import { Toaster } from '../../../../services/toaster.service';
-import { FilterService } from '../../../shared/services/filter.service';
+import { Toaster } from '@services/toaster.service';
+import { FilterService } from '@shared/services/filter.service';
import { DossierAttributeWithValue } from '@models/dossier-attributes.model';
@Component({
diff --git a/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.ts b/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.ts
index 1555cef37..8a03fed66 100644
--- a/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.ts
@@ -3,8 +3,8 @@ import { PermissionsService } from '@services/permissions.service';
import { FormBuilder, FormGroup } from '@angular/forms';
import { PageRange, ReanalysisControllerService } from '@redaction/red-ui-http';
import { FileDataModel } from '../../../../models/file/file-data.model';
-import { Toaster } from '../../../../services/toaster.service';
-import { LoadingService } from '../../../../services/loading.service';
+import { Toaster } from '@services/toaster.service';
+import { LoadingService } from '@services/loading.service';
@Component({
selector: 'redaction-page-exclusion',
diff --git a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts
index 665fa19c8..8d8663ad7 100644
--- a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { Dossier } from '@redaction/red-ui-http';
import { AppStateService } from '@state/app-state.service';
import { UserService } from '@services/user.service';
-import { Toaster } from '../../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { DossierWrapper } from '@state/model/dossier.wrapper';
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/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
index b82a86f1d..96855bd5a 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/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
@@ -3,7 +3,7 @@ import { StatusControllerService } from '@redaction/red-ui-http';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { AppStateService } from '@state/app-state.service';
import { UserService } from '@services/user.service';
-import { Toaster } from '../../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { FileStatusWrapper } from '@models/file/file-status.wrapper';
import { DossierWrapper } from '@state/model/dossier.wrapper';
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/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts
index 869f3c9a2..04aa51429 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts
@@ -4,7 +4,7 @@ import { DossierWrapper } from '@state/model/dossier.wrapper';
import { EditDossierGeneralInfoComponent } from './general-info/edit-dossier-general-info.component';
import { EditDossierDownloadPackageComponent } from './download-package/edit-dossier-download-package.component';
import { EditDossierSectionInterface } from './edit-dossier-section.interface';
-import { Toaster } from '../../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { EditDossierDictionaryComponent } from './dictionary/edit-dossier-dictionary.component';
import { EditDossierTeamMembersComponent } from './team-members/edit-dossier-team-members.component';
import { EditDossierAttributesComponent } from './attributes/edit-dossier-attributes.component';
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/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
index dc52079f7..5662dbaa8 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/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
@@ -10,7 +10,7 @@ import { PermissionsService } from '@services/permissions.service';
import { Router } from '@angular/router';
import { MatDialogRef } from '@angular/material/dialog';
import { EditDossierDialogComponent } from '../edit-dossier-dialog.component';
-import { Toaster } from '../../../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
@Component({
selector: 'redaction-edit-dossier-general-info',
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts
index c3de99226..d5f1293c4 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts
@@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { AppStateService } from '@state/app-state.service';
import { MatDialogRef } from '@angular/material/dialog';
import { ForceRedactionRequest, LegalBasisMappingControllerService } from '@redaction/red-ui-http';
-import { Toaster } from '../../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { TranslateService } from '@ngx-translate/core';
import { UserService } from '@services/user.service';
import { ManualAnnotationService } from '../../services/manual-annotation.service';
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
index b5c5d24df..381c37e36 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
@@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { AppStateService } from '@state/app-state.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { AddRedactionRequest, LegalBasisMappingControllerService } from '@redaction/red-ui-http';
-import { Toaster } from '../../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { TranslateService } from '@ngx-translate/core';
import { UserService } from '@services/user.service';
import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts
index a5312e1e2..bef95068a 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts
@@ -28,7 +28,7 @@ import { SearchService } from '@shared/services/search.service';
import { ScreenStateService } from '@shared/services/screen-state.service';
import { BaseListingComponent } from '@shared/base/base-listing.component';
import { SortingService } from '@services/sorting.service';
-import { TableColConfig } from '../../../shared/components/table-col-name/table-col-name.component';
+import { TableColConfig } from '@shared/components/table-col-name/table-col-name.component';
const isLeavingScreen = event => event instanceof NavigationStart && event.url !== '/main/dossiers';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts
index e41bfde75..1c1cad6b2 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts
@@ -1,6 +1,6 @@
import { ChangeDetectorRef, Component, ElementRef, HostListener, Injector, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core';
import { NavigationStart, Router } from '@angular/router';
-import { Toaster } from '../../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { AppStateService } from '@state/app-state.service';
import { FileDropOverlayService } from '@upload-download/services/file-drop-overlay.service';
import { FileUploadModel } from '@upload-download/model/file-upload.model';
@@ -26,12 +26,12 @@ import { ActionConfig } from '@shared/components/page-header/models/action-confi
import { FilterService } from '@shared/services/filter.service';
import { SearchService } from '@shared/services/search.service';
import { ScreenStateService } from '@shared/services/screen-state.service';
-import { SortingService } from '../../../../services/sorting.service';
+import { SortingService } from '@services/sorting.service';
import { BaseListingComponent } from '@shared/base/base-listing.component';
import { LoadingService } from '@services/loading.service';
import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service';
import { DossierAttributeWithValue } from '@models/dossier-attributes.model';
-import { UserPreferenceService } from '../../../../services/user-preference.service';
+import { UserPreferenceService } from '@services/user-preference.service';
@Component({
templateUrl: './dossier-overview-screen.component.html',
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
index 5552393f2..8acbcbf0d 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
@@ -12,7 +12,7 @@ import { AnnotationData, FileDataModel } from '@models/file/file-data.model';
import { FileActionService } from '../../services/file-action.service';
import { AnnotationDrawService } from '../../services/annotation-draw.service';
import { AnnotationProcessingService } from '../../services/annotation-processing.service';
-import { Toaster } from '../../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { FileStatusWrapper } from '@models/file/file-status.wrapper';
import { PermissionsService } from '@services/permissions.service';
import { Subscription, timer } from 'rxjs';
@@ -33,10 +33,10 @@ import { DossiersDialogService } from '../../services/dossiers-dialog.service';
import { OnAttach, OnDetach } from '@utils/custom-route-reuse.strategy';
import { FilterModel } from '@shared/components/filters/popup-filter/model/filter.model';
import { handleFilterDelta, processFilters } from '@shared/components/filters/popup-filter/utils/filter-utils';
-import { LoadingService } from '../../../../services/loading.service';
+import { LoadingService } from '@services/loading.service';
import { stampPDFPage } from '../../../../utils/page-stamper';
import { TranslateService } from '@ngx-translate/core';
-import { AutoUnsubscribeComponent } from '../../../shared/base/auto-unsubscribe.component';
+import { AutoUnsubscribeComponent } from '@shared/base/auto-unsubscribe.component';
const ALL_HOTKEY_ARRAY = ['Escape', 'F', 'f'];
diff --git a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts
index 102baff26..4de092d50 100644
--- a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts
@@ -7,7 +7,7 @@ import {
ManualRedactionControllerService
} from '@redaction/red-ui-http';
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
-import { Toaster } from '../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { TranslateService } from '@ngx-translate/core';
import { tap } from 'rxjs/operators';
import { UserService } from '@services/user.service';
diff --git a/apps/red-ui/src/app/modules/shared/base/base-listing.component.ts b/apps/red-ui/src/app/modules/shared/base/base-listing.component.ts
index a396f5cb8..bad413569 100644
--- a/apps/red-ui/src/app/modules/shared/base/base-listing.component.ts
+++ b/apps/red-ui/src/app/modules/shared/base/base-listing.component.ts
@@ -1,13 +1,13 @@
import { Component, Injector, OnDestroy, ViewChild } from '@angular/core';
import { SortingOrders, SortingService } from '@services/sorting.service';
import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
-import { FilterService } from '../services/filter.service';
import { SearchService } from '../services/search.service';
import { ScreenStateService } from '../services/screen-state.service';
import { combineLatest, Observable } from 'rxjs';
import { AutoUnsubscribeComponent } from './auto-unsubscribe.component';
import { distinctUntilChanged, map } from 'rxjs/operators';
-import { PermissionsService } from '../../../services/permissions.service';
+import { PermissionsService } from '@services/permissions.service';
+import { FilterService } from '../services/filter.service';
@Component({ template: '' })
export abstract class BaseListingComponent extends AutoUnsubscribeComponent implements OnDestroy {
diff --git a/apps/red-ui/src/app/modules/shared/pipes/sort-by.pipe.ts b/apps/red-ui/src/app/modules/shared/pipes/sort-by.pipe.ts
index f9275b187..bb2ade371 100644
--- a/apps/red-ui/src/app/modules/shared/pipes/sort-by.pipe.ts
+++ b/apps/red-ui/src/app/modules/shared/pipes/sort-by.pipe.ts
@@ -1,5 +1,5 @@
import { Pipe, PipeTransform } from '@angular/core';
-import { SortingService } from '../../../services/sorting.service';
+import { SortingService } from '@services/sorting.service';
@Pipe({ name: 'sortBy' })
export class SortByPipe implements PipeTransform {
diff --git a/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts b/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts
index 5bce425e3..1f74a33d5 100644
--- a/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts
+++ b/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { Observable, throwError } from 'rxjs';
-import { Toaster } from '../../../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { DictionaryControllerService } from '@redaction/red-ui-http';
import { tap } from 'rxjs/operators';
diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts
index ce9146e7d..22486ceb1 100644
--- a/apps/red-ui/src/app/state/app-state.service.ts
+++ b/apps/red-ui/src/app/state/app-state.service.ts
@@ -9,7 +9,7 @@ import {
ReanalysisControllerService,
StatusControllerService
} from '@redaction/red-ui-http';
-import { Toaster } from '../services/toaster.service';
+import { Toaster } from '@services/toaster.service';
import { TranslateService } from '@ngx-translate/core';
import { Event, NavigationEnd, ResolveStart, Router } from '@angular/router';
import { UserService } from '@services/user.service';
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 865f88981..76a053f06 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -300,17 +300,17 @@
"all-users": "All Users",
"categories": {
"all-categories": "All Categories",
- "LICENSE": "License",
- "DOWNLOAD": "Download",
- "AUDIT_LOG": "Audit Log",
- "PROJECT": "Project",
- "DOSSIER": "Dossier",
- "DICTIONARY": "Dictionary",
- "PROJECT_TEMPLATE": "Project Template",
- "USER": "User",
- "DOCUMENT": "Document",
- "AUDIT": "Audit",
- "DOSSIER_TEMPLATE": "Dossier Template"
+ "license": "License",
+ "download": "Download",
+ "audit-log": "Audit Log",
+ "project": "Project",
+ "dossier": "Dossier",
+ "dictionary": "Dictionary",
+ "project-template": "Project Template",
+ "user": "User",
+ "document": "Document",
+ "audit": "Audit",
+ "dossier-template": "Dossier Template"
},
"no-data": {
"title": "No available logs."
@@ -367,32 +367,20 @@
},
"configurations": "Configurations",
"confirm-delete-file-attribute": {
- "cancel": {
- "bulk": "Keep Attributes",
- "single": "Keep Attribute"
- },
- "delete": {
- "bulk": "Delete Attributes",
- "single": "Delete Attribute"
- },
- "impacted-documents": {
- "bulk": "All documents they are used on will be impacted",
- "single": "All documents it is used on will be impacted"
- },
+ "cancel": "Keep {type, select, single{Attribute} bulk{Attributes} other{}}",
+ "delete": "Delete {type, select, single{Attribute} bulk{Attributes} other{}}",
+ "impacted-documents": "All documents {type, select, single{it is} bulk{they are} other{}} used on will be impacted",
"lost-details": "All inputted details on the documents will be lost",
- "title": {
- "bulk": "Delete File Attributes",
- "single": "Delete {name}"
- },
+ "title": "Delete {type, select, single{{name}} bulk{File Attributes} other{}}",
"toast-error": "Please confirm that you understand the ramifications of your action!",
"warning": "Warning: this cannot be undone!"
},
"confirm-delete-users": {
- "cancel": "Keep {userCount, plural, =0{} one{User} other{Users}}",
- "delete": "Delete {userCount, plural, =0{} one{User} other{Users}}",
- "impacted-documents": "All documents pending review from the {userCount, plural, =0{} one{user} other{users}} will be impacted",
+ "cancel": "Keep {usersCount, plural, =0{} one{User} other{Users}}",
+ "delete": "Delete {usersCount, plural, =0{} one{User} other{Users}}",
+ "impacted-documents": "All documents pending review from the {usersCount, plural, =0{} one{user} other{users}} will be impacted",
"impacted-dossiers": "{dossiersCount} {dossiersCount, plural, =0{dossiers} one{dossier} other{dossiers}} will be impacted",
- "title": "Delete {userCount, plural, =0{} one{User} other{Users}} from Workspace",
+ "title": "Delete {usersCount, plural, =0{} one{User} other{Users}} from Workspace",
"toast-error": "Please confirm that you understand the ramifications of your action!",
"warning": "Warning: this cannot be undone!"
},
@@ -548,10 +536,10 @@
"title": "Introduce File Attributes"
},
"dossier-attribute-types": {
- "DATE": "Date",
- "NUMBER": "Number",
- "TEXT": "Free Text",
- "IMAGE": "Image"
+ "date": "Date",
+ "number": "Number",
+ "text": "Free Text",
+ "image": "Image"
},
"dossier-attributes": "Dossier Attributes",
"dossier-attributes-listing": {
diff --git a/apps/red-ui/src/assets/i18n/te.json b/apps/red-ui/src/assets/i18n/te.json
index a1f76881c..5ceeecd92 100644
--- a/apps/red-ui/src/assets/i18n/te.json
+++ b/apps/red-ui/src/assets/i18n/te.json
@@ -16,10 +16,6 @@
"save": "",
"save-and-add-members": ""
},
- "errors": {
- "dossier-already-exists": "",
- "generic": ""
- },
"form": {
"description": {
"label": "",
@@ -161,7 +157,18 @@
"audit": "",
"audit-screen": {
"categories": {
- "": ""
+ "all-categories": "",
+ "audit": "",
+ "audit-log": "",
+ "dictionary": "",
+ "document": "",
+ "dossier": "",
+ "dossier-template": "",
+ "download": "",
+ "license": "",
+ "project": "",
+ "project-template": "",
+ "user": ""
},
"no-data": {
"title": ""
@@ -213,9 +220,11 @@
},
"configurations": "",
"confirm-delete-file-attribute": {
- "cancel": {
- "": ""
- },
+ "cancel": "",
+ "delete": "",
+ "impacted-documents": "",
+ "lost-details": "",
+ "title": "",
"toast-error": "",
"warning": ""
},
@@ -261,7 +270,6 @@
"title": ""
},
"types": {
- "": "",
"analysisColor": "",
"defaultColor": "",
"dictionaryRequestColor": "",
@@ -319,29 +327,17 @@
"dictionary-details": {
"description": ""
},
- "error": {
- "entries-too-short": "",
- "generic": ""
- },
"revert-changes": "",
"save-changes": "",
"search": "",
- "select-dictionary": "",
- "success": {
- "generic": ""
- }
+ "select-dictionary": ""
},
"digital-signature": "",
"digital-signature-screen": {
"action": {
- "certificate-not-valid-error": "",
"delete": "",
- "delete-error": "",
- "delete-success": "",
"reset": "",
- "save": "",
- "save-error": "",
- "save-success": ""
+ "save": ""
},
"certificate-name": {
"label": "",
@@ -372,6 +368,12 @@
"save": "",
"title": ""
},
+ "dossier-attribute-types": {
+ "date": "",
+ "image": "",
+ "number": "",
+ "text": ""
+ },
"dossier-attributes-listing": {
"action": {
"edit": ""
@@ -390,6 +392,7 @@
"search": "",
"table-col-names": {
"label": "",
+ "placeholder": "",
"type": ""
},
"table-header": {
@@ -443,9 +446,6 @@
"needs-work": "",
"owner": "",
"status": ""
- },
- "table-header": {
- "title": ""
}
},
"dossier-overview": {
@@ -512,10 +512,6 @@
"recent": "",
"unassigned": ""
},
- "reanalyse-dossier": {
- "error": "",
- "success": ""
- },
"reanalyse": {
"action": ""
},
@@ -563,15 +559,7 @@
"title": ""
}
},
- "dossiers": {
- "delete": {
- "delete-failed": ""
- }
- },
"download-includes": "",
- "download-status": {
- "queued": ""
- },
"download-type": {
"label": ""
},
@@ -594,13 +582,11 @@
}
},
"edit-color-dialog": {
- "error": "",
"form": {
"color": "",
"color-placeholder": ""
},
- "save": "",
- "success": ""
+ "save": ""
},
"edit-dossier-dialog": {
"actions": {
@@ -613,8 +599,6 @@
"image-attributes": "",
"upload-image": ""
},
- "change-successful": "",
- "delete-successful": "",
"dictionary": {
"entries": ""
},
@@ -643,8 +627,7 @@
"general-info": "",
"members": "",
"team-members": ""
- },
- "unsaved-changes": ""
+ }
},
"file-attribute-types": {
"": ""
@@ -676,9 +659,7 @@
"none": ""
},
"save": {
- "error": "",
- "label": "",
- "success": ""
+ "label": ""
},
"search": {
"placeholder": ""
@@ -780,7 +761,6 @@
},
"exclude-pages": {
"close": "",
- "error": "",
"hint": "",
"input-placeholder": "",
"label": "",
@@ -946,14 +926,8 @@
"NO_ROLE": ""
},
"rules-screen": {
- "error": {
- "generic": ""
- },
"revert-changes": "",
- "save-changes": "",
- "success": {
- "generic": ""
- }
+ "save-changes": ""
},
"smtp-auth-config": {
"actions": {
@@ -1001,10 +975,6 @@
"title": ""
},
"subtitle": "",
- "test": {
- "error": "",
- "success": ""
- },
"title": ""
},
"top-bar": {
@@ -1104,9 +1074,6 @@
},
"watermark-screen": {
"action": {
- "change-success": "",
- "delete-success": "",
- "error": "",
"revert": "",
"save": ""
},