diff --git a/apps/red-ui/src/app/models/file/file-data.model.ts b/apps/red-ui/src/app/models/file/file-data.model.ts index a7e0a2cc1..4a82bd0a4 100644 --- a/apps/red-ui/src/app/models/file/file-data.model.ts +++ b/apps/red-ui/src/app/models/file/file-data.model.ts @@ -1,7 +1,6 @@ -import { Dictionary, File, IRedactionLog, IRedactionLogEntry, IViewedPage, User } from '@red/domain'; +import { Dictionary, File, IRedactionLog, IRedactionLogEntry, IViewedPage, User, ViewMode } from '@red/domain'; import { AnnotationWrapper } from './annotation.wrapper'; import { RedactionLogEntryWrapper } from './redaction-log-entry.wrapper'; -import { ViewMode } from './view-mode'; import * as moment from 'moment'; export class AnnotationData { diff --git a/apps/red-ui/src/app/models/file/file-type.ts b/apps/red-ui/src/app/models/file/file-type.ts deleted file mode 100644 index 3087b0097..000000000 --- a/apps/red-ui/src/app/models/file/file-type.ts +++ /dev/null @@ -1,6 +0,0 @@ -export enum FileType { - ORIGINAL = 'ORIGINAL', - ANNOTATED = 'ANNOTATED', - REDACTED = 'REDACTED', - FLAT_REDACTED = 'FLAT_REDACTED', -} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts index 52246f6e0..05ed47541 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts @@ -1,10 +1,9 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { IColors } from '@red/domain'; +import { DefaultColorType, IColors } from '@red/domain'; import { Toaster } from '@iqser/common-ui'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; -import { DefaultColorType } from '@models/default-color-key.model'; import { defaultColorsTranslations } from '../../translations/default-colors-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DictionaryService } from '@shared/services/dictionary.service'; diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts index 6e22a1453..b6630892b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnInit } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; -import { IColors } from '@red/domain'; +import { DefaultColorType, IColors } from '@red/domain'; import { ActivatedRoute } from '@angular/router'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { @@ -11,7 +11,6 @@ import { LoadingService, TableColumnConfig, } from '@iqser/common-ui'; -import { DefaultColorType } from '@models/default-color-key.model'; import { defaultColorsTranslations } from '../../translations/default-colors-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; diff --git a/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts b/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts index 01a862b21..9e5408ee1 100644 --- a/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts @@ -1,5 +1,5 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { DefaultColorType } from '@models/default-color-key.model'; +import { DefaultColorType } from '@red/domain'; export const defaultColorsTranslations: { [key in DefaultColorType]: string } = { analysisColor: _('default-colors-screen.types.analysisColor'), diff --git a/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts index 2235fa103..89f0532db 100644 --- a/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts @@ -11,7 +11,7 @@ import { SimpleChanges, ViewChild, } from '@angular/core'; -import { File, IManualRedactionEntry } from '@red/domain'; +import { File, IManualRedactionEntry, ViewMode } from '@red/domain'; import WebViewer, { Core, WebViewerInstance } from '@pdftron/webviewer'; import { TranslateService } from '@ngx-translate/core'; import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper'; @@ -27,7 +27,6 @@ import { ConfirmationDialogInput, LoadingService } from '@iqser/common-ui'; import { DossiersDialogService } from '../../services/dossiers-dialog.service'; import { loadCompareDocumentWrapper } from '../../utils/compare-mode.utils'; import { PdfViewerUtils } from '../../utils/pdf-viewer.utils'; -import { ViewMode } from '@models/file/view-mode'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ActivatedRoute } from '@angular/router'; import Tools = Core.Tools; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts index c1834bd87..1bd12b1e4 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts @@ -24,14 +24,13 @@ import { AnnotationData, FileDataModel } from '@models/file/file-data.model'; import { FileActionService } from '../../shared/services/file-action.service'; import { AnnotationDrawService } from '../../services/annotation-draw.service'; import { AnnotationProcessingService } from '../../services/annotation-processing.service'; -import { Dossier, File, FileStatus, User } from '@red/domain'; +import { Dossier, File, FileStatus, User, ViewMode } from '@red/domain'; import { PermissionsService } from '@services/permissions.service'; import { timer } from 'rxjs'; import { UserPreferenceService } from '@services/user-preference.service'; import { UserService } from '@services/user.service'; import { PdfViewerDataService } from '../../services/pdf-viewer-data.service'; import { download } from '@utils/file-download-utils'; -import { ViewMode } from '@models/file/view-mode'; import { FileWorkloadComponent } from '../../components/file-workload/file-workload.component'; import { DossiersDialogService } from '../../services/dossiers-dialog.service'; import { clearStamps, stampPDFPage } from '@utils/page-stamper'; diff --git a/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts b/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts index 8c841f242..224d58bf2 100644 --- a/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts +++ b/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts @@ -1,8 +1,7 @@ -import { ViewMode } from '@models/file/view-mode'; +import { IRectangle, ViewMode } from '@red/domain'; import { translateQuads } from '@utils/pdf-coordinates'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { Core, WebViewerInstance } from '@pdftron/webviewer'; -import { IRectangle } from '@red/domain'; import Annotation = Core.Annotations.Annotation; const DISABLED_HOTKEYS = [ diff --git a/apps/red-ui/src/app/models/default-color-key.model.ts b/libs/red-domain/src/lib/shared/default-color-type.ts similarity index 100% rename from apps/red-ui/src/app/models/default-color-key.model.ts rename to libs/red-domain/src/lib/shared/default-color-type.ts diff --git a/libs/red-domain/src/lib/shared/index.ts b/libs/red-domain/src/lib/shared/index.ts index 5c1b8a78a..3da2cbc13 100644 --- a/libs/red-domain/src/lib/shared/index.ts +++ b/libs/red-domain/src/lib/shared/index.ts @@ -2,3 +2,5 @@ export * from './sorters/status-sorter'; export * from './types'; export * from './rules'; export * from './watermark'; +export * from './default-color-type'; +export * from './view-mode'; diff --git a/apps/red-ui/src/app/models/file/view-mode.ts b/libs/red-domain/src/lib/shared/view-mode.ts similarity index 100% rename from apps/red-ui/src/app/models/file/view-mode.ts rename to libs/red-domain/src/lib/shared/view-mode.ts