Reorganize modules

apps/red-ui/src/app/modules/account/account.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { SharedModule } from '../shared/shared.module';
+import { SharedModule } from '@shared/shared.module';
 import { AccountRoutingModule } from './account-routing.module';
 import { AccountSideNavComponent } from './account-side-nav/account-side-nav.component';
 import { BaseAccountScreenComponent } from './base-account-screen/base-account-screen-component';

apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts

@@ -7,7 +7,7 @@ import { IProfile } from '@red/domain';
 import { languagesTranslations } from '../../../translations/languages-translations';
 import { PermissionsService } from '@services/permissions.service';
 import { UserService } from '@services/user.service';
-import { ConfigService } from '../../../../../services/config.service';
+import { ConfigService } from '@services/config.service';
 import { LanguageService } from '../../../../../i18n/language.service';
 import { firstValueFrom } from 'rxjs';
 

apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts

@@ -10,7 +10,7 @@ import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { DossierTemplate, DownloadFileType, IDossierTemplate } from '@red/domain';
 import { HttpStatusCode } from '@angular/common/http';
-import { DictionaryService } from '../../../shared/services/dictionary.service';
+import { DictionaryService } from '@shared/services/dictionary.service';
 import { firstValueFrom } from 'rxjs';
 
 @Component({

apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
-import { SharedModule } from '../../../shared/shared.module';
+import { SharedModule } from '@shared/shared.module';
 import { ReportsScreenComponent } from './reports-screen/reports-screen.component';
 
 const routes = [{ path: '', component: ReportsScreenComponent }];

apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
-import { SharedModule } from '../../../shared/shared.module';
+import { SharedModule } from '@shared/shared.module';
 import { RulesScreenComponent } from './rules-screen/rules-screen.component';
 import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
 import { PendingChangesGuard } from '../../../../guards/can-deactivate.guard';

apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts

@@ -25,7 +25,7 @@ import { ConfirmDeleteDossierStateDialogComponent } from '../dialogs/confirm-del
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { firstValueFrom, forkJoin } from 'rxjs';
 import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
-import { UserService } from '../../../services/user.service';
+import { UserService } from '@services/user.service';
 import { IDossierAttributeConfig, IFileAttributeConfig, IReportTemplate } from '@red/domain';
 import { ReportTemplateService } from '../../../services/report-template.service';
 

apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts

@@ -5,7 +5,7 @@ import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
 import { UserService } from '@services/user.service';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
 import { firstValueFrom } from 'rxjs';
-import { DictionaryService } from '../../../../shared/services/dictionary.service';
+import { DictionaryService } from '@shared/services/dictionary.service';
 import { DOSSIER_TEMPLATE_ID } from '@utils/constants';
 
 @Component({

apps/red-ui/src/app/modules/archive/archive-routing.module.ts

@@ -23,7 +23,7 @@ const routes: Routes = [
             breadcrumbs: [BreadcrumbTypes.archive, BreadcrumbTypes.dossier],
             dossiersService: ARCHIVED_DOSSIERS_SERVICE,
         },
-        loadChildren: () => import('../dossier/screens/dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule),
+        loadChildren: () => import('../dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule),
     },
     {
         path: `:${DOSSIER_ID}/file/:${FILE_ID}`,
@@ -33,7 +33,7 @@ const routes: Routes = [
             breadcrumbs: [BreadcrumbTypes.archive, BreadcrumbTypes.dossier, BreadcrumbTypes.file],
             dossiersService: ARCHIVED_DOSSIERS_SERVICE,
         },
-        loadChildren: () => import('../dossier/screens/file-preview-screen/file-preview.module').then(m => m.FilePreviewModule),
+        loadChildren: () => import('../file-preview/file-preview.module').then(m => m.FilePreviewModule),
     },
 ];
 

apps/red-ui/src/app/modules/archive/archive.module.ts

@@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common';
 import { ArchivedDossiersScreenComponent } from './screens/archived-dossiers-screen/archived-dossiers-screen.component';
 import { ArchiveRoutingModule } from './archive-routing.module';
 import { TableItemComponent } from './components/table-item/table-item.component';
-import { ConfigService } from './services/config.service';
+import { ConfigService } from '@services/config.service';
-import { SharedModule } from '../shared/shared.module';
+import { SharedModule } from '@shared/shared.module';
 
 const components = [TableItemComponent];
 const screens = [ArchivedDossiersScreenComponent];

apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts

@@ -1,9 +1,9 @@
 import { ChangeDetectionStrategy, Component, forwardRef, Injector } from '@angular/core';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
-import { ConfigService } from '../../services/config.service';
 import { DefaultListingServicesTmp, EntitiesService, ListingComponent } from '@iqser/common-ui';
 import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service';
 import { Dossier } from '@red/domain';
+import { ConfigService } from '../../services/config.service';
 
 @Component({
     selector: 'redaction-archived-dossiers-screen',

apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 import { Dossier, DossierAttributeWithValue, DossierStats } from '@red/domain';
-import { DossiersDialogService } from '../../../../services/dossiers-dialog.service';
+import { DossiersDialogService } from '../../../dossier/services/dossiers-dialog.service';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
 import { FilesService } from '@services/entity-services/files.service';
 import { firstValueFrom, Observable } from 'rxjs';

apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts

@@ -3,14 +3,14 @@ import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/si
 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 { Dossier, DossierAttributeWithValue, DossierStats, IDossierRequest, StatusSorter, User } from '@red/domain';
 import { ActivatedRoute } from '@angular/router';
 import { firstValueFrom, Observable } from 'rxjs';
 import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
 import { map, pluck, switchMap } from 'rxjs/operators';
-import { DossiersDialogService } from '../../../../services/dossiers-dialog.service';
+import { DossiersDialogService } from '../../../dossier/services/dossiers-dialog.service';
 import { FilesService } from '@services/entity-services/files.service';
 import { DOSSIER_ID } from '@utils/constants';
 import { DossiersService } from '@services/dossiers/dossiers.service';

apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts

@@ -19,7 +19,7 @@ import { saveAsCSV } from '@utils/csv-utils';
 import { UserService } from '@services/user.service';
 import { ConfigService } from '../../config.service';
 import { firstValueFrom } from 'rxjs';
-import { PrimaryFileAttributeService } from '../../../../../../services/primary-file-attribute.service';
+import { PrimaryFileAttributeService } from '@services/primary-file-attribute.service';
 import { Router } from '@angular/router';
 import { DossiersService } from '@services/dossiers/dossiers.service';
 

apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
 import { File } from '@red/domain';
-import { PrimaryFileAttributeService } from '../../../../../../../services/primary-file-attribute.service';
+import { PrimaryFileAttributeService } from '@services/primary-file-attribute.service';
 
 @Component({
     selector: 'redaction-file-name-column',

apps/red-ui/src/app/modules/dossier-overview/config.service.ts

@@ -12,18 +12,17 @@ import {
     WorkflowConfig,
 } from '@iqser/common-ui';
 import { 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 '../../services/dossiers-dialog.service';
+import { DossiersDialogService } from '../dossier/services/dossiers-dialog.service';
-import { annotationFilterChecker, RedactionFilterSorter } from '@utils/index';
+import { annotationFilterChecker, RedactionFilterSorter } from '../../utils';
-import { workloadTranslations } from '../../translations/workload-translations';
+import { workloadTranslations } from '../dossier/translations/workload-translations';
 import * as moment from 'moment';
 import { ConfigService as AppConfigService } from '@services/config.service';
 import { BehaviorSubject, Observable } from 'rxjs';
-import noop from 'lodash/noop';
 import { BulkActionsService } from './services/bulk-actions.service';
 
 @Injectable()

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 '../../shared/shared-dossiers.module';
+import { SharedDossiersModule } from '../dossier/shared/shared-dossiers.module';
 import { FileWorkloadComponent } from './components/table-item/file-workload/file-workload.component';
 import { FileStatsComponent } from './components/file-stats/file-stats.component';
 import { WorkflowItemComponent } from './components/workflow-item/workflow-item.component';

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 '../../../services/dossiers-dialog.service';
+import { DossiersDialogService } from '../../dossier/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 { FileAssignService } from '../../../shared/services/file-assign.service';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
-import { ReanalysisService } from '../../../../../services/reanalysis.service';
+import { ReanalysisService } from '@services/reanalysis.service';
 import { FileManagementService } from '@services/entity-services/file-management.service';
 import { firstValueFrom } from 'rxjs';
+import { FileAssignService } from '../../dossier/shared/services/file-assign.service';
 
 @Injectable()
 export class BulkActionsService {

apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts

@@ -16,7 +16,7 @@ const routes: Routes = [
             breadcrumbs: [BreadcrumbTypes.main, BreadcrumbTypes.dossier],
             dossiersService: ACTIVE_DOSSIERS_SERVICE,
         },
-        loadChildren: () => import('./screens/dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule),
+        loadChildren: () => import('../dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule),
     },
     {
         path: `:${DOSSIER_ID}/file/:${FILE_ID}`,
@@ -26,12 +26,12 @@ const routes: Routes = [
             breadcrumbs: [BreadcrumbTypes.main, BreadcrumbTypes.dossier, BreadcrumbTypes.file],
             dossiersService: ACTIVE_DOSSIERS_SERVICE,
         },
-        loadChildren: () => import('./screens/file-preview-screen/file-preview.module').then(m => m.FilePreviewModule),
+        loadChildren: () => import('../file-preview/file-preview.module').then(m => m.FilePreviewModule),
     },
     {
         path: '',
         pathMatch: 'full',
-        loadChildren: () => import('./screens/dossiers-listing/dossiers-listing.module').then(m => m.DossiersListingModule),
+        loadChildren: () => import('../dossiers-listing/dossiers-listing.module').then(m => m.DossiersListingModule),
         data: { breadcrumbs: [BreadcrumbTypes.main] },
     },
 ];

apps/red-ui/src/app/modules/dossier/dossiers.module.ts

@@ -1,39 +1,12 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { ManualAnnotationDialogComponent } from './dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
-import { ForceAnnotationDialogComponent } from './dialogs/force-redaction-dialog/force-annotation-dialog.component';
-import { RemoveAnnotationsDialogComponent } from './dialogs/remove-annotations-dialog/remove-annotations-dialog.component';
 import { SharedModule } from '@shared/shared.module';
 import { DossiersRoutingModule } from './dossiers-routing.module';
 import { FileUploadDownloadModule } from '@upload-download/file-upload-download.module';
-import { ChangeLegalBasisDialogComponent } from './dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component';
-import { RecategorizeImageDialogComponent } from './dialogs/recategorize-image-dialog/recategorize-image-dialog.component';
 import { OverlayModule } from '@angular/cdk/overlay';
 import { SharedDossiersModule } from './shared/shared-dossiers.module';
-import { ResizeAnnotationDialogComponent } from './dialogs/resize-annotation-dialog/resize-annotation-dialog.component';
-import { HighlightActionDialogComponent } from './screens/file-preview-screen/dialogs/highlight-action-dialog/highlight-action-dialog.component';
-import { ColorPickerModule } from 'ngx-color-picker';
-
-const dialogs = [
-    ManualAnnotationDialogComponent,
-    ForceAnnotationDialogComponent,
-    RemoveAnnotationsDialogComponent,
-    ResizeAnnotationDialogComponent,
-    ChangeLegalBasisDialogComponent,
-    RecategorizeImageDialogComponent,
-    HighlightActionDialogComponent,
-];
 
 @NgModule({
-    declarations: [...dialogs],
+    imports: [CommonModule, SharedModule, SharedDossiersModule, FileUploadDownloadModule, DossiersRoutingModule, OverlayModule],
-    imports: [
-        CommonModule,
-        SharedModule,
-        SharedDossiersModule,
-        FileUploadDownloadModule,
-        DossiersRoutingModule,
-        OverlayModule,
-        ColorPickerModule,
-    ],
 })
 export class DossiersModule {}

apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts

@@ -1,31 +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 { RemoveAnnotationsDialogComponent } from '../dialogs/remove-annotations-dialog/remove-annotations-dialog.component';
-import { ForceAnnotationDialogComponent } from '../dialogs/force-redaction-dialog/force-annotation-dialog.component';
-import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component';
-import { ManualAnnotationDialogComponent } from '../dialogs/manual-redaction-dialog/manual-annotation-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 { ChangeLegalBasisDialogComponent } from '../dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component';
-import { RecategorizeImageDialogComponent } from '../dialogs/recategorize-image-dialog/recategorize-image-dialog.component';
 import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogConfig } from '@iqser/common-ui';
-import { ResizeAnnotationDialogComponent } from '../dialogs/resize-annotation-dialog/resize-annotation-dialog.component';
-import { HighlightActionDialogComponent } from '../screens/file-preview-screen/dialogs/highlight-action-dialog/highlight-action-dialog.component';
 
-type DialogType =
+type DialogType = 'confirm' | 'editDossier' | 'addDossier' | 'assignFile';
-    | 'confirm'
-    | 'documentInfo'
-    | 'editDossier'
-    | 'addDossier'
-    | 'assignFile'
-    | 'recategorizeImage'
-    | 'changeLegalBasis'
-    | 'removeAnnotations'
-    | 'resizeAnnotation'
-    | 'forceAnnotation'
-    | 'manualAnnotation'
-    | 'highlightAction';
 
 @Injectable()
 export class DossiersDialogService extends DialogService<DialogType> {
@@ -34,10 +14,6 @@ export class DossiersDialogService extends DialogService<DialogType> {
             component: ConfirmationDialogComponent,
             dialogConfig: { disableClose: false },
         },
-        documentInfo: {
-            component: DocumentInfoDialogComponent,
-            dialogConfig: { autoFocus: true },
-        },
         editDossier: {
             component: EditDossierDialogComponent,
             dialogConfig: { ...largeDialogConfig },
@@ -50,28 +26,6 @@ export class DossiersDialogService extends DialogService<DialogType> {
             component: AssignReviewerApproverDialogComponent,
             dialogConfig: { disableClose: false },
         },
-        recategorizeImage: {
-            component: RecategorizeImageDialogComponent,
-        },
-        changeLegalBasis: {
-            component: ChangeLegalBasisDialogComponent,
-        },
-        removeAnnotations: {
-            component: RemoveAnnotationsDialogComponent,
-        },
-        resizeAnnotation: {
-            component: ResizeAnnotationDialogComponent,
-        },
-        forceAnnotation: {
-            component: ForceAnnotationDialogComponent,
-        },
-        manualAnnotation: {
-            component: ManualAnnotationDialogComponent,
-            dialogConfig: { autoFocus: true },
-        },
-        highlightAction: {
-            component: HighlightActionDialogComponent,
-        },
     };
 
     constructor(protected readonly _dialog: MatDialog) {

apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts

@@ -7,7 +7,7 @@ import { Dictionary, File, IRedactionLog, IViewedPage, TextHighlightResponse } f
 import { RedactionLogService } from './redaction-log.service';
 import { ViewedPagesService } from '@services/entity-services/viewed-pages.service';
 import { UserPreferenceService } from '@services/user-preference.service';
-import { FilePreviewStateService } from '../screens/file-preview-screen/services/file-preview-state.service';
+import { FilePreviewStateService } from '../../file-preview/services/file-preview-state.service';
 import { Toaster } from '@iqser/common-ui';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service';

apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts

@@ -33,13 +33,13 @@ import { FileManagementService } from '@services/entity-services/file-management
 import { FilesService } from '@services/entity-services/files.service';
 import { ReanalysisService, ReanalyzeQueryParams } from '@services/reanalysis.service';
 import { Router } from '@angular/router';
-import { ExcludedPagesService } from '../../../screens/file-preview-screen/services/excluded-pages.service';
+import { ExcludedPagesService } from '../../../../file-preview/services/excluded-pages.service';
 import { tap } from 'rxjs/operators';
-import { DocumentInfoService } from '../../../screens/file-preview-screen/services/document-info.service';
+import { DocumentInfoService } from '../../../../file-preview/services/document-info.service';
 import { ExpandableFileActionsComponent } from '@shared/components/expandable-file-actions/expandable-file-actions.component';
 import { firstValueFrom } from 'rxjs';
 import { RedactionImportService } from '../../services/redaction-import.service';
-import { PageRotationService } from '../../../screens/file-preview-screen/services/page-rotation.service';
+import { PageRotationService } from '../../../../file-preview/services/page-rotation.service';
 
 @Component({
     selector: 'redaction-file-actions [file] [type]',

apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts

@@ -5,7 +5,6 @@ import { FileActionsComponent } from './components/file-actions/file-actions.com
 import { SharedModule } from '@shared/shared.module';
 import { RedactionImportService } from './services/redaction-import.service';
 import { DossiersDialogService } from '../services/dossiers-dialog.service';
-import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component';
 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';
@@ -19,7 +18,6 @@ import { DateColumnComponent } from './components/date-column/date-column.compon
 
 const components = [
     FileActionsComponent,
-    DocumentInfoDialogComponent,
     EditDossierGeneralInfoComponent,
     EditDossierDownloadPackageComponent,
     EditDossierDictionaryComponent,

apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts

@@ -3,7 +3,7 @@ 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 '../../../../services/dossiers-dialog.service';
+import { DossiersDialogService } from '../../../dossier/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';

apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts

@@ -4,7 +4,7 @@ import { FilterService, mapEach } from '@iqser/common-ui';
 import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { combineLatest, Observable } from 'rxjs';
 import { DossierStats, FileCountPerWorkflowStatus, StatusSorter } from '@red/domain';
-import { workflowFileStatusTranslations } from '../../../../../../translations/file-status-translations';
+import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations';
 import { TranslateChartService } from '@services/translate-chart.service';
 import { filter, map, switchMap } from 'rxjs/operators';
 import { DossierStatsService } from '@services/dossiers/dossier-stats.service';

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, dossierTemplateChecker, RedactionFilterSorter } from '@utils/index';
-import { workloadTranslations } from '../../translations/workload-translations';
+import { workloadTranslations } from '../dossier/translations/workload-translations';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
 import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
 import { DossierStatesMapService } from '@services/entity-services/dossier-states-map.service';

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 '../../shared/shared-dossiers.module';
+import { SharedDossiersModule } from '../dossier/shared/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';
 

apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts

@@ -4,7 +4,7 @@ import { UserService } from '@services/user.service';
 import { PermissionsService } from '@services/permissions.service';
 import { TranslateChartService } from '@services/translate-chart.service';
 import { Router } from '@angular/router';
-import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
+import { DossiersDialogService } from '../../dossier/services/dossiers-dialog.service';
 import { DefaultListingServicesTmp, EntitiesService, ListingComponent, OnAttach, TableComponent } from '@iqser/common-ui';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { ConfigService } from '../config.service';

apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { AnnotationWrapper } from '../../../../../../models/file/annotation.wrapper';
+import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { MultiSelectService } from '../../services/multi-select.service';
 
 @Component({

apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.scss

@@ -1,4 +1,4 @@
-@use '../../../../../../../assets/styles/variables';
+@use 'variables';
 
 :host {
     display: flex;

apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } 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';
 

apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.scss

@@ -1,4 +1,4 @@
-@use '../../../../../../../assets/styles/variables';
+@use 'variables';
 
 :host {
     width: 100%;

apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts

@@ -6,8 +6,8 @@ import { AnnotationReferencesService } from '../../services/annotation-reference
 import { UserPreferenceService } from '@services/user-preference.service';
 import { ViewModeService } from '../../services/view-mode.service';
 import { BehaviorSubject } from 'rxjs';
-import { DossiersDialogService } from '../../../../services/dossiers-dialog.service';
 import { TextHighlightsGroup } from '@red/domain';
+import { FilePreviewDialogService } from '../../services/file-preview-dialog.service';
 
 @Component({
     selector: 'redaction-annotations-list',
@@ -33,7 +33,7 @@ export class AnnotationsListComponent implements OnChanges {
         private readonly _filterService: FilterService,
         private readonly _userPreferenceService: UserPreferenceService,
         private readonly _viewModeService: ViewModeService,
-        private readonly _dialogService: DossiersDialogService,
+        private readonly _dialogService: FilePreviewDialogService,
     ) {}
 
     ngOnChanges(changes: SimpleChanges): void {

apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.ts

@@ -1,5 +1,4 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { DossiersDialogService } from '../../../../services/dossiers-dialog.service';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
 import { DocumentInfoService } from '../../services/document-info.service';
 import { combineLatest, Observable, switchMap } from 'rxjs';
@@ -7,6 +6,7 @@ import { PermissionsService } from '@services/permissions.service';
 import { FilePreviewStateService } from '../../services/file-preview-state.service';
 import { map } from 'rxjs/operators';
 import { File } from '@red/domain';
+import { FilePreviewDialogService } from '../../services/file-preview-dialog.service';
 
 @Component({
     selector: 'redaction-document-info',
@@ -20,7 +20,7 @@ export class DocumentInfoComponent {
 
     constructor(
         private readonly _dossierTemplatesService: DossierTemplatesService,
-        private readonly _dialogService: DossiersDialogService,
+        private readonly _dialogService: FilePreviewDialogService,
         readonly stateService: FilePreviewStateService,
         readonly permissionsService: PermissionsService,
         readonly documentInfoService: DocumentInfoService,

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 '../../../../services/annotation-processing.service';
+import { AnnotationProcessingService } from '../../../dossier/services/annotation-processing.service';
 import { MatDialogRef, MatDialogState } from '@angular/material/dialog';
 import scrollIntoView from 'scroll-into-view-if-needed';
 import {