From 6c29461f18fa7d2e63b2abbc536c98b13b2289f7 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Tue, 1 Feb 2022 12:01:40 +0200 Subject: [PATCH] cleanup --- .../{utils.ts => file-preview-providers.ts} | 0 .../file-preview-screen.component.ts | 4 +--- .../services/file-preview-state.service.ts | 10 ---------- 3 files changed, 1 insertion(+), 13 deletions(-) rename apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/{utils.ts => file-preview-providers.ts} (100%) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/utils.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/utils.ts rename to apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts 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 e300d19f4..c15d45630 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 @@ -10,7 +10,6 @@ import { ErrorService, FilterService, LoadingService, - log, NestedFilter, OnAttach, OnDetach, @@ -49,7 +48,7 @@ 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 { filePreviewScreenProviders } from './utils'; +import { filePreviewScreenProviders } from './file-preview-providers'; import { ManualAnnotationService } from '../../services/manual-annotation.service'; import Annotation = Core.Annotations.Annotation; import PDFNet = Core.PDFNet; @@ -521,7 +520,6 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni .watch$(this.dossierId, this.fileId) .pipe( filter(f => !!f), - log(), switchMap(file => this._fileUpdated(file)), ) .subscribe(); diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts index c440356c2..72e6a597b 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts @@ -5,7 +5,6 @@ import { Dossier, File } from '@red/domain'; import { DossiersService } from '../../../../../services/entity-services/dossiers.service'; import { ActivatedRoute } from '@angular/router'; import { FilesMapService } from '../../../../../services/entity-services/files-map.service'; -import { map } from 'rxjs/operators'; @Injectable() export class FilePreviewStateService { @@ -14,9 +13,7 @@ export class FilePreviewStateService { readonly dossier$: Observable; readonly dossierId: string; readonly fileId: string; - readonly hasBeenProcessed$: Observable; private readonly _fileData$ = new BehaviorSubject(undefined); - private _lastProcessed = ''; constructor( private readonly _dossiersService: DossiersService, @@ -29,13 +26,6 @@ export class FilePreviewStateService { this.fileData$ = this._fileData$.asObservable(); this.file$ = _filesMapService.watch$(this.dossierId, this.fileId); - this.hasBeenProcessed$ = this.file$.pipe( - map(file => { - const hasBeenProcessed = file.lastProcessed !== this._lastProcessed; - this._lastProcessed = file.lastProcessed; - return hasBeenProcessed; - }), - ); } get fileData(): FileDataModel {