From 0caca39752f9d41a6cceb17dcecc4f1bc3c8610d Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 29 Sep 2021 09:48:30 +0300 Subject: [PATCH] api compatibility --- ...-edit-dossier-template-dialog.component.ts | 2 +- .../add-dossier-dialog.component.ts | 10 +-- .../dossier-overview-screen.component.ts | 86 +++++++++---------- .../dossier-attributes.service.ts | 2 - .../red-ui/src/app/state/app-state.service.ts | 42 +++++---- 5 files changed, 65 insertions(+), 77 deletions(-) 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 bc165ad2d..33bb0f47a 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 @@ -4,7 +4,7 @@ import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import * as moment from 'moment'; import {Moment} from 'moment'; -import {DossierTemplateControllerService, DossierTemplateModel, DownloadFileType, IDossierTemplate} from '@redaction/red-ui-http'; +import {DossierTemplateControllerService, DownloadFileType, IDossierTemplate} from '@redaction/red-ui-http'; import {applyIntervalConstraints} from '@utils/date-inputs-utils'; import {downloadTypesTranslations} from '../../../../translations/download-types-translations'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 1606c37d0..a894ed1c6 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -1,14 +1,6 @@ import {Component} from '@angular/core'; import {MatDialogRef} from '@angular/material/dialog'; -import { - DossierRequest, - DossierTemplateModel, - DownloadFileType, - IDossier, - IDossierTemplate, - ReportTemplate, - ReportTemplateControllerService -} from '@redaction/red-ui-http'; +import {DossierRequest, DownloadFileType, IDossierTemplate, ReportTemplate, ReportTemplateControllerService} from '@redaction/red-ui-http'; import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {AppStateService} from '@state/app-state.service'; import * as moment from 'moment'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts index 14e31d540..c0baae2e0 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts @@ -10,26 +10,26 @@ import { TemplateRef, ViewChild } from '@angular/core'; -import { FileStatus, FileStatuses, IFileAttributeConfig } from '@redaction/red-ui-http'; -import { AppStateService } from '@state/app-state.service'; -import { FileDropOverlayService } from '@upload-download/services/file-drop-overlay.service'; -import { FileUploadModel } from '@upload-download/model/file-upload.model'; -import { FileUploadService } from '@upload-download/services/file-upload.service'; -import { StatusOverlayService } from '@upload-download/services/status-overlay.service'; -import { TranslateService } from '@ngx-translate/core'; +import {FileStatus, FileStatuses, IFileAttributeConfig} from '@redaction/red-ui-http'; +import {AppStateService} from '@state/app-state.service'; +import {FileDropOverlayService} from '@upload-download/services/file-drop-overlay.service'; +import {FileUploadModel} from '@upload-download/model/file-upload.model'; +import {FileUploadService} from '@upload-download/services/file-upload.service'; +import {StatusOverlayService} from '@upload-download/services/status-overlay.service'; +import {TranslateService} from '@ngx-translate/core'; import * as moment from 'moment'; -import { DossierDetailsComponent } from '../../components/dossier-details/dossier-details.component'; -import { File } from '@models/file/file'; -import { UserService } from '@services/user.service'; -import { timer } from 'rxjs'; -import { tap } from 'rxjs/operators'; -import { RedactionFilterSorter } from '@utils/sorters/redaction-filter-sorter'; -import { StatusSorter } from '@utils/sorters/status-sorter'; -import { convertFiles, Files, handleFileDrop } from '@utils/file-drop-utils'; -import { DossiersDialogService } from '../../services/dossiers-dialog.service'; -import { OnAttach, OnDetach } from '@utils/custom-route-reuse.strategy'; -import { ConfigService } from '@services/config.service'; -import { ActionConfig } from '@shared/components/page-header/models/action-config.model'; +import {DossierDetailsComponent} from '../../components/dossier-details/dossier-details.component'; +import {File} from '@models/file/file'; +import {UserService} from '@services/user.service'; +import {timer} from 'rxjs'; +import {tap} from 'rxjs/operators'; +import {RedactionFilterSorter} from '@utils/sorters/redaction-filter-sorter'; +import {StatusSorter} from '@utils/sorters/status-sorter'; +import {convertFiles, Files, handleFileDrop} from '@utils/file-drop-utils'; +import {DossiersDialogService} from '../../services/dossiers-dialog.service'; +import {OnAttach, OnDetach} from '@utils/custom-route-reuse.strategy'; +import {ConfigService} from '@services/config.service'; +import {ActionConfig} from '@shared/components/page-header/models/action-config.model'; import { CircleButtonTypes, DefaultListingServices, @@ -44,22 +44,22 @@ import { Toaster, WorkflowConfig } from '@iqser/common-ui'; -import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; -import { DossierAttributeWithValue } from '@models/dossier-attributes.model'; -import { workloadTranslations } from '../../translations/workload-translations'; -import { fileStatusTranslations } from '../../translations/file-status-translations'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { annotationFilterChecker } from '@utils/filter-utils'; -import { PermissionsService } from '@services/permissions.service'; -import { RouterHistoryService } from '@services/router-history.service'; -import { Dossier } from '@state/model/dossier'; -import { Router } from '@angular/router'; -import { FileActionService } from '../../services/file-action.service'; +import {DossierAttributesService} from '@shared/services/controller-wrappers/dossier-attributes.service'; +import {DossierAttributeWithValue} from '@models/dossier-attributes.model'; +import {workloadTranslations} from '../../translations/workload-translations'; +import {fileStatusTranslations} from '../../translations/file-status-translations'; +import {marker as _} from '@biesbjerg/ngx-translate-extract-marker'; +import {annotationFilterChecker} from '@utils/filter-utils'; +import {PermissionsService} from '@services/permissions.service'; +import {RouterHistoryService} from '@services/router-history.service'; +import {Dossier} from '@state/model/dossier'; +import {Router} from '@angular/router'; +import {FileActionService} from '../../services/file-action.service'; @Component({ templateUrl: './dossier-overview-screen.component.html', styleUrls: ['./dossier-overview-screen.component.scss'], - providers: [...DefaultListingServices, { provide: ListingComponent, useExisting: forwardRef(() => DossierOverviewScreenComponent) }] + providers: [...DefaultListingServices, {provide: ListingComponent, useExisting: forwardRef(() => DossierOverviewScreenComponent)}] }) export class DossierOverviewScreenComponent extends ListingComponent implements OnInit, OnDestroy, OnDetach, OnAttach { readonly listingModes = ListingModes; @@ -79,18 +79,18 @@ export class DossierOverviewScreenComponent extends ListingComponent imple collapsedDetails = false; dossierAttributes: DossierAttributeWithValue[] = []; fileAttributeConfigs: IFileAttributeConfig[]; - @ViewChild('filenameTemplate', { static: true }) filenameTemplate: TemplateRef; - @ViewChild('addedOnTemplate', { static: true }) addedOnTemplate: TemplateRef; - @ViewChild('attributeTemplate', { static: true }) attributeTemplate: TemplateRef; - @ViewChild('needsWorkTemplate', { static: true }) needsWorkTemplate: TemplateRef; - @ViewChild('reviewerTemplate', { static: true }) reviewerTemplate: TemplateRef; - @ViewChild('pagesTemplate', { static: true }) pagesTemplate: TemplateRef; - @ViewChild('statusTemplate', { static: true }) statusTemplate: TemplateRef; + @ViewChild('filenameTemplate', {static: true}) filenameTemplate: TemplateRef; + @ViewChild('addedOnTemplate', {static: true}) addedOnTemplate: TemplateRef; + @ViewChild('attributeTemplate', {static: true}) attributeTemplate: TemplateRef; + @ViewChild('needsWorkTemplate', {static: true}) needsWorkTemplate: TemplateRef; + @ViewChild('reviewerTemplate', {static: true}) reviewerTemplate: TemplateRef; + @ViewChild('pagesTemplate', {static: true}) pagesTemplate: TemplateRef; + @ViewChild('statusTemplate', {static: true}) statusTemplate: TemplateRef; readonly workflowConfig: WorkflowConfig; - @ViewChild(DossierDetailsComponent, { static: false }) + @ViewChild(DossierDetailsComponent, {static: false}) private readonly _dossierDetailsComponent: DossierDetailsComponent; private _lastScrolledIndex: number; - @ViewChild('needsWorkFilterTemplate', { read: TemplateRef, static: true }) + @ViewChild('needsWorkFilterTemplate', {read: TemplateRef, static: true}) private readonly _needsWorkFilterTemplate: TemplateRef; @ViewChild('fileInput') private readonly _fileInput: ElementRef; @ViewChild(TableComponent) private readonly _tableComponent: TableComponent; @@ -315,12 +315,12 @@ export class DossierOverviewScreenComponent extends ListingComponent imple } openAssignDossierMembersDialog(): void { - const data = { dossier: this.currentDossier, section: 'members' }; + const data = {dossier: this.currentDossier, section: 'members'}; this._dialogService.openDialog('editDossier', null, data, async () => await this.reloadDossiers()); } openDossierDictionaryDialog() { - const data = { dossier: this.currentDossier, section: 'dossierDictionary' }; + const data = {dossier: this.currentDossier, section: 'dossierDictionary'}; this._dialogService.openDialog('editDossier', null, data, async () => { await this.reloadDossiers(); }); @@ -337,7 +337,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple const dynamicColumns: TableColumnConfig[] = []; for (const config of this.displayedInFileListAttributes) { if (config.displayedInFileList) { - dynamicColumns.push({ label: config.label, notTranslatable: true, template: this.attributeTemplate, extra: config }); + dynamicColumns.push({label: config.label, notTranslatable: true, template: this.attributeTemplate, extra: config}); } } this.tableColumnConfigs = [ diff --git a/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts b/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts index 87a9caa60..4c671f4ef 100644 --- a/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts +++ b/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts @@ -2,10 +2,8 @@ import {Injectable} from '@angular/core'; import { DossierAttribute, DossierAttributeConfig, - DossierAttributeReq, DossierAttributes, DossierAttributesControllerService, - DossierAttributesRes, IDossierAttributeConfig } from '@redaction/red-ui-http'; import {Dossier} from '@state/model/dossier'; diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts index cba98fe26..c1f087951 100644 --- a/apps/red-ui/src/app/state/app-state.service.ts +++ b/apps/red-ui/src/app/state/app-state.service.ts @@ -1,8 +1,6 @@ -import { Injectable } from '@angular/core'; +import {Injectable} from '@angular/core'; import { Colors, - DictionaryControllerService, - DossierRequest, DossierTemplateControllerService, FileAttributesConfig, FileAttributesControllerService, @@ -10,22 +8,22 @@ import { IFile, ReanalysisControllerService } from '@redaction/red-ui-http'; -import { Toaster } from '@iqser/common-ui'; -import { TranslateService } from '@ngx-translate/core'; -import { Event, NavigationEnd, ResolveStart, Router } from '@angular/router'; -import { UserService } from '@services/user.service'; -import { forkJoin, Observable, of, Subject } from 'rxjs'; -import { catchError, map, tap } from 'rxjs/operators'; -import { FALLBACK_COLOR, hexToRgb } from '@utils/functions'; -import { File } from '@models/file/file'; -import { Dossier } from './model/dossier'; -import { TypeValue } from '@models/file/type-value'; -import { DossierTemplate } from '@models/file/dossier-template'; -import { DossiersService } from '../modules/dossier/services/dossiers.service'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { UserPreferenceService } from '@services/user-preference.service'; -import { FilesService } from '../modules/dossier/services/files.service'; -import { DictionaryService } from '@shared/services/dictionary.service'; +import {Toaster} from '@iqser/common-ui'; +import {TranslateService} from '@ngx-translate/core'; +import {Event, NavigationEnd, ResolveStart, Router} from '@angular/router'; +import {UserService} from '@services/user.service'; +import {forkJoin, Observable, of, Subject} from 'rxjs'; +import {catchError, map, tap} from 'rxjs/operators'; +import {FALLBACK_COLOR, hexToRgb} from '@utils/functions'; +import {File} from '@models/file/file'; +import {Dossier} from './model/dossier'; +import {TypeValue} from '@models/file/type-value'; +import {DossierTemplate} from '@models/file/dossier-template'; +import {DossiersService} from '../modules/dossier/services/dossiers.service'; +import {marker as _} from '@biesbjerg/ngx-translate-extract-marker'; +import {UserPreferenceService} from '@services/user-preference.service'; +import {FilesService} from '../modules/dossier/services/files.service'; +import {DictionaryService} from '@shared/services/dictionary.service'; export interface AppState { dossiers: Dossier[]; @@ -94,7 +92,7 @@ export class AppStateService { } get aggregatedFiles(): File[] { - return this.allDossiers.reduce((acc, { files }) => [...acc, ...files], []); + return this.allDossiers.reduce((acc, {files}) => [...acc, ...files], []); } get activeDossierTemplateId(): string { @@ -265,7 +263,7 @@ export class AppStateService { return this._processFiles(dossier, files, emitEvents); } - async reanalyzeDossier({ id }: Dossier = this.activeDossier) { + async reanalyzeDossier({id}: Dossier = this.activeDossier) { await this._reanalysisControllerService.reanalyzeDossier(id, true).toPromise(); } @@ -342,7 +340,7 @@ export class AppStateService { const index = this.allDossiers.findIndex(p => p.id === dossier.id); this._appState.dossiers.splice(index, 1); }, - () => this._toaster.error(_('dossier-listing.delete.delete-failed'), { params: dossier }) + () => this._toaster.error(_('dossier-listing.delete.delete-failed'), {params: dossier}) ); }