From 33f4d29c9e5a72d729e894195a70e802a80d40e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 15 Mar 2022 16:17:30 +0200 Subject: [PATCH] Reorganize modules --- .../src/app/modules/account/account.module.ts | 2 +- .../user-profile-screen.component.ts | 2 +- ...-edit-dossier-template-dialog.component.ts | 2 +- .../admin/screens/reports/reports.module.ts | 2 +- .../admin/screens/rules/rules.module.ts | 2 +- .../admin/services/admin-dialog.service.ts | 2 +- .../dossier-template-actions.component.ts | 2 +- .../modules/archive/archive-routing.module.ts | 4 +- .../src/app/modules/archive/archive.module.ts | 4 +- .../archived-dossiers-screen.component.ts | 2 +- ...ssier-overview-bulk-actions.component.html | 0 ...ssier-overview-bulk-actions.component.scss | 0 ...dossier-overview-bulk-actions.component.ts | 0 .../dossier-details-stats.component.html | 0 .../dossier-details-stats.component.scss | 0 .../dossier-details-stats.component.ts | 2 +- .../dossier-details.component.html | 0 .../dossier-details.component.scss | 0 .../dossier-details.component.ts | 4 +- .../file-stats/file-stats.component.html | 0 .../file-stats/file-stats.component.scss | 0 .../file-stats/file-stats.component.ts | 0 ...sier-overview-screen-header.component.html | 0 ...sier-overview-screen-header.component.scss | 0 ...ossier-overview-screen-header.component.ts | 2 +- .../file-name-column.component.html | 0 .../file-name-column.component.scss | 0 .../file-name-column.component.ts | 2 +- .../file-workload.component.html | 0 .../file-workload.component.scss | 0 .../file-workload/file-workload.component.ts | 0 .../table-item/table-item.component.html | 0 .../table-item/table-item.component.scss | 0 .../table-item/table-item.component.ts | 0 .../view-mode-selection.component.html | 0 .../view-mode-selection.component.scss | 0 .../view-mode-selection.component.ts | 0 .../workflow-item.component.html | 0 .../workflow-item.component.scss | 0 .../workflow-item/workflow-item.component.ts | 0 .../dossier-overview/config.service.ts | 9 ++- .../dossier-overview.module.ts | 2 +- .../dossier-overview-screen.component.html | 0 .../dossier-overview-screen.component.scss | 0 .../dossier-overview-screen.component.ts | 0 .../services/bulk-actions.service.ts | 6 +- .../dossier/dossiers-routing.module.ts | 6 +- .../app/modules/dossier/dossiers.module.ts | 29 +-------- .../services/dossiers-dialog.service.ts | 48 +------------- .../services/pdf-viewer-data.service.ts | 2 +- .../file-actions/file-actions.component.ts | 6 +- .../dossier/shared/shared-dossiers.module.ts | 2 - .../dossier-documents-status.component.html | 0 .../dossier-documents-status.component.scss | 0 .../dossier-documents-status.component.ts | 0 .../dossier-workload-column.component.html | 0 .../dossier-workload-column.component.scss | 0 .../dossier-workload-column.component.ts | 0 .../dossiers-listing-actions.component.html | 0 .../dossiers-listing-actions.component.scss | 0 .../dossiers-listing-actions.component.ts | 2 +- .../dossiers-listing-details.component.html | 0 .../dossiers-listing-details.component.scss | 0 .../dossiers-listing-details.component.ts | 2 +- .../table-item/table-item.component.html | 0 .../table-item/table-item.component.scss | 0 .../table-item/table-item.component.ts | 0 .../dossiers-listing/config.service.ts | 4 +- .../dossiers-listing.module.ts | 2 +- .../dossiers-listing-screen.component.html | 0 .../dossiers-listing-screen.component.scss | 0 .../dossiers-listing-screen.component.ts | 2 +- .../annotation-actions.component.html | 0 .../annotation-actions.component.scss | 0 .../annotation-actions.component.ts | 0 .../annotation-card.component.html | 0 .../annotation-card.component.scss | 0 .../annotation-card.component.ts | 2 +- .../annotation-details.component.html | 0 .../annotation-details.component.scss | 2 +- .../annotation-details.component.ts | 2 +- .../annotation-references-list.component.html | 0 .../annotation-references-list.component.scss | 0 .../annotation-references-list.component.ts | 0 ...n-references-page-indicator.component.html | 0 ...n-references-page-indicator.component.scss | 0 ...ion-references-page-indicator.component.ts | 0 .../annotations-list.component.html | 0 .../annotations-list.component.scss | 2 +- .../annotations-list.component.ts | 4 +- .../comments/comments.component.html | 0 .../comments/comments.component.scss | 0 .../components/comments/comments.component.ts | 0 .../document-info.component.html | 0 .../document-info.component.scss | 0 .../document-info/document-info.component.ts | 4 +- .../file-workload.component.html | 0 .../file-workload.component.scss | 0 .../file-workload/file-workload.component.ts | 2 +- .../highlights-separator.component.html | 0 .../highlights-separator.component.scss | 0 .../highlights-separator.component.ts | 4 +- .../page-exclusion.component.html | 0 .../page-exclusion.component.scss | 0 .../page-exclusion.component.ts | 0 .../page-indicator.component.html | 0 .../page-indicator.component.scss | 0 .../page-indicator.component.ts | 0 .../pdf-viewer/pdf-viewer.component.html | 0 .../pdf-viewer/pdf-viewer.component.scss | 0 .../pdf-viewer/pdf-viewer.component.ts | 12 ++-- .../type-annotation-icon.component.html | 0 .../type-annotation-icon.component.scss | 0 .../type-annotation-icon.component.ts | 0 .../user-management.component.html | 0 .../user-management.component.scss | 0 .../user-management.component.ts | 4 +- .../view-switch/view-switch.component.html | 0 .../view-switch/view-switch.component.scss | 0 .../view-switch/view-switch.component.ts | 0 ...ccept-recommendation-dialog.component.html | 0 .../accept-recommendation-dialog.component.ts | 0 .../change-legal-basis-dialog.component.html | 0 .../change-legal-basis-dialog.component.ts | 0 .../document-info-dialog.component.html | 0 .../document-info-dialog.component.scss | 0 .../document-info-dialog.component.ts | 0 .../force-annotation-dialog.component.html | 0 .../force-annotation-dialog.component.scss | 0 .../force-annotation-dialog.component.ts | 0 .../highlight-action-dialog.component.html | 0 .../highlight-action-dialog.component.ts | 2 +- .../manual-annotation-dialog.component.html | 0 .../manual-annotation-dialog.component.scss | 0 .../manual-annotation-dialog.component.ts | 0 .../recategorize-image-dialog.component.html | 0 .../recategorize-image-dialog.component.ts | 2 +- .../remove-annotations-dialog.component.html | 0 .../remove-annotations-dialog.component.scss | 0 .../remove-annotations-dialog.component.ts | 11 ++-- .../resize-annotation-dialog.component.html | 0 .../resize-annotation-dialog.component.ts | 3 +- .../file-preview-providers.ts | 4 +- .../file-preview-screen.component.html | 0 .../file-preview-screen.component.scss | 0 .../file-preview-screen.component.ts | 18 +++--- .../file-preview.module.ts | 31 ++++++++-- .../services/annotation-actions.service.ts | 16 ++--- .../services/annotation-draw.service.ts | 4 +- .../services/annotation-references.service.ts | 0 .../services/commenting.service.ts | 0 .../services/document-info.service.ts | 0 .../services/excluded-pages.service.ts | 0 .../services/file-preview-dialog.service.ts | 62 +++++++++++++++++++ .../services/file-preview-state.service.ts | 0 .../services/multi-select.service.ts | 0 .../services/page-rotation.service.ts | 0 .../services/pdf-viewer.service.ts | 8 +-- .../services/skipped.service.ts | 0 .../services/view-mode.service.ts | 0 .../shared/constants.ts | 0 .../src/app/modules/search/search.module.ts | 2 +- .../file-upload-download.module.ts | 2 +- .../services/file-upload.service.ts | 2 +- .../annotation-changes-translations.ts | 2 +- apps/red-ui/src/app/utils/pdf-coordinates.ts | 55 ++++++++-------- .../app/utils/sorters/super-type-sorter.ts | 2 +- 167 files changed, 214 insertions(+), 206 deletions(-) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts (96%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/dossier-details/dossier-details.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/dossier-details/dossier-details.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/dossier-details/dossier-details.component.ts (96%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/file-stats/file-stats.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/file-stats/file-stats.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/file-stats/file-stats.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/screen-header/dossier-overview-screen-header.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts (97%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/table-item/file-name-column/file-name-column.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/table-item/file-name-column/file-name-column.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts (87%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/table-item/file-workload/file-workload.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/table-item/file-workload/file-workload.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/table-item/file-workload/file-workload.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/table-item/table-item.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/table-item/table-item.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/table-item/table-item.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/view-mode-selection/view-mode-selection.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/view-mode-selection/view-mode-selection.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/view-mode-selection/view-mode-selection.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/workflow-item/workflow-item.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/workflow-item/workflow-item.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/components/workflow-item/workflow-item.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/config.service.ts (98%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/dossier-overview.module.ts (96%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/screen/dossier-overview-screen.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/screen/dossier-overview-screen.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/screen/dossier-overview-screen.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossier-overview/services/bulk-actions.service.ts (96%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts (96%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts (97%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/table-item/table-item.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/table-item/table-item.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/components/table-item/table-item.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/config.service.ts (98%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/dossiers-listing.module.ts (95%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/screen/dossiers-listing-screen.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/screen/dossiers-listing-screen.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => }/dossiers-listing/screen/dossiers-listing-screen.component.ts (97%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-actions/annotation-actions.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-actions/annotation-actions.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-actions/annotation-actions.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-card/annotation-card.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-card/annotation-card.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-card/annotation-card.component.ts (86%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-details/annotation-details.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-details/annotation-details.component.scss (94%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-details/annotation-details.component.ts (96%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-references-list/annotation-references-list.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-references-list/annotation-references-list.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-references-list/annotation-references-list.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-references-page-indicator/annotation-references-page-indicator.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-references-page-indicator/annotation-references-page-indicator.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotation-references-page-indicator/annotation-references-page-indicator.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotations-list/annotations-list.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotations-list/annotations-list.component.scss (96%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/annotations-list/annotations-list.component.ts (96%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/comments/comments.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/comments/comments.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/comments/comments.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/document-info/document-info.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/document-info/document-info.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/document-info/document-info.component.ts (92%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/file-workload/file-workload.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/file-workload/file-workload.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/file-workload/file-workload.component.ts (99%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/highlights-separator/highlights-separator.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/highlights-separator/highlights-separator.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/highlights-separator/highlights-separator.component.ts (88%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/page-exclusion/page-exclusion.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/page-exclusion/page-exclusion.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/page-exclusion/page-exclusion.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/page-indicator/page-indicator.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/page-indicator/page-indicator.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/page-indicator/page-indicator.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/pdf-viewer/pdf-viewer.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/pdf-viewer/pdf-viewer.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/pdf-viewer/pdf-viewer.component.ts (98%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/type-annotation-icon/type-annotation-icon.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/type-annotation-icon/type-annotation-icon.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/type-annotation-icon/type-annotation-icon.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/user-management/user-management.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/user-management/user-management.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/user-management/user-management.component.ts (96%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/view-switch/view-switch.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/view-switch/view-switch.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/components/view-switch/view-switch.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/document-info-dialog/document-info-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/document-info-dialog/document-info-dialog.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/document-info-dialog/document-info-dialog.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/force-redaction-dialog/force-annotation-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/force-redaction-dialog/force-annotation-dialog.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/dialogs/highlight-action-dialog/highlight-action-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts (97%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts (93%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts (93%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html (100%) rename apps/red-ui/src/app/modules/{dossier => file-preview}/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts (89%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/file-preview-providers.ts (88%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/file-preview-screen.component.html (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/file-preview-screen.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/file-preview-screen.component.ts (97%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/file-preview.module.ts (65%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/annotation-actions.service.ts (98%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/annotation-draw.service.ts (98%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/annotation-references.service.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/commenting.service.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/document-info.service.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/excluded-pages.service.ts (100%) create mode 100644 apps/red-ui/src/app/modules/file-preview/services/file-preview-dialog.service.ts rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/file-preview-state.service.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/multi-select.service.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/page-rotation.service.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/pdf-viewer.service.ts (95%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/skipped.service.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/services/view-mode.service.ts (100%) rename apps/red-ui/src/app/modules/{dossier/screens/file-preview-screen => file-preview}/shared/constants.ts (100%) diff --git a/apps/red-ui/src/app/modules/account/account.module.ts b/apps/red-ui/src/app/modules/account/account.module.ts index 28b2ee431..16bc11aad 100644 --- a/apps/red-ui/src/app/modules/account/account.module.ts +++ b/apps/red-ui/src/app/modules/account/account.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { SharedModule } from '../shared/shared.module'; +import { SharedModule } from '@shared/shared.module'; import { AccountRoutingModule } from './account-routing.module'; import { AccountSideNavComponent } from './account-side-nav/account-side-nav.component'; import { BaseAccountScreenComponent } from './base-account-screen/base-account-screen-component'; diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts index 421d54e39..8960ad039 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts @@ -7,7 +7,7 @@ import { IProfile } from '@red/domain'; import { languagesTranslations } from '../../../translations/languages-translations'; import { PermissionsService } from '@services/permissions.service'; import { UserService } from '@services/user.service'; -import { ConfigService } from '../../../../../services/config.service'; +import { ConfigService } from '@services/config.service'; import { LanguageService } from '../../../../../i18n/language.service'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts index 6297f906f..9a09588d6 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts @@ -10,7 +10,7 @@ import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplate, DownloadFileType, IDossierTemplate } from '@red/domain'; import { HttpStatusCode } from '@angular/common/http'; -import { DictionaryService } from '../../../shared/services/dictionary.service'; +import { DictionaryService } from '@shared/services/dictionary.service'; import { firstValueFrom } from 'rxjs'; @Component({ diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts index a7632e4ee..fa3f65276 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '../../../shared/shared.module'; +import { SharedModule } from '@shared/shared.module'; import { ReportsScreenComponent } from './reports-screen/reports-screen.component'; const routes = [{ path: '', component: ReportsScreenComponent }]; diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts b/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts index 9e7d816ba..d83e1a860 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '../../../shared/shared.module'; +import { SharedModule } from '@shared/shared.module'; import { RulesScreenComponent } from './rules-screen/rules-screen.component'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { PendingChangesGuard } from '../../../../guards/can-deactivate.guard'; 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 2c84c7f4f..9f4f61481 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 @@ -25,7 +25,7 @@ import { ConfirmDeleteDossierStateDialogComponent } from '../dialogs/confirm-del import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { firstValueFrom, forkJoin } from 'rxjs'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; -import { UserService } from '../../../services/user.service'; +import { UserService } from '@services/user.service'; import { IDossierAttributeConfig, IFileAttributeConfig, IReportTemplate } from '@red/domain'; import { ReportTemplateService } from '../../../services/report-template.service'; diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts index 6a5f06a10..74d178ba6 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts @@ -5,7 +5,7 @@ import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { UserService } from '@services/user.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { firstValueFrom } from 'rxjs'; -import { DictionaryService } from '../../../../shared/services/dictionary.service'; +import { DictionaryService } from '@shared/services/dictionary.service'; import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; @Component({ diff --git a/apps/red-ui/src/app/modules/archive/archive-routing.module.ts b/apps/red-ui/src/app/modules/archive/archive-routing.module.ts index 6c31c1026..ae8f5b006 100644 --- a/apps/red-ui/src/app/modules/archive/archive-routing.module.ts +++ b/apps/red-ui/src/app/modules/archive/archive-routing.module.ts @@ -23,7 +23,7 @@ const routes: Routes = [ breadcrumbs: [BreadcrumbTypes.archive, BreadcrumbTypes.dossier], dossiersService: ARCHIVED_DOSSIERS_SERVICE, }, - loadChildren: () => import('../dossier/screens/dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule), + loadChildren: () => import('../dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule), }, { path: `:${DOSSIER_ID}/file/:${FILE_ID}`, @@ -33,7 +33,7 @@ const routes: Routes = [ breadcrumbs: [BreadcrumbTypes.archive, BreadcrumbTypes.dossier, BreadcrumbTypes.file], dossiersService: ARCHIVED_DOSSIERS_SERVICE, }, - loadChildren: () => import('../dossier/screens/file-preview-screen/file-preview.module').then(m => m.FilePreviewModule), + loadChildren: () => import('../file-preview/file-preview.module').then(m => m.FilePreviewModule), }, ]; diff --git a/apps/red-ui/src/app/modules/archive/archive.module.ts b/apps/red-ui/src/app/modules/archive/archive.module.ts index a49f1e1b3..d02cfba49 100644 --- a/apps/red-ui/src/app/modules/archive/archive.module.ts +++ b/apps/red-ui/src/app/modules/archive/archive.module.ts @@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common'; import { ArchivedDossiersScreenComponent } from './screens/archived-dossiers-screen/archived-dossiers-screen.component'; import { ArchiveRoutingModule } from './archive-routing.module'; import { TableItemComponent } from './components/table-item/table-item.component'; -import { ConfigService } from './services/config.service'; -import { SharedModule } from '../shared/shared.module'; +import { ConfigService } from '@services/config.service'; +import { SharedModule } from '@shared/shared.module'; const components = [TableItemComponent]; const screens = [ArchivedDossiersScreenComponent]; 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 b651db513..2def15694 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 @@ -1,9 +1,9 @@ import { ChangeDetectionStrategy, Component, forwardRef, Injector } from '@angular/core'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { ConfigService } from '../../services/config.service'; import { DefaultListingServicesTmp, EntitiesService, ListingComponent } from '@iqser/common-ui'; import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service'; import { Dossier } from '@red/domain'; +import { ConfigService } from '../../services/config.service'; @Component({ selector: 'redaction-archived-dossiers-screen', diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.html rename to apps/red-ui/src/app/modules/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.scss rename to apps/red-ui/src/app/modules/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts rename to apps/red-ui/src/app/modules/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html rename to apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss rename to apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss 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-overview/components/dossier-details-stats/dossier-details-stats.component.ts similarity index 96% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts rename to apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts index dfcd93228..51624e53a 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-overview/components/dossier-details-stats/dossier-details-stats.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { Dossier, DossierAttributeWithValue, DossierStats } from '@red/domain'; -import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; +import { DossiersDialogService } from '../../../dossier/services/dossiers-dialog.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { FilesService } from '@services/entity-services/files.service'; import { firstValueFrom, Observable } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html rename to apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.scss rename to apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.scss 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-overview/components/dossier-details/dossier-details.component.ts similarity index 96% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts rename to apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts index f1d09e6a6..b7cd35d50 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-overview/components/dossier-details/dossier-details.component.ts @@ -3,14 +3,14 @@ import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/si import { TranslateChartService } from '@services/translate-chart.service'; import { UserService } from '@services/user.service'; import { FilterService, ProgressBarConfigModel, shareLast, Toaster } from '@iqser/common-ui'; -import { workflowFileStatusTranslations } from '../../../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Dossier, DossierAttributeWithValue, DossierStats, IDossierRequest, StatusSorter, User } from '@red/domain'; import { ActivatedRoute } from '@angular/router'; import { firstValueFrom, Observable } from 'rxjs'; import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; import { map, pluck, switchMap } from 'rxjs/operators'; -import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; +import { DossiersDialogService } from '../../../dossier/services/dossiers-dialog.service'; import { FilesService } from '@services/entity-services/files.service'; import { DOSSIER_ID } from '@utils/constants'; import { DossiersService } from '@services/dossiers/dossiers.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/file-stats/file-stats.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/file-stats/file-stats.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/file-stats/file-stats.component.html rename to apps/red-ui/src/app/modules/dossier-overview/components/file-stats/file-stats.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/file-stats/file-stats.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/file-stats/file-stats.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/file-stats/file-stats.component.scss rename to apps/red-ui/src/app/modules/dossier-overview/components/file-stats/file-stats.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/file-stats/file-stats.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/file-stats/file-stats.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/file-stats/file-stats.component.ts rename to apps/red-ui/src/app/modules/dossier-overview/components/file-stats/file-stats.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html rename to apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.scss rename to apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.scss 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-overview/components/screen-header/dossier-overview-screen-header.component.ts similarity index 97% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts rename to apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts index 89d4641f0..903113470 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-overview/components/screen-header/dossier-overview-screen-header.component.ts @@ -19,7 +19,7 @@ import { saveAsCSV } from '@utils/csv-utils'; import { UserService } from '@services/user.service'; import { ConfigService } from '../../config.service'; import { firstValueFrom } from 'rxjs'; -import { PrimaryFileAttributeService } from '../../../../../../services/primary-file-attribute.service'; +import { PrimaryFileAttributeService } from '@services/primary-file-attribute.service'; import { Router } from '@angular/router'; import { DossiersService } from '@services/dossiers/dossiers.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-name-column/file-name-column.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.html rename to apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-name-column/file-name-column.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-name-column/file-name-column.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.scss rename to apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-name-column/file-name-column.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts similarity index 87% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts rename to apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts index 4b205542e..742dfbe9f 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { File } from '@red/domain'; -import { PrimaryFileAttributeService } from '../../../../../../../services/primary-file-attribute.service'; +import { PrimaryFileAttributeService } from '@services/primary-file-attribute.service'; @Component({ selector: 'redaction-file-name-column', diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-workload/file-workload.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.html rename to apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-workload/file-workload.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-workload/file-workload.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.scss rename to apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-workload/file-workload.component.scss 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-overview/components/table-item/file-workload/file-workload.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts rename to apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-workload/file-workload.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html rename to apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.scss rename to apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.ts rename to apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/view-mode-selection/view-mode-selection.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/view-mode-selection/view-mode-selection.component.html rename to apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/view-mode-selection/view-mode-selection.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/view-mode-selection/view-mode-selection.component.scss rename to apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/view-mode-selection/view-mode-selection.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/view-mode-selection/view-mode-selection.component.ts rename to apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.html rename to apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.scss rename to apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.ts rename to apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts similarity index 98% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts rename to apps/red-ui/src/app/modules/dossier-overview/config.service.ts index c35312cb1..d7473bc4e 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts @@ -12,18 +12,17 @@ import { WorkflowConfig, } from '@iqser/common-ui'; import { File, IFileAttributeConfig, StatusSorter, WorkflowFileStatus, WorkflowFileStatuses } from '@red/domain'; -import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../translations/file-status-translations'; import { PermissionsService } from '@services/permissions.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; import { UserService } from '@services/user.service'; -import { DossiersDialogService } from '../../services/dossiers-dialog.service'; -import { annotationFilterChecker, RedactionFilterSorter } from '@utils/index'; -import { workloadTranslations } from '../../translations/workload-translations'; +import { DossiersDialogService } from '../dossier/services/dossiers-dialog.service'; +import { annotationFilterChecker, RedactionFilterSorter } from '../../utils'; +import { workloadTranslations } from '../dossier/translations/workload-translations'; import * as moment from 'moment'; import { ConfigService as AppConfigService } from '@services/config.service'; import { BehaviorSubject, Observable } from 'rxjs'; -import noop from 'lodash/noop'; import { BulkActionsService } from './services/bulk-actions.service'; @Injectable() diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts similarity index 96% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts rename to apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts index 851a6488e..747d9bba6 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/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 '../../shared/shared-dossiers.module'; +import { SharedDossiersModule } from '../dossier/shared/shared-dossiers.module'; import { FileWorkloadComponent } from './components/table-item/file-workload/file-workload.component'; import { FileStatsComponent } from './components/file-stats/file-stats.component'; import { WorkflowItemComponent } from './components/workflow-item/workflow-item.component'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html rename to apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.scss b/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.scss rename to apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.scss 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-overview/screen/dossier-overview-screen.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts rename to apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.ts 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-overview/services/bulk-actions.service.ts similarity index 96% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts rename to apps/red-ui/src/app/modules/dossier-overview/services/bulk-actions.service.ts index 9d1de5727..018dfd6b4 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-overview/services/bulk-actions.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; import { Dossier, File } from '@red/domain'; -import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; +import { DossiersDialogService } from '../../dossier/services/dossiers-dialog.service'; import { ConfirmationDialogInput, LoadingService } from '@iqser/common-ui'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { FilesService } from '@services/entity-services/files.service'; -import { FileAssignService } from '../../../shared/services/file-assign.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { ReanalysisService } from '../../../../../services/reanalysis.service'; +import { ReanalysisService } from '@services/reanalysis.service'; import { FileManagementService } from '@services/entity-services/file-management.service'; import { firstValueFrom } from 'rxjs'; +import { FileAssignService } from '../../dossier/shared/services/file-assign.service'; @Injectable() export class BulkActionsService { 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 index 5615e188d..d83e69f31 100644 --- a/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts +++ b/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts @@ -16,7 +16,7 @@ const routes: Routes = [ breadcrumbs: [BreadcrumbTypes.main, BreadcrumbTypes.dossier], dossiersService: ACTIVE_DOSSIERS_SERVICE, }, - loadChildren: () => import('./screens/dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule), + loadChildren: () => import('../dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule), }, { path: `:${DOSSIER_ID}/file/:${FILE_ID}`, @@ -26,12 +26,12 @@ const routes: Routes = [ breadcrumbs: [BreadcrumbTypes.main, BreadcrumbTypes.dossier, BreadcrumbTypes.file], dossiersService: ACTIVE_DOSSIERS_SERVICE, }, - loadChildren: () => import('./screens/file-preview-screen/file-preview.module').then(m => m.FilePreviewModule), + loadChildren: () => import('../file-preview/file-preview.module').then(m => m.FilePreviewModule), }, { path: '', pathMatch: 'full', - loadChildren: () => import('./screens/dossiers-listing/dossiers-listing.module').then(m => m.DossiersListingModule), + loadChildren: () => import('../dossiers-listing/dossiers-listing.module').then(m => m.DossiersListingModule), data: { breadcrumbs: [BreadcrumbTypes.main] }, }, ]; diff --git a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts index 94222f209..341703f9d 100644 --- a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts +++ b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts @@ -1,39 +1,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ManualAnnotationDialogComponent } from './dialogs/manual-redaction-dialog/manual-annotation-dialog.component'; -import { ForceAnnotationDialogComponent } from './dialogs/force-redaction-dialog/force-annotation-dialog.component'; -import { RemoveAnnotationsDialogComponent } from './dialogs/remove-annotations-dialog/remove-annotations-dialog.component'; import { SharedModule } from '@shared/shared.module'; import { DossiersRoutingModule } from './dossiers-routing.module'; import { FileUploadDownloadModule } from '@upload-download/file-upload-download.module'; -import { ChangeLegalBasisDialogComponent } from './dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component'; -import { RecategorizeImageDialogComponent } from './dialogs/recategorize-image-dialog/recategorize-image-dialog.component'; import { OverlayModule } from '@angular/cdk/overlay'; import { SharedDossiersModule } from './shared/shared-dossiers.module'; -import { ResizeAnnotationDialogComponent } from './dialogs/resize-annotation-dialog/resize-annotation-dialog.component'; -import { HighlightActionDialogComponent } from './screens/file-preview-screen/dialogs/highlight-action-dialog/highlight-action-dialog.component'; -import { ColorPickerModule } from 'ngx-color-picker'; - -const dialogs = [ - ManualAnnotationDialogComponent, - ForceAnnotationDialogComponent, - RemoveAnnotationsDialogComponent, - ResizeAnnotationDialogComponent, - ChangeLegalBasisDialogComponent, - RecategorizeImageDialogComponent, - HighlightActionDialogComponent, -]; @NgModule({ - declarations: [...dialogs], - imports: [ - CommonModule, - SharedModule, - SharedDossiersModule, - FileUploadDownloadModule, - DossiersRoutingModule, - OverlayModule, - ColorPickerModule, - ], + imports: [CommonModule, SharedModule, SharedDossiersModule, FileUploadDownloadModule, DossiersRoutingModule, OverlayModule], }) export class DossiersModule {} diff --git a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts index 9e5d17f5f..e9f1f4d66 100644 --- a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts @@ -1,31 +1,11 @@ import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { AddDossierDialogComponent } from '../dialogs/add-dossier-dialog/add-dossier-dialog.component'; -import { RemoveAnnotationsDialogComponent } from '../dialogs/remove-annotations-dialog/remove-annotations-dialog.component'; -import { ForceAnnotationDialogComponent } from '../dialogs/force-redaction-dialog/force-annotation-dialog.component'; -import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component'; -import { ManualAnnotationDialogComponent } from '../dialogs/manual-redaction-dialog/manual-annotation-dialog.component'; import { EditDossierDialogComponent } from '../dialogs/edit-dossier-dialog/edit-dossier-dialog.component'; import { AssignReviewerApproverDialogComponent } from '../dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component'; -import { ChangeLegalBasisDialogComponent } from '../dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component'; -import { RecategorizeImageDialogComponent } from '../dialogs/recategorize-image-dialog/recategorize-image-dialog.component'; import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogConfig } from '@iqser/common-ui'; -import { ResizeAnnotationDialogComponent } from '../dialogs/resize-annotation-dialog/resize-annotation-dialog.component'; -import { HighlightActionDialogComponent } from '../screens/file-preview-screen/dialogs/highlight-action-dialog/highlight-action-dialog.component'; -type DialogType = - | 'confirm' - | 'documentInfo' - | 'editDossier' - | 'addDossier' - | 'assignFile' - | 'recategorizeImage' - | 'changeLegalBasis' - | 'removeAnnotations' - | 'resizeAnnotation' - | 'forceAnnotation' - | 'manualAnnotation' - | 'highlightAction'; +type DialogType = 'confirm' | 'editDossier' | 'addDossier' | 'assignFile'; @Injectable() export class DossiersDialogService extends DialogService { @@ -34,10 +14,6 @@ export class DossiersDialogService extends DialogService { component: ConfirmationDialogComponent, dialogConfig: { disableClose: false }, }, - documentInfo: { - component: DocumentInfoDialogComponent, - dialogConfig: { autoFocus: true }, - }, editDossier: { component: EditDossierDialogComponent, dialogConfig: { ...largeDialogConfig }, @@ -50,28 +26,6 @@ export class DossiersDialogService extends DialogService { component: AssignReviewerApproverDialogComponent, dialogConfig: { disableClose: false }, }, - recategorizeImage: { - component: RecategorizeImageDialogComponent, - }, - changeLegalBasis: { - component: ChangeLegalBasisDialogComponent, - }, - removeAnnotations: { - component: RemoveAnnotationsDialogComponent, - }, - resizeAnnotation: { - component: ResizeAnnotationDialogComponent, - }, - forceAnnotation: { - component: ForceAnnotationDialogComponent, - }, - manualAnnotation: { - component: ManualAnnotationDialogComponent, - dialogConfig: { autoFocus: true }, - }, - highlightAction: { - component: HighlightActionDialogComponent, - }, }; constructor(protected readonly _dialog: MatDialog) { diff --git a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts index 394baf523..c2144329f 100644 --- a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts @@ -7,7 +7,7 @@ import { Dictionary, File, IRedactionLog, IViewedPage, TextHighlightResponse } f import { RedactionLogService } from './redaction-log.service'; import { ViewedPagesService } from '@services/entity-services/viewed-pages.service'; import { UserPreferenceService } from '@services/user-preference.service'; -import { FilePreviewStateService } from '../screens/file-preview-screen/services/file-preview-state.service'; +import { FilePreviewStateService } from '../../file-preview/services/file-preview-state.service'; import { Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; 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 a629961b9..079fa7e8d 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 @@ -33,13 +33,13 @@ import { FileManagementService } from '@services/entity-services/file-management import { FilesService } from '@services/entity-services/files.service'; import { ReanalysisService, ReanalyzeQueryParams } from '@services/reanalysis.service'; import { Router } from '@angular/router'; -import { ExcludedPagesService } from '../../../screens/file-preview-screen/services/excluded-pages.service'; +import { ExcludedPagesService } from '../../../../file-preview/services/excluded-pages.service'; import { tap } from 'rxjs/operators'; -import { DocumentInfoService } from '../../../screens/file-preview-screen/services/document-info.service'; +import { DocumentInfoService } from '../../../../file-preview/services/document-info.service'; import { ExpandableFileActionsComponent } from '@shared/components/expandable-file-actions/expandable-file-actions.component'; import { firstValueFrom } from 'rxjs'; import { RedactionImportService } from '../../services/redaction-import.service'; -import { PageRotationService } from '../../../screens/file-preview-screen/services/page-rotation.service'; +import { PageRotationService } from '../../../../file-preview/services/page-rotation.service'; @Component({ selector: 'redaction-file-actions [file] [type]', 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 index 4a59416c5..cdb1bbc83 100644 --- 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 @@ -5,7 +5,6 @@ import { FileActionsComponent } from './components/file-actions/file-actions.com import { SharedModule } from '@shared/shared.module'; import { RedactionImportService } from './services/redaction-import.service'; import { DossiersDialogService } from '../services/dossiers-dialog.service'; -import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component'; import { EditDossierDialogComponent } from '../dialogs/edit-dossier-dialog/edit-dossier-dialog.component'; import { AddDossierDialogComponent } from '../dialogs/add-dossier-dialog/add-dossier-dialog.component'; import { AssignReviewerApproverDialogComponent } from '../dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component'; @@ -19,7 +18,6 @@ import { DateColumnComponent } from './components/date-column/date-column.compon const components = [ FileActionsComponent, - DocumentInfoDialogComponent, EditDossierGeneralInfoComponent, EditDossierDownloadPackageComponent, EditDossierDictionaryComponent, diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.html b/apps/red-ui/src/app/modules/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.html rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.scss b/apps/red-ui/src/app/modules/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.scss rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts b/apps/red-ui/src/app/modules/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.html b/apps/red-ui/src/app/modules/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.html rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.scss b/apps/red-ui/src/app/modules/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.scss rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.ts b/apps/red-ui/src/app/modules/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.ts rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.scss b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.scss rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.scss 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/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts similarity index 96% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts index f4b1375e2..ed03d6ded 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/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts @@ -3,7 +3,7 @@ import { PermissionsService } from '@services/permissions.service'; import { CircleButtonTypes, List, ScrollableParentView, ScrollableParentViews, StatusBarConfig } from '@iqser/common-ui'; import { UserService } from '@services/user.service'; import { Dossier, DossierStats, File } from '@red/domain'; -import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; +import { DossiersDialogService } from '../../../dossier/services/dossiers-dialog.service'; import { LongPressEvent } from '@shared/directives/long-press.directive'; import { UserPreferenceService } from '@services/user-preference.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.scss b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.scss rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.scss 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/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts similarity index 97% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts rename to apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts index 84aff054e..d2033d0f1 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/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts @@ -4,7 +4,7 @@ import { FilterService, mapEach } from '@iqser/common-ui'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { combineLatest, Observable } from 'rxjs'; import { DossierStats, FileCountPerWorkflowStatus, StatusSorter } from '@red/domain'; -import { workflowFileStatusTranslations } from '../../../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; import { TranslateChartService } from '@services/translate-chart.service'; import { filter, map, switchMap } from 'rxjs/operators'; import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html b/apps/red-ui/src/app/modules/dossiers-listing/components/table-item/table-item.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html rename to apps/red-ui/src/app/modules/dossiers-listing/components/table-item/table-item.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.scss b/apps/red-ui/src/app/modules/dossiers-listing/components/table-item/table-item.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.scss rename to apps/red-ui/src/app/modules/dossiers-listing/components/table-item/table-item.component.scss 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/dossiers-listing/components/table-item/table-item.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts rename to apps/red-ui/src/app/modules/dossiers-listing/components/table-item/table-item.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts similarity index 98% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts rename to apps/red-ui/src/app/modules/dossiers-listing/config.service.ts index 3b7a8d6db..3efed55d8 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts @@ -5,9 +5,9 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; import { UserPreferenceService } from '@services/user-preference.service'; import { UserService } from '@services/user.service'; -import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../translations/file-status-translations'; import { dossierMemberChecker, dossierStateChecker, dossierTemplateChecker, RedactionFilterSorter } from '@utils/index'; -import { workloadTranslations } from '../../translations/workload-translations'; +import { workloadTranslations } from '../dossier/translations/workload-translations'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; import { DossierStatesMapService } from '@services/entity-services/dossier-states-map.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/dossiers-listing.module.ts b/apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts similarity index 95% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/dossiers-listing.module.ts rename to apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts index d36444a4d..fe7684c00 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/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 '../../shared/shared-dossiers.module'; +import { SharedDossiersModule } from '../dossier/shared/shared-dossiers.module'; import { DossierWorkloadColumnComponent } from './components/dossier-workload-column/dossier-workload-column.component'; import { DossierDocumentsStatusComponent } from './components/dossier-documents-status/dossier-documents-status.component'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.html b/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.html rename to apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.scss b/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.scss rename to apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.scss 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/dossiers-listing/screen/dossiers-listing-screen.component.ts similarity index 97% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts rename to apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts index b1f01c516..97361b639 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/dossiers-listing/screen/dossiers-listing-screen.component.ts @@ -4,7 +4,7 @@ import { UserService } from '@services/user.service'; import { PermissionsService } from '@services/permissions.service'; import { TranslateChartService } from '@services/translate-chart.service'; import { Router } from '@angular/router'; -import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; +import { DossiersDialogService } from '../../dossier/services/dossiers-dialog.service'; import { DefaultListingServicesTmp, EntitiesService, ListingComponent, OnAttach, TableComponent } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ConfigService } from '../config.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html rename to apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.scss b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.html rename to apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.scss b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.ts similarity index 86% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.ts index 202dbde51..a0aed4893 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { AnnotationWrapper } from '../../../../../../models/file/annotation.wrapper'; +import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { MultiSelectService } from '../../services/multi-select.service'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.html rename to apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.scss b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.scss similarity index 94% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.scss index d8356a43f..fec173f04 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../../../assets/styles/variables'; +@use 'variables'; :host { display: flex; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts similarity index 96% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts index faecb80ad..a7d663b28 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { TranslateService } from '@ngx-translate/core'; -import { annotationChangesTranslations } from '../../../../../../translations/annotation-changes-translations'; +import { annotationChangesTranslations } from '../../../../translations/annotation-changes-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { MultiSelectService } from '../../services/multi-select.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-references-list/annotation-references-list.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.html rename to apps/red-ui/src/app/modules/file-preview/components/annotation-references-list/annotation-references-list.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.scss b/apps/red-ui/src/app/modules/file-preview/components/annotation-references-list/annotation-references-list.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/annotation-references-list/annotation-references-list.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-references-list/annotation-references-list.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/annotation-references-list/annotation-references-list.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-references-page-indicator/annotation-references-page-indicator.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.html rename to apps/red-ui/src/app/modules/file-preview/components/annotation-references-page-indicator/annotation-references-page-indicator.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.scss b/apps/red-ui/src/app/modules/file-preview/components/annotation-references-page-indicator/annotation-references-page-indicator.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/annotation-references-page-indicator/annotation-references-page-indicator.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-references-page-indicator/annotation-references-page-indicator.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/annotation-references-page-indicator/annotation-references-page-indicator.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.html rename to apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.scss b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.scss similarity index 96% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.scss index 047e483e4..0b0bab321 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../../../assets/styles/variables'; +@use 'variables'; :host { width: 100%; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts similarity index 96% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts index 4ed710636..0ec06a60c 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts @@ -6,8 +6,8 @@ import { AnnotationReferencesService } from '../../services/annotation-reference import { UserPreferenceService } from '@services/user-preference.service'; import { ViewModeService } from '../../services/view-mode.service'; import { BehaviorSubject } from 'rxjs'; -import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { TextHighlightsGroup } from '@red/domain'; +import { FilePreviewDialogService } from '../../services/file-preview-dialog.service'; @Component({ selector: 'redaction-annotations-list', @@ -33,7 +33,7 @@ export class AnnotationsListComponent implements OnChanges { private readonly _filterService: FilterService, private readonly _userPreferenceService: UserPreferenceService, private readonly _viewModeService: ViewModeService, - private readonly _dialogService: DossiersDialogService, + private readonly _dialogService: FilePreviewDialogService, ) {} ngOnChanges(changes: SimpleChanges): void { diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.html b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.html rename to apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.scss b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.ts b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.html b/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.html rename to apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.scss b/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts b/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.ts similarity index 92% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.ts index 2e4dc612d..c84117b21 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.ts @@ -1,5 +1,4 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DocumentInfoService } from '../../services/document-info.service'; import { combineLatest, Observable, switchMap } from 'rxjs'; @@ -7,6 +6,7 @@ import { PermissionsService } from '@services/permissions.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; import { map } from 'rxjs/operators'; import { File } from '@red/domain'; +import { FilePreviewDialogService } from '../../services/file-preview-dialog.service'; @Component({ selector: 'redaction-document-info', @@ -20,7 +20,7 @@ export class DocumentInfoComponent { constructor( private readonly _dossierTemplatesService: DossierTemplatesService, - private readonly _dialogService: DossiersDialogService, + private readonly _dialogService: FilePreviewDialogService, readonly stateService: FilePreviewStateService, readonly permissionsService: PermissionsService, readonly documentInfoService: DocumentInfoService, diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html rename to apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.scss b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts similarity index 99% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts index 2d1b23d5a..3ac5cc779 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/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 '../../../../services/annotation-processing.service'; +import { AnnotationProcessingService } from '../../../dossier/services/annotation-processing.service'; import { MatDialogRef, MatDialogState } from '@angular/material/dialog'; import scrollIntoView from 'scroll-into-view-if-needed'; import { diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/highlights-separator/highlights-separator.component.html b/apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/highlights-separator/highlights-separator.component.html rename to apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/highlights-separator/highlights-separator.component.scss b/apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/highlights-separator/highlights-separator.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/highlights-separator/highlights-separator.component.ts b/apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.ts similarity index 88% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/highlights-separator/highlights-separator.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.ts index 5ebdab14c..c591709b3 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/highlights-separator/highlights-separator.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { CircleButtonTypes } from '@iqser/common-ui'; import { TextHighlightOperation, TextHighlightsGroup } from '@red/domain'; -import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; +import { FilePreviewDialogService } from '../../services/file-preview-dialog.service'; @Component({ selector: 'redaction-highlights-separator [highlightGroup] [annotation]', @@ -18,7 +18,7 @@ export class HighlightsSeparatorComponent { readonly circleButtonTypes = CircleButtonTypes; readonly isWritable$ = this._state.isWritable$; - constructor(private readonly _dialogService: DossiersDialogService, private readonly _state: FilePreviewStateService) {} + constructor(private readonly _dialogService: FilePreviewDialogService, private readonly _state: FilePreviewStateService) {} convertHighlights(highlightGroup: TextHighlightsGroup): void { const data = this._getActionData(highlightGroup, TextHighlightOperation.CONVERT); diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.html b/apps/red-ui/src/app/modules/file-preview/components/page-exclusion/page-exclusion.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.html rename to apps/red-ui/src/app/modules/file-preview/components/page-exclusion/page-exclusion.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.scss b/apps/red-ui/src/app/modules/file-preview/components/page-exclusion/page-exclusion.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/page-exclusion/page-exclusion.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.ts b/apps/red-ui/src/app/modules/file-preview/components/page-exclusion/page-exclusion.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/page-exclusion/page-exclusion.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.html b/apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.html rename to apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.scss b/apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts b/apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.html b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.html rename to apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.scss b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts similarity index 98% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts index 6037aa148..b18b4d949 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts @@ -25,22 +25,22 @@ import { environment } from '@environments/environment'; import { AnnotationDrawService } from '../../services/annotation-draw.service'; import { AnnotationActionsService } from '../../services/annotation-actions.service'; import { UserPreferenceService } from '@services/user-preference.service'; -import { BASE_HREF } from '../../../../../../tokens'; +import { BASE_HREF } from '../../../../tokens'; import { ConfigService } from '@services/config.service'; import { AutoUnsubscribe, ConfirmationDialogInput, LoadingService } from '@iqser/common-ui'; -import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; -import { loadCompareDocumentWrapper } from '../../../../utils/compare-mode.utils'; import { PdfViewer } from '../../services/pdf-viewer.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ActivatedRoute } from '@angular/router'; -import { toPosition } from '../../../../utils/pdf-calculation.utils'; +import { toPosition } from '../../../dossier/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 { tap, withLatestFrom } from 'rxjs/operators'; -import { FileManagementService } from '../../../../../../services/entity-services/file-management.service'; +import { FileManagementService } from '@services/entity-services/file-management.service'; import { PageRotationService } from '../../services/page-rotation.service'; import { ALLOWED_KEYBOARD_SHORTCUTS, HeaderElements, TextPopups } from '../../shared/constants'; +import { FilePreviewDialogService } from '../../services/file-preview-dialog.service'; +import { loadCompareDocumentWrapper } from '../../../dossier/utils/compare-mode.utils'; import Tools = Core.Tools; import TextTool = Tools.TextTool; import Annotation = Core.Annotations.Annotation; @@ -79,7 +79,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha @Inject(BASE_HREF) private readonly _baseHref: string, private readonly _translateService: TranslateService, private readonly _manualAnnotationService: ManualAnnotationService, - private readonly _dialogService: DossiersDialogService, + private readonly _dialogService: FilePreviewDialogService, private readonly _ngZone: NgZone, private readonly _activatedRoute: ActivatedRoute, private readonly _userPreferenceService: UserPreferenceService, diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/type-annotation-icon/type-annotation-icon.component.html b/apps/red-ui/src/app/modules/file-preview/components/type-annotation-icon/type-annotation-icon.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/type-annotation-icon/type-annotation-icon.component.html rename to apps/red-ui/src/app/modules/file-preview/components/type-annotation-icon/type-annotation-icon.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/type-annotation-icon/type-annotation-icon.component.scss b/apps/red-ui/src/app/modules/file-preview/components/type-annotation-icon/type-annotation-icon.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/type-annotation-icon/type-annotation-icon.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/type-annotation-icon/type-annotation-icon.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/type-annotation-icon/type-annotation-icon.component.ts b/apps/red-ui/src/app/modules/file-preview/components/type-annotation-icon/type-annotation-icon.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/type-annotation-icon/type-annotation-icon.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/type-annotation-icon/type-annotation-icon.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html rename to apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.scss b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.scss 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/file-preview/components/user-management/user-management.component.ts similarity index 96% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts index ce413b621..50ca1ccc4 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/file-preview/components/user-management/user-management.component.ts @@ -2,8 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Dossier, File, StatusBarConfigs, User } from '@red/domain'; import { List, LoadingService, Toaster } from '@iqser/common-ui'; import { PermissionsService } from '@services/permissions.service'; -import { FileAssignService } from '../../../../shared/services/file-assign.service'; -import { workflowFileStatusTranslations } from '../../../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { FilesService } from '@services/entity-services/files.service'; @@ -12,6 +11,7 @@ import { BehaviorSubject, combineLatest, combineLatestWith, firstValueFrom, Obse 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'; @Component({ selector: 'redaction-user-management', diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.html b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.html rename to apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.scss b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.scss rename to apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.ts b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.ts rename to apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.html rename to apps/red-ui/src/app/modules/file-preview/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.html 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/file-preview/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts rename to apps/red-ui/src/app/modules/file-preview/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html rename to apps/red-ui/src/app/modules/file-preview/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html 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/file-preview/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts rename to apps/red-ui/src/app/modules/file-preview/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.html rename to apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.scss rename to apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.scss 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/file-preview/dialogs/document-info-dialog/document-info-dialog.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts rename to apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.html rename to apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.scss rename to apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.scss 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/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts rename to apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/highlight-action-dialog/highlight-action-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/highlight-action-dialog/highlight-action-dialog.component.html rename to apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/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 similarity index 97% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts rename to apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts index 59dd303e7..f3234ad4d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/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 } from '@red/domain'; import { BaseDialogComponent, LoadingService } from '@iqser/common-ui'; -import { TextHighlightService } from '../../../../services/text-highlight.service'; +import { TextHighlightService } from '../../../dossier/services/text-highlight.service'; import { firstValueFrom } from 'rxjs'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html rename to apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.scss rename to apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.scss 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/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts rename to apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html rename to apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts similarity index 93% rename from apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts rename to apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts index 5f2ac9a30..910a627d4 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, Injector, OnInit } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; -import { imageCategoriesTranslations } from '../../translations/image-categories-translations'; +import { imageCategoriesTranslations } from '../../../dossier/translations/image-categories-translations'; import { Dossier, ImageCategory } from '@red/domain'; import { BaseDialogComponent } from '@iqser/common-ui'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html rename to apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss rename to apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts similarity index 93% rename from apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts rename to apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts index d06b58d6c..013c1bb1f 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts @@ -2,8 +2,7 @@ import { Component, Inject, Injector } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { TranslateService } from '@ngx-translate/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { PermissionsService } from '@services/permissions.service'; -import { FormBuilder, Validators } from '@angular/forms'; +import { FormBuilder } from '@angular/forms'; import { BaseDialogComponent, humanize } from '@iqser/common-ui'; import { Dossier } from '@red/domain'; @@ -33,14 +32,14 @@ export class RemoveAnnotationsDialogComponent extends BaseDialogComponent { this.initialFormValue = this.form.getRawValue(); } - save() { - this._dialogRef.close({ comment: this.form.getRawValue().comment }); - } - get disabled(): boolean { return !this.valid; } + save() { + this._dialogRef.close({ comment: this.form.getRawValue().comment }); + } + printable(annotation: AnnotationWrapper) { if (annotation.isImage) { return this._translateService.instant('remove-annotations-dialog.image-type', { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html rename to apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts similarity index 89% rename from apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts rename to apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts index d68250abf..9df0e5e81 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts @@ -1,7 +1,6 @@ import { Component, Inject, Injector, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { FormBuilder, Validators } from '@angular/forms'; -import { PermissionsService } from '@services/permissions.service'; +import { FormBuilder } from '@angular/forms'; import { Dossier } from '@red/domain'; import { BaseDialogComponent } from '@iqser/common-ui'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts similarity index 88% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts rename to apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts index d1953f066..d85d9a83f 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts @@ -7,10 +7,10 @@ import { SkippedService } from './services/skipped.service'; import { AnnotationDrawService } from './services/annotation-draw.service'; import { AnnotationActionsService } from './services/annotation-actions.service'; import { FilePreviewStateService } from './services/file-preview-state.service'; -import { PdfViewerDataService } from '../../services/pdf-viewer-data.service'; +import { PdfViewerDataService } from '../dossier/services/pdf-viewer-data.service'; import { AnnotationReferencesService } from './services/annotation-references.service'; import { FilterService } from '@iqser/common-ui'; -import { AnnotationProcessingService } from '../../services/annotation-processing.service'; +import { AnnotationProcessingService } from '../dossier/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/dossier/screens/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html rename to apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss rename to apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss 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/file-preview/file-preview-screen.component.ts similarity index 97% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts rename to apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index 17a4b3d00..0dfaa7628 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/file-preview/file-preview-screen.component.ts @@ -20,18 +20,15 @@ import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { ManualAnnotationResponse } from '@models/file/manual-annotation-response'; import { AnnotationDrawService } from './services/annotation-draw.service'; -import { AnnotationProcessingService } from '../../services/annotation-processing.service'; +import { AnnotationProcessingService } from '../dossier/services/annotation-processing.service'; import { File, ViewMode } from '@red/domain'; import { PermissionsService } from '@services/permissions.service'; import { combineLatest, firstValueFrom, Observable, of, timer } from 'rxjs'; import { UserPreferenceService } from '@services/user-preference.service'; -import { PdfViewerDataService } from '../../services/pdf-viewer-data.service'; -import { download } from '@utils/file-download-utils'; +import { PdfViewerDataService } from '../dossier/services/pdf-viewer-data.service'; +import { clearStamps, download, handleFilterDelta, stampPDFPage } from '../../utils'; import { FileWorkloadComponent } from './components/file-workload/file-workload.component'; -import { DossiersDialogService } from '../../services/dossiers-dialog.service'; -import { clearStamps, stampPDFPage } from '@utils/page-stamper'; import { TranslateService } from '@ngx-translate/core'; -import { handleFilterDelta } from '@utils/filter-utils'; import { FilesService } from '@services/entity-services/files.service'; import { FileManagementService } from '@services/entity-services/file-management.service'; import { catchError, map, switchMap, tap } from 'rxjs/operators'; @@ -41,17 +38,18 @@ import { ExcludedPagesService } from './services/excluded-pages.service'; import { ViewModeService } from './services/view-mode.service'; import { MultiSelectService } from './services/multi-select.service'; import { DocumentInfoService } from './services/document-info.service'; -import { ReanalysisService } from '../../../../services/reanalysis.service'; +import { ReanalysisService } from '@services/reanalysis.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { SkippedService } from './services/skipped.service'; import { FilePreviewStateService } from './services/file-preview-state.service'; -import { FileDataModel } from '../../../../models/file/file-data.model'; +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/dossiers/dossiers.service'; import { PageRotationService } from './services/page-rotation.service'; -import { ComponentCanDeactivate } from '../../../../guards/can-deactivate.guard'; +import { ComponentCanDeactivate } from '../../guards/can-deactivate.guard'; import { PdfViewer } from './services/pdf-viewer.service'; +import { FilePreviewDialogService } from './services/file-preview-dialog.service'; import Annotation = Core.Annotations.Annotation; import PDFNet = Core.PDFNet; @@ -91,7 +89,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni private readonly _watermarkService: WatermarkService, private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _activatedRoute: ActivatedRoute, - private readonly _dialogService: DossiersDialogService, + private readonly _dialogService: FilePreviewDialogService, private readonly _router: Router, private readonly _annotationProcessingService: AnnotationProcessingService, private readonly _annotationDrawService: AnnotationDrawService, diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview.module.ts b/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts similarity index 65% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview.module.ts rename to apps/red-ui/src/app/modules/file-preview/file-preview.module.ts index 111fd80c2..48f2aeb02 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/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 '../../shared/shared-dossiers.module'; +import { SharedDossiersModule } from '../dossier/shared/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'; @@ -24,7 +24,17 @@ import { AcceptRecommendationDialogComponent } from './dialogs/accept-recommenda import { AnnotationCardComponent } from './components/annotation-card/annotation-card.component'; import { AnnotationReferencesPageIndicatorComponent } from './components/annotation-references-page-indicator/annotation-references-page-indicator.component'; import { HighlightsSeparatorComponent } from './components/highlights-separator/highlights-separator.component'; -import { PendingChangesGuard } from '../../../../guards/can-deactivate.guard'; +import { PendingChangesGuard } from '../../guards/can-deactivate.guard'; +import { ManualAnnotationDialogComponent } from './dialogs/manual-redaction-dialog/manual-annotation-dialog.component'; +import { ForceAnnotationDialogComponent } from './dialogs/force-redaction-dialog/force-annotation-dialog.component'; +import { RemoveAnnotationsDialogComponent } from './dialogs/remove-annotations-dialog/remove-annotations-dialog.component'; +import { ResizeAnnotationDialogComponent } from './dialogs/resize-annotation-dialog/resize-annotation-dialog.component'; +import { ChangeLegalBasisDialogComponent } from './dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component'; +import { RecategorizeImageDialogComponent } from './dialogs/recategorize-image-dialog/recategorize-image-dialog.component'; +import { HighlightActionDialogComponent } from './dialogs/highlight-action-dialog/highlight-action-dialog.component'; +import { FilePreviewDialogService } from './services/file-preview-dialog.service'; +import { ColorPickerModule } from 'ngx-color-picker'; +import { DocumentInfoDialogComponent } from './dialogs/document-info-dialog/document-info-dialog.component'; const routes: Routes = [ { @@ -36,6 +46,18 @@ const routes: Routes = [ }, ]; +const dialogs = [ + ManualAnnotationDialogComponent, + ForceAnnotationDialogComponent, + RemoveAnnotationsDialogComponent, + ResizeAnnotationDialogComponent, + ChangeLegalBasisDialogComponent, + RecategorizeImageDialogComponent, + HighlightActionDialogComponent, + AcceptRecommendationDialogComponent, + DocumentInfoDialogComponent, +]; + const components = [ FileWorkloadComponent, AnnotationDetailsComponent, @@ -49,7 +71,6 @@ const components = [ TypeAnnotationIconComponent, ViewSwitchComponent, UserManagementComponent, - AcceptRecommendationDialogComponent, AnnotationReferencesListComponent, AnnotationCardComponent, AnnotationReferencesPageIndicatorComponent, @@ -57,7 +78,7 @@ const components = [ ]; @NgModule({ - declarations: [FilePreviewScreenComponent, ...components], + declarations: [FilePreviewScreenComponent, ...components, ...dialogs], imports: [ RouterModule.forChild(routes), CommonModule, @@ -66,6 +87,8 @@ const components = [ IqserIconsModule, TranslateModule, OverlayModule, + ColorPickerModule, ], + providers: [FilePreviewDialogService], }) export class FilePreviewModule {} 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/file-preview/services/annotation-actions.service.ts similarity index 98% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts index 4ab2b05fe..70702b1e1 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/file-preview/services/annotation-actions.service.ts @@ -4,16 +4,14 @@ import { ManualAnnotationService } from '@services/manual-annotation.service'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { Observable } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; -import { getFirstRelevantTextPart } from '@utils/functions'; +import { getFirstRelevantTextPart, translateQuads } from '../../../utils'; import { AnnotationPermissions } from '@models/file/annotation.permissions'; -import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; -import { BASE_HREF } from '../../../../../tokens'; +import { BASE_HREF } from '../../../tokens'; import { UserService } from '@services/user.service'; import { Core } from '@pdftron/webviewer'; import { Dossier, IAddRedactionRequest, ILegalBasisChangeRequest, IRectangle, IResizeRequest } from '@red/domain'; -import { toPosition } from '../../../utils/pdf-calculation.utils'; +import { toPosition } from '../../dossier/utils/pdf-calculation.utils'; import { AnnotationDrawService } from './annotation-draw.service'; -import { translateQuads } from '@utils/pdf-coordinates'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { AcceptRecommendationData, @@ -25,7 +23,9 @@ import { filter } from 'rxjs/operators'; import { MatDialog } from '@angular/material/dialog'; import { FilePreviewStateService } from './file-preview-state.service'; import { PdfViewer } from './pdf-viewer.service'; +import { FilePreviewDialogService } from './file-preview-dialog.service'; import Annotation = Core.Annotations.Annotation; +import Quad = Core.Math.Quad; @Injectable() export class AnnotationActionsService { @@ -36,7 +36,7 @@ export class AnnotationActionsService { private readonly _permissionsService: PermissionsService, private readonly _manualAnnotationService: ManualAnnotationService, private readonly _translateService: TranslateService, - private readonly _dialogService: DossiersDialogService, + private readonly _dialogService: FilePreviewDialogService, private readonly _dialog: MatDialog, private readonly _pdf: PdfViewer, private readonly _annotationDrawService: AnnotationDrawService, @@ -578,9 +578,9 @@ export class AnnotationActionsService { } } - private _translateQuads(page: number, quads: any) { + private _translateQuads(page: number, quad: Quad): Quad { const rotation = this._pdf.documentViewer.getCompleteRotation(page); - return translateQuads(page, rotation, quads); + return translateQuads(page, rotation, quad); } private async _extractTextFromRect(page: Core.PDFNet.Page, rect: Core.PDFNet.Rect) { 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/file-preview/services/annotation-draw.service.ts similarity index 98% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/annotation-draw.service.ts index 63a85538a..c2fbf02cd 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/file-preview/services/annotation-draw.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; import { Core } from '@pdftron/webviewer'; -import { hexToRgb } from '@utils/functions'; +import { hexToRgb } from '../../../utils'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { UserPreferenceService } from '@services/user-preference.service'; -import { RedactionLogService } from '../../../services/redaction-log.service'; +import { RedactionLogService } from '../../dossier/services/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/screens/file-preview-screen/services/annotation-references.service.ts b/apps/red-ui/src/app/modules/file-preview/services/annotation-references.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-references.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/annotation-references.service.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/commenting.service.ts b/apps/red-ui/src/app/modules/file-preview/services/commenting.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/commenting.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/commenting.service.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/document-info.service.ts b/apps/red-ui/src/app/modules/file-preview/services/document-info.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/document-info.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/document-info.service.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/excluded-pages.service.ts b/apps/red-ui/src/app/modules/file-preview/services/excluded-pages.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/excluded-pages.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/excluded-pages.service.ts diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-preview-dialog.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-preview-dialog.service.ts new file mode 100644 index 000000000..833300c10 --- /dev/null +++ b/apps/red-ui/src/app/modules/file-preview/services/file-preview-dialog.service.ts @@ -0,0 +1,62 @@ +import { Injectable } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { RemoveAnnotationsDialogComponent } from '../dialogs/remove-annotations-dialog/remove-annotations-dialog.component'; +import { ForceAnnotationDialogComponent } from '../dialogs/force-redaction-dialog/force-annotation-dialog.component'; +import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component'; +import { ManualAnnotationDialogComponent } from '../dialogs/manual-redaction-dialog/manual-annotation-dialog.component'; +import { ChangeLegalBasisDialogComponent } from '../dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component'; +import { RecategorizeImageDialogComponent } from '../dialogs/recategorize-image-dialog/recategorize-image-dialog.component'; +import { ConfirmationDialogComponent, DialogConfig, DialogService } from '@iqser/common-ui'; +import { ResizeAnnotationDialogComponent } from '../dialogs/resize-annotation-dialog/resize-annotation-dialog.component'; +import { HighlightActionDialogComponent } from '../dialogs/highlight-action-dialog/highlight-action-dialog.component'; + +type DialogType = + | 'confirm' + | 'documentInfo' + | 'recategorizeImage' + | 'changeLegalBasis' + | 'removeAnnotations' + | 'resizeAnnotation' + | 'forceAnnotation' + | 'manualAnnotation' + | 'highlightAction'; + +@Injectable() +export class FilePreviewDialogService extends DialogService { + protected readonly _config: DialogConfig = { + confirm: { + component: ConfirmationDialogComponent, + dialogConfig: { disableClose: false }, + }, + documentInfo: { + component: DocumentInfoDialogComponent, + dialogConfig: { autoFocus: true }, + }, + recategorizeImage: { + component: RecategorizeImageDialogComponent, + }, + changeLegalBasis: { + component: ChangeLegalBasisDialogComponent, + }, + removeAnnotations: { + component: RemoveAnnotationsDialogComponent, + }, + resizeAnnotation: { + component: ResizeAnnotationDialogComponent, + }, + forceAnnotation: { + component: ForceAnnotationDialogComponent, + }, + manualAnnotation: { + component: ManualAnnotationDialogComponent, + dialogConfig: { autoFocus: true }, + }, + highlightAction: { + component: HighlightActionDialogComponent, + }, + }; + + constructor(protected readonly _dialog: MatDialog) { + super(_dialog); + } +} 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/file-preview/services/file-preview-state.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/multi-select.service.ts b/apps/red-ui/src/app/modules/file-preview/services/multi-select.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/multi-select.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/multi-select.service.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts b/apps/red-ui/src/app/modules/file-preview/services/page-rotation.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/page-rotation.service.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/pdf-viewer.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-viewer.service.ts similarity index 95% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/pdf-viewer.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/pdf-viewer.service.ts index 640e6f6d8..0b3bbde35 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/pdf-viewer.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-viewer.service.ts @@ -1,11 +1,11 @@ -import { translateQuads } from '../../../../../utils/pdf-coordinates'; -import { AnnotationWrapper } from '../../../../../models/file/annotation.wrapper'; +import { translateQuads } from '../../../utils/pdf-coordinates'; +import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import WebViewer, { Core, WebViewerInstance } from '@pdftron/webviewer'; import { ViewModeService } from './view-mode.service'; import { File } from '@red/domain'; import { Inject, Injectable } from '@angular/core'; -import { BASE_HREF } from '../../../../../tokens'; -import { environment } from '../../../../../../environments/environment'; +import { BASE_HREF } from '../../../tokens'; +import { environment } from '@environments/environment'; import Annotation = Core.Annotations.Annotation; import DocumentViewer = Core.DocumentViewer; import AnnotationManager = Core.AnnotationManager; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/skipped.service.ts b/apps/red-ui/src/app/modules/file-preview/services/skipped.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/skipped.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/skipped.service.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/view-mode.service.ts b/apps/red-ui/src/app/modules/file-preview/services/view-mode.service.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/view-mode.service.ts rename to apps/red-ui/src/app/modules/file-preview/services/view-mode.service.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/shared/constants.ts b/apps/red-ui/src/app/modules/file-preview/shared/constants.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/shared/constants.ts rename to apps/red-ui/src/app/modules/file-preview/shared/constants.ts diff --git a/apps/red-ui/src/app/modules/search/search.module.ts b/apps/red-ui/src/app/modules/search/search.module.ts index 7a79b48ab..0ca0c25b8 100644 --- a/apps/red-ui/src/app/modules/search/search.module.ts +++ b/apps/red-ui/src/app/modules/search/search.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { SearchScreenComponent } from './search-screen/search-screen.component'; import { RouterModule } from '@angular/router'; import { CommonUiModule } from '@iqser/common-ui'; -import { SharedModule } from '../shared/shared.module'; +import { SharedModule } from '@shared/shared.module'; const routes = [{ path: '', component: SearchScreenComponent }]; diff --git a/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts b/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts index 9dee93185..f7dce2c12 100644 --- a/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts +++ b/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts @@ -4,12 +4,12 @@ import { FileDropComponent } from './file-drop/file-drop.component'; import { OverlayModule } from '@angular/cdk/overlay'; import { UploadStatusOverlayComponent } from './upload-status-overlay/upload-status-overlay.component'; import { SharedModule } from '@shared/shared.module'; -import { UploadDownloadDialogService } from './services/upload-download-dialog.service'; import { OverwriteFilesDialogComponent } from './dialogs/overwrite-files-dialog/overwrite-files-dialog.component'; import { FileUploadService } from './services/file-upload.service'; import { FileDownloadService } from './services/file-download.service'; import { StatusOverlayService } from './services/status-overlay.service'; import { FileDropOverlayService } from './services/file-drop-overlay.service'; +import { UploadDownloadDialogService } from './services/upload-download-dialog.service'; @NgModule({ imports: [CommonModule, SharedModule, OverlayModule], 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 674e28b8a..cced682d8 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 @@ -4,13 +4,13 @@ import { HttpErrorResponse, HttpEventType } from '@angular/common/http'; import { interval, Subject, Subscription } from 'rxjs'; import { ConfigService } from '@services/config.service'; import { TranslateService } from '@ngx-translate/core'; -import { UploadDownloadDialogService } from './upload-download-dialog.service'; import { IFileUploadResult } from '@red/domain'; import { 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 { switchMap, tap, throttleTime } from 'rxjs/operators'; import { FilesService } from '@services/entity-services/files.service'; +import { UploadDownloadDialogService } from './upload-download-dialog.service'; export interface ActiveUpload { subscription: Subscription; diff --git a/apps/red-ui/src/app/translations/annotation-changes-translations.ts b/apps/red-ui/src/app/translations/annotation-changes-translations.ts index 4cfb7801c..999f8616b 100644 --- a/apps/red-ui/src/app/translations/annotation-changes-translations.ts +++ b/apps/red-ui/src/app/translations/annotation-changes-translations.ts @@ -1,5 +1,5 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { AnnotationWrapper } from '../models/file/annotation.wrapper'; +import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { KeysOf } from '@iqser/common-ui'; export const annotationChangesTranslations: { [key in KeysOf]?: string } = { diff --git a/apps/red-ui/src/app/utils/pdf-coordinates.ts b/apps/red-ui/src/app/utils/pdf-coordinates.ts index 8a470e293..96234551d 100644 --- a/apps/red-ui/src/app/utils/pdf-coordinates.ts +++ b/apps/red-ui/src/app/utils/pdf-coordinates.ts @@ -1,3 +1,6 @@ +import { Core } from '@pdftron/webviewer'; +import Quad = Core.Math.Quad; + enum PageRotation { E_0 = 0, E_90 = 1, @@ -5,48 +8,48 @@ enum PageRotation { E_270 = 3, } -export function translateQuads(page: number, rotation: number, quads: any) { +export function translateQuads(page: number, rotation: number, quad: Quad): Quad { let result; switch (rotation) { case PageRotation.E_90: result = { - x1: quads.x2, - x2: quads.x3, - x3: quads.x4, - x4: quads.x1, - y1: quads.y2, - y2: quads.y3, - y3: quads.y4, - y4: quads.y1, + x1: quad.x2, + x2: quad.x3, + x3: quad.x4, + x4: quad.x1, + y1: quad.y2, + y2: quad.y3, + y3: quad.y4, + y4: quad.y1, }; break; case PageRotation.E_180: result = { - x1: quads.x3, - x2: quads.x4, - x3: quads.x1, - x4: quads.x2, - y1: quads.y3, - y2: quads.y4, - y3: quads.y1, - y4: quads.y2, + x1: quad.x3, + x2: quad.x4, + x3: quad.x1, + x4: quad.x2, + y1: quad.y3, + y2: quad.y4, + y3: quad.y1, + y4: quad.y2, }; break; case PageRotation.E_270: result = { - x1: quads.x4, - x2: quads.x1, - x3: quads.x2, - x4: quads.x3, - y1: quads.y4, - y2: quads.y1, - y3: quads.y2, - y4: quads.y3, + x1: quad.x4, + x2: quad.x1, + x3: quad.x2, + x4: quad.x3, + y1: quad.y4, + y2: quad.y1, + y3: quad.y2, + y4: quad.y3, }; break; case PageRotation.E_0: default: - result = quads; + result = quad; } return result; } diff --git a/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts b/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts index 246efd1a9..a0e840eec 100644 --- a/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts +++ b/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts @@ -1,4 +1,4 @@ -import { SuperType } from '../../models/file/super-types'; +import { SuperType } from '@models/file/super-types'; export const SuperTypeSorter: { [key in SuperType]: number } = { 'text-highlight': 100,