From 8126b1c452711ca6fd8b67d4e314d90365e940b5 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 3 Mar 2022 22:59:14 +0200 Subject: [PATCH] Auto stash before merge of "RED-3313" and "origin/RED-3313" --- apps/red-ui/src/app/app.module.ts | 4 +- .../notifications/notifications.component.ts | 2 +- .../src/app/guards/dossier-files-guard.ts | 2 +- apps/red-ui/src/app/guards/dossiers.guard.ts | 6 +-- .../src/app/guards/file-preview.guard.ts | 2 +- ...dossier-states-listing-screen.component.ts | 11 +++-- .../admin/services/admin-dialog.service.ts | 2 +- .../table-item/table-item.component.ts | 2 +- .../archived-dossiers-screen.component.ts | 2 +- .../add-dossier-dialog.component.ts | 2 +- ...sign-reviewer-approver-dialog.component.ts | 2 +- .../change-legal-basis-dialog.component.ts | 2 +- .../document-info-dialog.component.ts | 2 +- .../edit-dossier-dictionary.component.ts | 2 +- ...edit-dossier-download-package.component.ts | 2 +- .../edit-dossier-dialog.component.ts | 2 +- .../edit-dossier-team.component.ts | 2 +- .../edit-dossier-general-info.component.ts | 6 +-- .../force-annotation-dialog.component.ts | 2 +- .../manual-annotation-dialog.component.ts | 2 +- .../dossier-details-stats.component.ts | 2 +- .../dossier-details.component.ts | 4 +- ...ossier-overview-screen-header.component.ts | 2 +- .../file-workload/file-workload.component.ts | 2 +- .../dossier-overview-screen.component.ts | 2 +- .../services/bulk-actions.service.ts | 2 +- .../dossiers-listing-actions.component.ts | 2 +- .../dossiers-listing-details.component.ts | 4 +- .../table-item/table-item.component.ts | 2 +- .../dossiers-listing/config.service.ts | 2 +- .../dossiers-listing-screen.component.ts | 2 +- .../user-management.component.ts | 2 +- .../accept-recommendation-dialog.component.ts | 2 +- .../file-preview-screen.component.ts | 2 +- .../services/annotation-actions.service.ts | 2 +- .../services/annotation-draw.service.ts | 2 +- .../services/file-preview-state.service.ts | 2 +- .../services/manual-annotation.service.ts | 2 +- .../file-actions/file-actions.component.ts | 2 +- .../shared/services/file-assign.service.ts | 2 +- .../search-screen/search-screen.component.ts | 4 +- .../dictionary-manager.component.ts | 2 +- .../file-drop/file-drop.component.ts | 2 +- .../src/app/services/breadcrumbs.service.ts | 2 +- .../active-dossiers.service.ts | 4 +- .../archived-dossiers.service.ts | 24 +++++----- .../dossier-stats.service.ts | 2 +- .../dossiers.service.ts | 46 +++++++------------ .../entity-services/dossier-state.service.ts | 2 +- .../dossiers.service.provider.ts | 2 +- .../file-management.service.ts | 2 +- .../services/entity-services/files.service.ts | 2 +- .../platform-search.service.ts | 6 +-- .../entity-services/trash-dossiers.service.ts | 2 +- .../src/app/services/notifications.service.ts | 2 +- .../src/app/services/permissions.service.ts | 2 +- .../src/lib/dossiers/dossier-changes.ts | 11 +++++ libs/red-domain/src/lib/dossiers/index.ts | 1 + 58 files changed, 112 insertions(+), 109 deletions(-) rename apps/red-ui/src/app/services/{entity-services => dossiers}/active-dossiers.service.ts (86%) rename apps/red-ui/src/app/services/{entity-services => dossiers}/archived-dossiers.service.ts (61%) rename apps/red-ui/src/app/services/{entity-services => dossiers}/dossier-stats.service.ts (94%) rename apps/red-ui/src/app/services/{entity-services => dossiers}/dossiers.service.ts (82%) create mode 100644 libs/red-domain/src/lib/dossiers/dossier-changes.ts diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index aab790e5a..07bb430b0 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -44,8 +44,8 @@ import { GeneralSettingsService } from '@services/general-settings.service'; import { BreadcrumbsComponent } from '@components/breadcrumbs/breadcrumbs.component'; import { UserPreferenceService } from '@services/user-preference.service'; import { UserService } from '@services/user.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; +import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service'; export function httpLoaderFactory(httpClient: HttpClient, configService: ConfigService): PruningTranslationLoader { return new PruningTranslationLoader(httpClient, '/assets/i18n/', `.json?version=${configService.values.FRONTEND_APP_VERSION}`); diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.ts b/apps/red-ui/src/app/components/notifications/notifications.component.ts index ac364c677..b7e29e505 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.ts +++ b/apps/red-ui/src/app/components/notifications/notifications.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { DatePipe } from '@shared/pipes/date.pipe'; import { UserService } from '@services/user.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { NotificationsService } from '@services/notifications.service'; import { Notification } from '@red/domain'; import { distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'; 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 a438ea900..aa805c35d 100644 --- a/apps/red-ui/src/app/guards/dossier-files-guard.ts +++ b/apps/red-ui/src/app/guards/dossier-files-guard.ts @@ -4,7 +4,7 @@ import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesService } from '@services/entity-services/files.service'; import { firstValueFrom } from 'rxjs'; import { DOSSIER_ID } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../services/dossiers/dossiers.service'; @Injectable({ providedIn: 'root' }) export class DossierFilesGuard implements CanActivate { diff --git a/apps/red-ui/src/app/guards/dossiers.guard.ts b/apps/red-ui/src/app/guards/dossiers.guard.ts index 84cb937a1..d99289967 100644 --- a/apps/red-ui/src/app/guards/dossiers.guard.ts +++ b/apps/red-ui/src/app/guards/dossiers.guard.ts @@ -1,10 +1,10 @@ import { Injectable, Injector, ProviderToken } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate } from '@angular/router'; import { firstValueFrom, forkJoin } from 'rxjs'; -import { DossiersService } from '@services/entity-services/dossiers.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; import { take } from 'rxjs/operators'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; +import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; @Injectable({ providedIn: 'root' }) export class DossiersGuard implements CanActivate { diff --git a/apps/red-ui/src/app/guards/file-preview.guard.ts b/apps/red-ui/src/app/guards/file-preview.guard.ts index 3e12c451f..d858d4295 100644 --- a/apps/red-ui/src/app/guards/file-preview.guard.ts +++ b/apps/red-ui/src/app/guards/file-preview.guard.ts @@ -2,7 +2,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 { DOSSIER_ID, FILE_ID } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../services/dossiers/dossiers.service'; @Injectable({ providedIn: 'root' }) export class FilePreviewGuard implements CanActivate { diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts index d21f9a8a8..e503109e0 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts @@ -10,7 +10,7 @@ import { } from '@iqser/common-ui'; import { DossierState, IDossierState } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../services/dossiers/active-dossiers.service'; import { DossierStateService } from '@services/entity-services/dossier-state.service'; import { firstValueFrom } from 'rxjs'; import { AdminDialogService } from '../../services/admin-dialog.service'; @@ -111,9 +111,12 @@ export class DossierStatesListingScreenComponent extends ListingComponent d.dossierTemplateId === this.#dossierTemplateId); this.#setStatesCount(dossierStates); - this.chartData = dossierStates.map(state => { - return { value: state.dossierCount, label: state.name, key: state.name, color: state.color }; - }); + this.chartData = dossierStates.map(state => ({ + value: state.dossierCount, + label: state.name, + key: state.name, + color: state.color, + })); this.entitiesService.setEntities(dossierStates || []); } catch (e) {} diff --git a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts index 24d471313..aacc5ff12 100644 --- a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts @@ -24,7 +24,7 @@ import { AddEditDossierStateDialogComponent } from '../dialogs/add-edit-dossier- import { ConfirmDeleteDossierStateDialogComponent } from '../dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { firstValueFrom, forkJoin } from 'rxjs'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../services/dossiers/active-dossiers.service'; import { UserService } from '../../../services/user.service'; import { IDossierAttributeConfig, IFileAttributeConfig, IReportTemplate } from '@red/domain'; import { ReportTemplateService } from '../../../services/report-template.service'; diff --git a/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts index 96639f6dd..eb2fb8997 100644 --- a/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts +++ b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { Dossier, DossierStats } from '@red/domain'; import { BehaviorSubject, Observable } from 'rxjs'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../services/dossiers/dossier-stats.service'; import { switchMap } from 'rxjs/operators'; @Component({ diff --git a/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts b/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts index 011f62a2d..1cbc63466 100644 --- a/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts +++ b/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, forwardRef, Injector } from '@angul import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ConfigService } from '../../services/config.service'; import { DefaultListingServicesTmp, EntitiesService, ListingComponent } from '@iqser/common-ui'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; +import { ArchivedDossiersService } from '../../../../services/dossiers/archived-dossiers.service'; import { Dossier } from '@red/domain'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 5f8df2701..ad06870c4 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -5,7 +5,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import * as moment from 'moment'; import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; import { BaseDialogComponent, IconButtonTypes, SaveOptions } from '@iqser/common-ui'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { ReportTemplateService } from '@services/report-template.service'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts index 0bf590180..b1f7e77b4 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts @@ -6,7 +6,7 @@ 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 { ActiveDossiersService } from '@services/entity-services/active-dossiers.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/change-legal-basis-dialog/change-legal-basis-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts index d597b8def..d56b46d04 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts @@ -3,7 +3,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { PermissionsService } from '@services/permissions.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { Dossier } from '@red/domain'; import { BaseDialogComponent } from '@iqser/common-ui'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts index a51c29780..2ba30fdeb 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup } from '@angular/forms'; 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/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { FilesService } from '@services/entity-services/files.service'; import { BaseDialogComponent } from '@iqser/common-ui'; import { firstValueFrom } from 'rxjs'; 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/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts index 2716b3510..4cda2fe4c 100644 --- 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/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts @@ -8,7 +8,7 @@ import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FormBuilder, FormGroup } from '@angular/forms'; import { firstValueFrom } from 'rxjs'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; @Component({ selector: 'redaction-edit-dossier-dictionary', diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index 424a7d01d..60a79f93f 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -6,7 +6,7 @@ import { downloadTypesTranslations } from '../../../../../translations/download- import { ReportTemplateService } from '@services/report-template.service'; import { PermissionsService } from '@services/permissions.service'; import { firstValueFrom } from 'rxjs'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; @Component({ selector: 'redaction-edit-dossier-download-package', diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts index 2c7340499..dafce681c 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts @@ -15,7 +15,7 @@ import { tap } from 'rxjs/operators'; import { EditDossierTeamComponent } from './edit-dossier-team/edit-dossier-team.component'; import { PermissionsService } from '@services/permissions.service'; import { UserService } from '@services/user.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider'; type Section = 'dossierInfo' | 'downloadPackage' | 'dossierDictionary' | 'members' | 'dossierAttributes' | 'deletedDocuments'; 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/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts index f51df9547..40c711cde 100644 --- 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/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts @@ -6,7 +6,7 @@ import { AutoUnsubscribe } from '@iqser/common-ui'; import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface'; import { BehaviorSubject, firstValueFrom } from 'rxjs'; import { PermissionsService } from '@services/permissions.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; @Component({ selector: 'redaction-edit-dossier-team', diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index ac4c9a880..a8ad313f4 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -11,14 +11,14 @@ import { EditDossierDialogComponent } from '../edit-dossier-dialog.component'; import { ConfirmationDialogInput, ConfirmOptions, IconButtonTypes, LoadingService, TitleColors, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; import { firstValueFrom } from 'rxjs'; import { DossierStateService } from '@services/entity-services/dossier-state.service'; import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; import { TranslateService } from '@ngx-translate/core'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; import { TrashDossiersService } from '@services/entity-services/trash-dossiers.service'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; +import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service'; @Component({ selector: 'redaction-edit-dossier-general-info', diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts index ee322806b..074191aa2 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts @@ -6,7 +6,7 @@ import { TranslateService } from '@ngx-translate/core'; import { UserService } from '@services/user.service'; import { ManualAnnotationService } from '../../services/manual-annotation.service'; import { PermissionsService } from '@services/permissions.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { Dossier, ILegalBasisChangeRequest } from '@red/domain'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts index cc6f72750..bb43c5f42 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts @@ -6,7 +6,7 @@ import { ManualAnnotationService } from '../../services/manual-annotation.servic import { PermissionsService } from '@services/permissions.service'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { Dictionary, Dossier, IAddRedactionRequest } from '@red/domain'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { DictionaryService } from '@shared/services/dictionary.service'; import { BaseDialogComponent } from '@iqser/common-ui'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts index 8861fe27a..915058867 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts @@ -5,7 +5,7 @@ import { DossierTemplatesService } from '@services/entity-services/dossier-templ import { FilesService } from '@services/entity-services/files.service'; import { firstValueFrom, Observable } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts index d041ee93d..bec608190 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts @@ -8,12 +8,12 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Dossier, DossierAttributeWithValue, DossierStats, IDossierRequest, StatusSorter, User } from '@red/domain'; import { ActivatedRoute } from '@angular/router'; import { firstValueFrom, Observable } from 'rxjs'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service'; import { map, pluck, switchMap } from 'rxjs/operators'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { FilesService } from '@services/entity-services/files.service'; import { DOSSIER_ID } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../../services/dossiers/dossiers.service'; @Component({ selector: 'redaction-dossier-details', diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts index 15249262c..d66fa681c 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts @@ -21,7 +21,7 @@ import { ConfigService } from '../../config.service'; import { firstValueFrom } from 'rxjs'; import { PrimaryFileAttributeService } from '../../../../../../services/primary-file-attribute.service'; import { Router } from '@angular/router'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../../services/dossiers/dossiers.service'; @Component({ selector: 'redaction-dossier-overview-screen-header', diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts index 0bc097f52..3cdfc9623 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { File } from '@red/domain'; import { UserService } from '@services/user.service'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../../../services/dossiers/dossiers.service'; @Component({ selector: 'redaction-file-workload', diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts index a4bf07984..2123eb951 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts @@ -44,7 +44,7 @@ import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesService } from '@services/entity-services/files.service'; import { DOSSIER_ID } from '@utils/constants'; import { BulkActionsService } from '../services/bulk-actions.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../services/dossiers/dossiers.service'; import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts index 71ebccdd9..569e424a4 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Dossier, File } from '@red/domain'; import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; import { ConfirmationDialogInput, LoadingService } from '@iqser/common-ui'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../services/dossiers/active-dossiers.service'; import { FilesService } from '@services/entity-services/files.service'; import { FileAssignService } from '../../../shared/services/file-assign.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts index 512dfdc9d..42ad618cb 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts @@ -8,7 +8,7 @@ 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 { ReanalysisService } from '@services/reanalysis.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service'; import { firstValueFrom } from 'rxjs'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts index 8e5e32872..2e89dbae4 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts @@ -1,13 +1,13 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/simple-doughnut-chart.component'; import { FilterService, mapEach } from '@iqser/common-ui'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service'; import { combineLatest, Observable } from 'rxjs'; import { DossierStats, FileCountPerWorkflowStatus, StatusSorter } from '@red/domain'; import { workflowFileStatusTranslations } from '../../../../../../translations/file-status-translations'; import { TranslateChartService } from '@services/translate-chart.service'; import { filter, map, switchMap } from 'rxjs/operators'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service'; import { DossierStateService } from '@services/entity-services/dossier-state.service'; import { TranslateService } from '@ngx-translate/core'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts index 0151c3320..209e5bebf 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { Dossier, DossierStats } from '@red/domain'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service'; import { BehaviorSubject, Observable } from 'rxjs'; import { switchMap } from 'rxjs/operators'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts index 221a5f10d..589db7743 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts @@ -9,7 +9,7 @@ import { workflowFileStatusTranslations } from '../../../../translations/file-st import { dossierMemberChecker, dossierStateChecker, dossierTemplateChecker, RedactionFilterSorter } from '@utils/index'; import { workloadTranslations } from '../../translations/workload-translations'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../services/dossiers/dossier-stats.service'; import { DossierStateService } from '@services/entity-services/dossier-state.service'; @Injectable() diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts index c701a66bb..1d78c6fe4 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts @@ -8,7 +8,7 @@ import { DossiersDialogService } from '../../../services/dossiers-dialog.service import { DefaultListingServicesTmp, EntitiesService, ListingComponent, OnAttach, TableComponent } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ConfigService } from '../config.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../services/dossiers/active-dossiers.service'; import { FilesService } from '@services/entity-services/files.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { tap } from 'rxjs/operators'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts index 6d7decb5f..7da635d51 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts @@ -11,7 +11,7 @@ import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, combineLatest, firstValueFrom, Observable, switchMap } from 'rxjs'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; import { distinctUntilChanged, map } from 'rxjs/operators'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service'; @Component({ selector: 'redaction-user-management', diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts index 73ae1d051..23486c7f9 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { PermissionsService } from '@services/permissions.service'; import { Dictionary, Dossier } from '@red/domain'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service'; import { BaseDialogComponent } from '@iqser/common-ui'; import { DictionaryService } from '@shared/services/dictionary.service'; import { ManualAnnotationService } from '../../../../services/manual-annotation.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts index ef21f787d..0d9cb0fc0 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts @@ -49,7 +49,7 @@ import { FilePreviewStateService } from './services/file-preview-state.service'; import { FileDataModel } from '../../../../models/file/file-data.model'; import { filePreviewScreenProviders } from './file-preview-providers'; import { ManualAnnotationService } from '../../services/manual-annotation.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../services/dossiers/dossiers.service'; import Annotation = Core.Annotations.Annotation; import PDFNet = Core.PDFNet; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts index 64b334e7e..9678c87ae 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts @@ -14,7 +14,7 @@ import { Dossier, IAddRedactionRequest, ILegalBasisChangeRequest, IRectangle, IR import { toPosition } from '../../../utils/pdf-calculation.utils'; import { AnnotationDrawService } from './annotation-draw.service'; import { translateQuads } from '@utils/pdf-coordinates'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../services/dossiers/active-dossiers.service'; import { AcceptRecommendationData, AcceptRecommendationDialogComponent, diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts index 9f2dc9551..5f188a944 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts @@ -10,7 +10,7 @@ import { IRectangle, ISectionGrid, ISectionRectangle } from '@red/domain'; import { SkippedService } from './skipped.service'; import { firstValueFrom } from 'rxjs'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../services/dossiers/dossiers.service'; import Annotation = Core.Annotations.Annotation; @Injectable() diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts index f6053b336..007038d57 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts @@ -9,7 +9,7 @@ import { boolFactory, shareLast } from '@iqser/common-ui'; import { filter, startWith } from 'rxjs/operators'; import { FileManagementService } from '@services/entity-services/file-management.service'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../services/dossiers/dossiers.service'; import { dossiersServiceResolver } from '@services/entity-services/dossiers.service.provider'; @Injectable() diff --git a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts index e0e7ed10c..99a831e55 100644 --- a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts @@ -17,7 +17,7 @@ import { AnnotationActionMode } from '../models/annotation-action-mode.model'; import { annotationActionsTranslations } from '../translations/annotation-actions-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { Observable } from 'rxjs'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; 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/dossier/shared/components/file-actions/file-actions.component.ts index 3c1dcde3c..a6d824225 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts @@ -28,7 +28,7 @@ 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/entity-services/active-dossiers.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 { ReanalysisService, ReanalyzeQueryParams } from '@services/reanalysis.service'; diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts index bd4672134..49c61d10e 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts @@ -5,7 +5,7 @@ import { DossiersDialogService } from '../../services/dossiers-dialog.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FilesService } from '@services/entity-services/files.service'; import { ConfirmationDialogInput, LoadingService, Toaster } from '@iqser/common-ui'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../services/dossiers/active-dossiers.service'; import { firstValueFrom, Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; 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 7638d3f02..45a760d9d 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 @@ -17,11 +17,11 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { workflowFileStatusTranslations } from '../../../translations/file-status-translations'; import { TranslateService } from '@ngx-translate/core'; import { RouterHistoryService } from '@services/router-history.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { Dossier, DossierStatuses, IMatchedDocument, ISearchListItem, ISearchResponse } from '@red/domain'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { PlatformSearchService } from '@services/entity-services/platform-search.service'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; +import { ActiveDossiersService } from '../../../services/dossiers/active-dossiers.service'; +import { ArchivedDossiersService } from '../../../services/dossiers/archived-dossiers.service'; @Component({ templateUrl: './search-screen.component.html', diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts index c662e3a2c..e8d4ea708 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts @@ -5,7 +5,7 @@ import { catchError, map, take, tap } from 'rxjs/operators'; import { Dictionary, Dossier, DossierTemplate } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DictionaryService } from '@shared/services/dictionary.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { EditorComponent } from '@shared/components/editor/editor.component'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; diff --git a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts index 856066818..29b4dc609 100644 --- a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts +++ b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, HostListener, Inject } from '@angular/cor import { FileUploadService } from '../services/file-upload.service'; import { OverlayRef } from '@angular/cdk/overlay'; import { StatusOverlayService } from '../services/status-overlay.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { handleFileDrop } from '@utils/file-drop-utils'; import { FileUploadModel } from '@upload-download/model/file-upload.model'; import { DOSSIER_ID } from '../../../tokens'; diff --git a/apps/red-ui/src/app/services/breadcrumbs.service.ts b/apps/red-ui/src/app/services/breadcrumbs.service.ts index 6679e7255..16f90f59d 100644 --- a/apps/red-ui/src/app/services/breadcrumbs.service.ts +++ b/apps/red-ui/src/app/services/breadcrumbs.service.ts @@ -7,7 +7,7 @@ import { FilesMapService } from '@services/entity-services/files-map.service'; import { TranslateService } from '@ngx-translate/core'; import { BreadcrumbTypes } from '@red/domain'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; import { dossiersServiceResolver } from '@services/entity-services/dossiers.service.provider'; export type RouterLinkActiveOptions = { exact: boolean } | IsActiveMatchOptions; diff --git a/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts b/apps/red-ui/src/app/services/dossiers/active-dossiers.service.ts similarity index 86% rename from apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts rename to apps/red-ui/src/app/services/dossiers/active-dossiers.service.ts index b252b43d2..af72b2eb5 100644 --- a/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts +++ b/apps/red-ui/src/app/services/dossiers/active-dossiers.service.ts @@ -1,8 +1,8 @@ import { Injectable, Injector } from '@angular/core'; import { switchMap, tap } from 'rxjs/operators'; import { timer } from 'rxjs'; -import { CHANGED_CHECK_INTERVAL } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { CHANGED_CHECK_INTERVAL } from '../../utils/constants'; +import { DossiersService } from './dossiers.service'; export interface IDossiersStats { totalPeople: number; diff --git a/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts b/apps/red-ui/src/app/services/dossiers/archived-dossiers.service.ts similarity index 61% rename from apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts rename to apps/red-ui/src/app/services/dossiers/archived-dossiers.service.ts index c94679864..75ae0b05c 100644 --- a/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts +++ b/apps/red-ui/src/app/services/dossiers/archived-dossiers.service.ts @@ -4,8 +4,8 @@ import { catchError, tap } from 'rxjs/operators'; import { Observable, of } from 'rxjs'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ActiveDossiersService } from './active-dossiers.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; -import { FilesMapService } from '@services/entity-services/files-map.service'; +import { DossiersService } from './dossiers.service'; +import { FilesMapService } from '../entity-services/files-map.service'; @Injectable({ providedIn: 'root' }) export class ArchivedDossiersService extends DossiersService { @@ -18,22 +18,22 @@ export class ArchivedDossiersService extends DossiersService { } archive(dossiers: Dossier[]): Observable { - const showToast = () => { + const showArchiveFailedToast = () => { this._toaster.error(_('dossier-listing.archive.archive-failed'), { params: dossiers }); return of({}); }; - return this._post( - dossiers.map(d => d.id), - `${this._defaultModelPath}/archive`, - ).pipe( - tap(() => this.#removeFromActiveDossiers(dossiers)), - catchError(showToast), + + const archivedDossiersIds = dossiers.map(d => d.dossierId); + + return this._post(archivedDossiersIds, `${this._defaultModelPath}/archive`).pipe( + tap(() => this.#removeFromActiveDossiers(archivedDossiersIds)), + catchError(showArchiveFailedToast), ); } - #removeFromActiveDossiers(dossiers: Dossier[]): void { - const remainingEntities = this._activeDossiersService.all.filter(dossier => !dossiers.find(d => dossier.id === d.id)); + #removeFromActiveDossiers(archivedDossiersIds: string[]): void { + const remainingEntities = this._activeDossiersService.all.filter(d => !archivedDossiersIds.includes(d.dossierId)); this._activeDossiersService.setEntities(remainingEntities); - this._filesMapService.delete(dossiers.map(d => d.id)); + this._filesMapService.delete(archivedDossiersIds); } } diff --git a/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts b/apps/red-ui/src/app/services/dossiers/dossier-stats.service.ts similarity index 94% rename from apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts rename to apps/red-ui/src/app/services/dossiers/dossier-stats.service.ts index 52085cd92..aa244511b 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts +++ b/apps/red-ui/src/app/services/dossiers/dossier-stats.service.ts @@ -3,7 +3,7 @@ import { StatsService } from '@iqser/common-ui'; import { DossierStats, IDossierStats } from '@red/domain'; import { DOSSIER_ID } from '@utils/constants'; import { Observable, of } from 'rxjs'; -import { UserService } from '@services/user.service'; +import { UserService } from '../user.service'; @Injectable({ providedIn: 'root', diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/dossiers/dossiers.service.ts similarity index 82% rename from apps/red-ui/src/app/services/entity-services/dossiers.service.ts rename to apps/red-ui/src/app/services/dossiers/dossiers.service.ts index 16b9cb57e..ad2c166b4 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/dossiers/dossiers.service.ts @@ -1,26 +1,14 @@ import { EntitiesService, List, mapEach, QueryParam, RequiredParam, shareLast, Toaster, Validate } from '@iqser/common-ui'; -import { Dossier, DossierStats, IDossier, IDossierRequest } from '@red/domain'; -import { combineLatest, forkJoin, Observable, of, Subject, throwError } from 'rxjs'; +import { Dossier, DossierStats, IChangesDetails, IDossier, IDossierChanges, IDossierRequest } from '@red/domain'; +import { combineLatest, EMPTY, forkJoin, Observable, of, Subject, throwError } from 'rxjs'; import { catchError, filter, map, mapTo, pluck, switchMap, tap } from 'rxjs/operators'; import { Injector } from '@angular/core'; -import { DossierStateService } from './dossier-state.service'; +import { DossierStateService } from '../entity-services/dossier-state.service'; import { DossierStatsService } from './dossier-stats.service'; -import { IDossiersStats } from '@services/entity-services/active-dossiers.service'; +import { IDossiersStats } from './active-dossiers.service'; import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -interface DossierChange { - readonly dossierChanges: boolean; - readonly dossierId: string; - readonly fileChanges: boolean; -} - -type DossierChanges = readonly DossierChange[]; - -interface ChangesDetails { - readonly dossierChanges: DossierChanges; -} - const DOSSIER_EXISTS_MSG = _('add-dossier-dialog.errors.dossier-already-exists'); const GENERIC_MSG = _('add-dossier-dialog.errors.generic'); @@ -36,10 +24,10 @@ export abstract class DossiersService extends EntitiesService } @Validate() - createOrUpdate(@RequiredParam() dossier: IDossierRequest): Observable { + createOrUpdate(@RequiredParam() dossier: IDossierRequest): Observable { const showToast = (error: HttpErrorResponse) => { this._toaster.error(error.status === HttpStatusCode.Conflict ? DOSSIER_EXISTS_MSG : GENERIC_MSG); - return of(undefined); + return EMPTY; }; return this._post(dossier, 'dossier').pipe( @@ -48,7 +36,7 @@ export abstract class DossiersService extends EntitiesService ); } - loadOnlyChanged(): Observable { + loadOnlyChanged(): Observable { const removeIfNotFound = (id: string) => catchError((error: HttpErrorResponse) => { if (error.status === HttpStatusCode.NotFound) { @@ -58,23 +46,15 @@ export abstract class DossiersService extends EntitiesService return throwError(() => error); }); - const load = (changes: DossierChanges) => + const load = (changes: IDossierChanges) => changes.map(change => this._load(change.dossierId).pipe(removeIfNotFound(change.dossierId))); return this.hasChangesDetails$().pipe( - pluck('dossierChanges'), switchMap(dossierChanges => forkJoin(load(dossierChanges)).pipe(mapTo(dossierChanges))), tap(() => this._updateLastChanged()), ); } - hasChangesDetails$(): Observable { - const body = { value: this._lastCheckedForChanges.get('root') ?? '0' }; - return this._post(body, `${this._defaultModelPath}/changes/details`).pipe( - filter(changes => changes.dossierChanges.length > 0), - ); - } - loadAll(): Observable { const dossierIds = (dossiers: Dossier[]) => dossiers.map(d => d.id); return this.getAll().pipe( @@ -86,7 +66,15 @@ export abstract class DossiersService extends EntitiesService ); } - protected _emitFileChanges(dossierChanges: DossierChanges): void { + hasChangesDetails$(): Observable { + const body = { value: this._lastCheckedForChanges.get('root') ?? '0' }; + return this._post(body, `${this._defaultModelPath}/changes/details`).pipe( + filter(changes => changes.dossierChanges.length > 0), + pluck('dossierChanges'), + ); + } + + protected _emitFileChanges(dossierChanges: IDossierChanges): void { dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId)); } diff --git a/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts index e3c3fb7bd..373eca825 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts @@ -27,7 +27,7 @@ export class DossierStateService extends EntitiesService template.dossierTemplateId), mapEach(id => this.loadAllForTemplate(id)), - switchMap(all => forkJoin(all).pipe(defaultIfEmpty([]))), + switchMap(all => forkJoin(all).pipe(defaultIfEmpty([] as DossierState[][]))), map(value => value.flatMap(item => item)), tap(value => this.setEntities(value)), ); diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts index 20f342608..0b176f0d7 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts @@ -1,6 +1,6 @@ import { ActivatedRoute } from '@angular/router'; import { Injector, ProviderToken } from '@angular/core'; -import { DossiersService } from './dossiers.service'; +import { DossiersService } from '../dossiers/dossiers.service'; export const dossiersServiceResolver = (injector: Injector) => { const route = injector.get(ActivatedRoute); diff --git a/apps/red-ui/src/app/services/entity-services/file-management.service.ts b/apps/red-ui/src/app/services/entity-services/file-management.service.ts index 300ec08b1..a58b8ad5a 100644 --- a/apps/red-ui/src/app/services/entity-services/file-management.service.ts +++ b/apps/red-ui/src/app/services/entity-services/file-management.service.ts @@ -4,7 +4,7 @@ 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/entity-services/dossier-stats.service'; +import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; @Injectable({ providedIn: 'root', diff --git a/apps/red-ui/src/app/services/entity-services/files.service.ts b/apps/red-ui/src/app/services/entity-services/files.service.ts index f67a969e7..6d76d9d1f 100644 --- a/apps/red-ui/src/app/services/entity-services/files.service.ts +++ b/apps/red-ui/src/app/services/entity-services/files.service.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs'; import { UserService } from '../user.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { map, mapTo, switchMap, tap } from 'rxjs/operators'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; @Injectable({ providedIn: 'root', 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 e8c545c23..abda973f3 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,11 +3,11 @@ import { GenericService } from '@iqser/common-ui'; import { Dossier, IMatchedDocument, ISearchInput, ISearchRequest, ISearchResponse } from '@red/domain'; import { Observable, of, zip } from 'rxjs'; import { mapTo, switchMap } from 'rxjs/operators'; -import { ActiveDossiersService } from './active-dossiers.service'; +import { ActiveDossiersService } from '../dossiers/active-dossiers.service'; import { FilesMapService } from './files-map.service'; import { FilesService } from './files.service'; -import { DossiersService } from './dossiers.service'; -import { ArchivedDossiersService } from './archived-dossiers.service'; +import { ArchivedDossiersService } from '../dossiers/archived-dossiers.service'; +import { DossiersService } from '../dossiers/dossiers.service'; @Injectable({ providedIn: 'root' }) export class PlatformSearchService extends GenericService { diff --git a/apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts index a1ebc5a88..158ff48d5 100644 --- a/apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts @@ -7,7 +7,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import * as moment from 'moment'; import { ConfigService } from '../config.service'; import { PermissionsService } from '../permissions.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; export interface IDossiersStats { totalPeople: number; diff --git a/apps/red-ui/src/app/services/notifications.service.ts b/apps/red-ui/src/app/services/notifications.service.ts index a37192934..f47cce9c5 100644 --- a/apps/red-ui/src/app/services/notifications.service.ts +++ b/apps/red-ui/src/app/services/notifications.service.ts @@ -7,7 +7,7 @@ import { INotification, Notification, NotificationTypes } from '@red/domain'; import { map, switchMap } from 'rxjs/operators'; import { notificationsTranslations } from '../translations/notifications-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { ActiveDossiersService } from './entity-services/active-dossiers.service'; +import { ActiveDossiersService } from './dossiers/active-dossiers.service'; import { UserService } from '@services/user.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index ae6a1005c..6d99dab1b 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, Injector } from '@angular/core'; import { UserService } from './user.service'; import { Dossier, File, IComment, IDossier } from '@red/domain'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; import { ActivatedRoute } from '@angular/router'; import { dossiersServiceResolver } from '@services/entity-services/dossiers.service.provider'; import { FilesMapService } from '@services/entity-services/files-map.service'; diff --git a/libs/red-domain/src/lib/dossiers/dossier-changes.ts b/libs/red-domain/src/lib/dossiers/dossier-changes.ts new file mode 100644 index 000000000..a63406f4c --- /dev/null +++ b/libs/red-domain/src/lib/dossiers/dossier-changes.ts @@ -0,0 +1,11 @@ +export interface IDossierChange { + readonly dossierChanges: boolean; + readonly dossierId: string; + readonly fileChanges: boolean; +} + +export type IDossierChanges = readonly IDossierChange[]; + +export interface IChangesDetails { + readonly dossierChanges: IDossierChanges; +} diff --git a/libs/red-domain/src/lib/dossiers/index.ts b/libs/red-domain/src/lib/dossiers/index.ts index 5f42d97f7..994f4274c 100644 --- a/libs/red-domain/src/lib/dossiers/index.ts +++ b/libs/red-domain/src/lib/dossiers/index.ts @@ -2,3 +2,4 @@ export * from './dossier'; export * from './dossier.request'; export * from './dossier.model'; export * from './types'; +export * from './dossier-changes';