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';