RED-9321: get the latest changes and adapt to standalone.

2024-06-12 14:53:49 +03:00 · 2024-06-12 14:53:49 +03:00 · 1378543bf7
commit 1378543bf7
parent cf6b7b4d24
6 changed files with 57 additions and 15 deletions
--- a/apps/red-ui/src/app/modules/file-preview/components/documine-export/documine-export.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/documine-export/documine-export.component.ts
@ -2,10 +2,15 @@ import { Component, Input } from '@angular/core';
 import { firstValueFrom } from 'rxjs';
 import { Dossier } from '@red/domain';
 import { ComponentLogService } from '@services/files/component-log.service';
+import { MatTooltip } from '@angular/material/tooltip';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';

@Component({
    selector: 'redaction-documine-export',
    templateUrl: './documine-export.component.html',
+    standalone: true,
+    imports: [MatTooltip, TranslateModule, MatMenuTrigger, MatMenu, MatMenuItem],
 })
 export class DocumineExportComponent {
    @Input() dossier: Dossier;
--- a/apps/red-ui/src/app/modules/file-preview/components/file-header/file-header.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/file-header/file-header.component.ts
@ -11,25 +11,41 @@ import {
    OnInit,
    ViewChild,
 } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { Router } from '@angular/router';
-import { CircleButtonTypes, getConfig, HelpModeService, IqserPermissionsService, isIqserDevMode, LoadingService } from '@iqser/common-ui';
+import { Roles } from '@users/roles';
+import {
+    CircleButtonComponent,
+    CircleButtonTypes,
+    DisableStopPropagationDirective,
+    getConfig,
+    HelpModeService,
+    IqserAllowDirective,
+    IqserDialog,
+    IqserPermissionsService,
+    isIqserDevMode,
+    LoadingService,
+} from '@iqser/common-ui';
 import { Bind, Debounce, OnDetach } from '@iqser/common-ui/lib/utils';
 import { File } from '@red/domain';
-import { FileManagementService } from '@services/files/file-management.service';
 import { PermissionsService } from '@services/permissions.service';
-import { Roles } from '@users/roles';
 import { download } from '@utils/file-download-utils';
 import { saveAs } from 'file-saver';
 import JSZip from 'jszip';
 import { firstValueFrom } from 'rxjs';
-import { AnnotationDrawService } from '../../../pdf-viewer/services/annotation-draw.service';
+import { Router, RouterLink } from '@angular/router';
 import { REDAnnotationManager } from '../../../pdf-viewer/services/annotation-manager.service';
 import { PdfViewer } from '../../../pdf-viewer/services/pdf-viewer.service';
 import { AnnotationActionsService } from '../../services/annotation-actions.service';
 import { FileDataService } from '../../services/file-data.service';
 import { FilePreviewStateService } from '../../services/file-preview-state.service';
 import { MultiSelectService } from '../../services/multi-select.service';
+import { ViewSwitchComponent } from '../view-switch/view-switch.component';
+import { DocumineExportComponent } from '../documine-export/documine-export.component';
+import { NgIf } from '@angular/common';
+import { ProcessingIndicatorComponent } from '@shared/components/processing-indicator/processing-indicator.component';
+import { UserManagementComponent } from '../user-management/user-management.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { InitialsAvatarComponent } from '@common-ui/users';
+import { FileActionsComponent } from '../../../shared-dossiers/components/file-actions/file-actions.component';
 import { TablesService } from '../../services/tables.service';
 import { ALL_HOTKEYS } from '../../utils/constants';

@ -37,6 +53,21 @@ import { ALL_HOTKEYS } from '../../utils/constants';
    selector: 'redaction-file-header',
    templateUrl: './file-header.component.html',
    styleUrls: ['./file-header.component.scss'],
+    standalone: true,
+    imports: [
+        ViewSwitchComponent,
+        DocumineExportComponent,
+        NgIf,
+        ProcessingIndicatorComponent,
+        UserManagementComponent,
+        TranslateModule,
+        InitialsAvatarComponent,
+        FileActionsComponent,
+        CircleButtonComponent,
+        IqserAllowDirective,
+        DisableStopPropagationDirective,
+        RouterLink,
+    ],
 })
 export class FileHeaderComponent implements OnInit, AfterViewInit, OnDetach, OnDestroy {
    @ViewChild('actionsWrapper', { static: false }) private readonly _actionsWrapper: ElementRef;
--- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts
@ -38,7 +38,7 @@ import { workloadTranslations } from '@translations/workload-translations';
 import { WorkflowFileStatuses } from '@red/domain';
 import { AnnotationsListComponent } from '../annotations-list/annotations-list.component';
 import { PageExclusionComponent } from '../page-exclusion/page-exclusion.component';
-import { AsyncPipe, NgIf } from '@angular/common';
+import { AsyncPipe, NgIf, NgTemplateOutlet } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { ReadonlyBannerComponent } from '../readonly-banner/readonly-banner.component';
 import { AnnotationActionsComponent } from '../annotation-actions/annotation-actions.component';
@ -72,6 +72,7 @@ const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'];
        PagesComponent,
        EmptyStateComponent,
        CapitalizePipe,
+        NgTemplateOutlet,
    ],
 })
 export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, OnDestroy {
--- a/apps/red-ui/src/app/modules/file-preview/components/pages/pages.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/pages/pages.component.ts
@ -3,7 +3,6 @@ import { List } from '@iqser/common-ui/lib/utils';
 import { PdfViewer } from '../../../pdf-viewer/services/pdf-viewer.service';
 import { MultiSelectService } from '../../services/multi-select.service';
 import { AnnotationsListingService } from '../../services/annotations-listing.service';
-import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { FilePreviewStateService } from '../../services/file-preview-state.service';
 import { ViewedPagesMapService } from '@services/files/viewed-pages-map.service';
 import { ViewedPage } from '@red/domain';
--- a/apps/red-ui/src/app/modules/file-preview/components/structured-component-management/structured-component-management.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/structured-component-management/structured-component-management.component.ts
@ -1,20 +1,24 @@
 import { Component, Input, OnInit, signal, ViewChildren } from '@angular/core';
-import { toObservable } from '@angular/core/rxjs-interop';
-import { FilterService } from '@common-ui/filtering';
 import { List } from '@common-ui/utils';
 import { IconButtonTypes, LoadingService } from '@iqser/common-ui';
 import { ComponentLogEntry, Dictionary, File, IComponentLogEntry, WorkflowFileStatuses } from '@red/domain';
 import { ComponentLogService } from '@services/files/component-log.service';
 import { UserPreferenceService } from '@users/user-preference.service';
 import { combineLatest, firstValueFrom, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { ComponentLogFilterService } from '../../services/component-log-filter.service';
 import { EditableStructuredComponentValueComponent } from '../editable-structured-component-value/editable-structured-component-value.component';
+import { FilterService, PopupFilterComponent } from '@common-ui/filtering';
+import { ComponentLogFilterService } from '../../services/component-log-filter.service';
+import { map } from 'rxjs/operators';
+import { toObservable } from '@angular/core/rxjs-interop';
+import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';

@Component({
    selector: 'redaction-structured-component-management',
    templateUrl: './structured-component-management.component.html',
    styleUrls: ['./structured-component-management.component.scss'],
+    standalone: true,
+    imports: [PopupFilterComponent, NgIf, AsyncPipe, TranslateModule, NgForOf, EditableStructuredComponentValueComponent],
 })
 export class StructuredComponentManagementComponent implements OnInit {
    protected readonly componentLogData = signal<ComponentLogEntry[] | undefined>(undefined);
--- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
@ -25,7 +25,6 @@ import { Dictionary, File, ViewModes } from '@red/domain';
 import { ConfigService } from '@services/config.service';
 import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
 import { DossiersService } from '@services/dossiers/dossiers.service';
-import { FileManagementService } from '@services/files/file-management.service';
 import { FilesMapService } from '@services/files/files-map.service';
 import { FilesService } from '@services/files/files.service';
 import { PermissionsService } from '@services/permissions.service';
@ -35,7 +34,7 @@ import { PreferencesKeys, UserPreferenceService } from '@users/user-preference.s
 import { NGXLogger } from 'ngx-logger';
 import { combineLatest, first, firstValueFrom, Observable, of, pairwise } from 'rxjs';
 import { catchError, filter, map, startWith, switchMap, tap } from 'rxjs/operators';
-import { byId, byPage, download, handleFilterDelta, hasChanges } from '../../utils';
+import { byId, byPage, handleFilterDelta, hasChanges } from '../../utils';
 import { AnnotationDrawService } from '../pdf-viewer/services/annotation-draw.service';
 import { REDAnnotationManager } from '../pdf-viewer/services/annotation-manager.service';
 import { REDDocumentViewer } from '../pdf-viewer/services/document-viewer.service';
@ -69,6 +68,8 @@ import { InitialsAvatarComponent } from '@common-ui/users';
 import { FileActionsComponent } from '../shared-dossiers/components/file-actions/file-actions.component';
 import { FilePreviewRightContainerComponent } from './components/right-container/file-preview-right-container.component';
 import { TypeFilterComponent } from '@shared/components/type-filter/type-filter.component';
+import { FileHeaderComponent } from './components/file-header/file-header.component';
+import { StructuredComponentManagementComponent } from './components/structured-component-management/structured-component-management.component';

@Component({
    templateUrl: './file-preview-screen.component.html',
@ -89,6 +90,8 @@ import { TypeFilterComponent } from '@shared/components/type-filter/type-filter.
        RouterLink,
        FilePreviewRightContainerComponent,
        TypeFilterComponent,
+        FileHeaderComponent,
+        StructuredComponentManagementComponent,
    ],
 })
 export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnInit, OnDestroy, OnAttach, OnDetach, ComponentCanDeactivate {
@ -137,7 +140,6 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
        private readonly _toaster: Toaster,
        private readonly _manualRedactionService: ManualRedactionService,
        private readonly _filesService: FilesService,
-        private readonly _fileManagementService: FileManagementService,
        private readonly _readableRedactionsService: ReadableRedactionsService,
        private readonly _dossierTemplatesService: DossierTemplatesService,
        private readonly _multiSelectService: MultiSelectService,