Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

fix rebase errors

Browse Source
This commit is contained in:
Dan Percic 2022-03-22 18:44:46 +02:00
parent 9ae510bf5a
commit e0937b0492
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.ts
View File

@ -1,6 +1,5 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostBinding, Input, OnChanges, ViewChild } from '@angular/core';
import { Dossier, File, IComment } from '@red/domain';
import { ManualAnnotationService } from '@services/manual-annotation.service';
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { UserService } from '@services/user.service';
import { PermissionsService } from '@services/permissions.service';
@ -9,6 +8,7 @@ import { firstValueFrom, Observable } from 'rxjs';
import { CommentingService } from '../../services/commenting.service';
import { tap } from 'rxjs/operators';
import { FilePreviewStateService } from '../../services/file-preview-state.service';
import { ManualRedactionService } from '../../services/manual-redaction.service';
@Component({
selector: 'redaction-comments',

4
apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
View File

@ -108,7 +108,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
private readonly _pageRotationService: PageRotationService,
private readonly _annotationDrawService: AnnotationDrawService,
private readonly _fileManagementService: FileManagementService,
private readonly _manualAnnotationService: ManualAnnotationService,
private readonly _manualRedactionService: ManualRedactionService,
private readonly _annotationProcessingService: AnnotationProcessingService,
) {
super();
@ -290,7 +290,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
null,
{ manualRedactionEntryWrapper, dossierId: this.dossierId },
async ({ manualRedactionEntry }: ManualRedactionEntryWrapper) => {
const addAnnotation$ = this._manualAnnotationService.addAnnotation(manualRedactionEntry, this.dossierId, this.fileId);
const addAnnotation$ = this._manualRedactionService.addAnnotation(manualRedactionEntry, this.dossierId, this.fileId);
await firstValueFrom(addAnnotation$.pipe(catchError(() => of(undefined))));
await this._fileDataService.loadAnnotations();
},