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

Merge remote-tracking branch 'origin/master' into RED-2830

Browse Source
This commit is contained in:
Adina Țeudan 2021-12-06 04:09:52 +02:00
commit d9080ab7a2
6 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts
View File

@ -147,7 +147,7 @@ export class EditDossierDeletedDocumentsComponent extends ListingComponent<FileL
private _canRestoreFile(restoreDate: string): boolean {
const { daysLeft, hoursLeft, minutesLeft } = getLeftDateTime(restoreDate);
return daysLeft >= 0 && hoursLeft >= 0 && minutesLeft > 0;
return daysLeft >= 0 && hoursLeft >= 0 && minutesLeft >= 0;
}
private _getRestoreDate(softDeletedTime: string): string {

67
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts
View File

@ -34,7 +34,6 @@ import { PdfViewerUtils } from '../../../../utils/pdf-viewer.utils';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { ActivatedRoute } from '@angular/router';
import { toPosition } from '../../../../utils/pdf-calculation.utils';
import { DossiersService } from '@services/entity-services/dossiers.service';
import { ViewModeService } from '../../services/view-mode.service';
import { MultiSelectService } from '../../services/multi-select.service';
import Tools = Core.Tools;
@ -63,6 +62,7 @@ const dataElements = {
export class PdfViewerComponent implements OnInit, OnChanges {
@Input() fileData: Blob;
@Input() file: File;
@Input() dossier: Dossier;
@Input() canPerformActions = false;
@Input() annotations: AnnotationWrapper[];
@Input() shouldDeselectAnnotationsOnPageChange = true;
@ -94,18 +94,13 @@ export class PdfViewerComponent implements OnInit, OnChanges {
private readonly _annotationActionsService: AnnotationActionsService,
private readonly _configService: ConfigService,
private readonly _loadingService: LoadingService,
private readonly _dossiersService: DossiersService,
readonly viewModeService: ViewModeService,
readonly multiSelectService: MultiSelectService,
) {}
private get _dossier(): Dossier {
return this._dossiersService.find(this.file.dossierId);
}
async ngOnInit() {
this._setReadyAndInitialState = this._setReadyAndInitialState.bind(this);
await this._loadViewer();
await this.loadViewer();
}
ngOnChanges(changes: SimpleChanges): void {
@ -200,18 +195,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
this.utils.navigateToPage(1);
}
private _setInitialDisplayMode() {
this.instance.UI.setFitMode('FitPage');
const instanceDisplayMode = this.documentViewer.getDisplayModeManager().getDisplayMode();
instanceDisplayMode.mode = this.viewModeService.isStandard ? 'Single' : 'Facing';
this.documentViewer.getDisplayModeManager().setDisplayMode(instanceDisplayMode);
}
private _convertPath(path: string): string {
return this._baseHref + path;
}
private async _loadViewer() {
async loadViewer() {
this.instance = await WebViewer(
{
licenseKey: environment.licenseKey ? atob(environment.licenseKey) : null,
@ -232,7 +216,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
this.utils.disableHotkeys();
this._configureTextPopup();
this.annotationManager.on('annotationSelected', (annotations, action) => {
this.annotationManager.addEventListener('annotationSelected', (annotations, action) => {
this.annotationSelected.emit(this.annotationManager.getSelectedAnnotations().map(ann => ann.Id));
if (action === 'deselected') {
this._toggleRectangleAnnotationAction(true);
@ -242,17 +226,17 @@ export class PdfViewerComponent implements OnInit, OnChanges {
}
});
this.annotationManager.on('annotationChanged', annotations => {
this.annotationManager.addEventListener('annotationChanged', annotations => {
// when a rectangle is drawn,
// it returns one annotation with tool name 'AnnotationCreateRectangle;
// this will auto select rectangle after drawing
if (annotations.length === 1 && annotations[0].ToolName === 'AnnotationCreateRectangle') {
this.annotationManager.selectAnnotations(annotations);
annotations[0].setRotationControlEnabled(false);
annotations[0].enableRotationControl();
}
});
this.documentViewer.on('pageNumberUpdated', pageNumber => {
this.documentViewer.addEventListener('pageNumberUpdated', pageNumber => {
if (this.shouldDeselectAnnotationsOnPageChange) {
this.utils.deselectAllAnnotations();
}
@ -268,9 +252,9 @@ export class PdfViewerComponent implements OnInit, OnChanges {
this._handleCustomActions();
});
this.documentViewer.on('documentLoaded', this._setReadyAndInitialState);
this.documentViewer.addEventListener('documentLoaded', this._setReadyAndInitialState);
this.documentViewer.on('keyUp', $event => {
this.documentViewer.addEventListener('keyUp', $event => {
// arrows and full-screen
if ($event.target?.tagName?.toLowerCase() !== 'input') {
if ($event.key.startsWith('Arrow') || $event.key === 'f') {
@ -288,7 +272,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
}
});
this.documentViewer.on('textSelected', (quads, selectedText) => {
this.documentViewer.addEventListener('textSelected', (quads, selectedText) => {
this._selectedText = selectedText;
const textActions = [dataElements.ADD_DICTIONARY, dataElements.ADD_FALSE_POSITIVE];
@ -314,6 +298,17 @@ export class PdfViewerComponent implements OnInit, OnChanges {
this._loadDocument();
}
private _setInitialDisplayMode() {
this.instance.UI.setFitMode('FitPage');
const instanceDisplayMode = this.documentViewer.getDisplayModeManager().getDisplayMode();
instanceDisplayMode.mode = this.viewModeService.isStandard ? 'Single' : 'Facing';
this.documentViewer.getDisplayModeManager().setDisplayMode(instanceDisplayMode);
}
private _convertPath(path: string): string {
return this._baseHref + path;
}
private _setSelectionMode(): void {
const textTool = this.instance.Core.Tools.TextTool as unknown as TextTool;
textTool.SELECTION_MODE = this._configService.values.SELECTION_MODE;
@ -403,14 +398,14 @@ export class PdfViewerComponent implements OnInit, OnChanges {
this.instance.UI.disableElements([dataElements.CLOSE_COMPARE_BUTTON]);
const dossierTemplateId = this._dossier.dossierTemplateId;
const dossierTemplateId = this.dossier.dossierTemplateId;
this.documentViewer.getTool('AnnotationCreateRectangle').setStyles(() => ({
this.documentViewer.getTool('AnnotationCreateRectangle').setStyles({
StrokeThickness: 2,
StrokeColor: this._annotationDrawService.getColor(this.instance, dossierTemplateId, 'manual'),
FillColor: this._annotationDrawService.getColor(this.instance, dossierTemplateId, 'manual'),
Opacity: 0.6,
}));
});
}
private _configureAnnotationSpecificActions(viewerAnnotations: Annotation[]) {
@ -464,7 +459,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
type: 'actionButton',
dataElement: dataElements.ADD_RECTANGLE,
img: this._convertPath('/assets/icons/general/pdftron-action-add-redaction.svg'),
title: this._translateService.instant(this._manualAnnotationService.getTitle('REDACTION', this._dossier)),
title: this._translateService.instant(this._manualAnnotationService.getTitle('REDACTION', this.dossier)),
onClick: () => this._addRectangleManualRedaction(),
},
]);
@ -519,7 +514,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
dataElement: 'add-false-positive',
img: this._convertPath('/assets/icons/general/pdftron-action-false-positive.svg'),
title: this._translateService.instant(
this._manualAnnotationService.getTitle(ManualRedactionEntryTypes.FALSE_POSITIVE, this._dossier),
this._manualAnnotationService.getTitle(ManualRedactionEntryTypes.FALSE_POSITIVE, this.dossier),
),
onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.FALSE_POSITIVE),
},
@ -532,7 +527,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
dataElement: dataElements.ADD_REDACTION,
img: this._convertPath('/assets/icons/general/pdftron-action-add-redaction.svg'),
title: this._translateService.instant(
this._manualAnnotationService.getTitle(ManualRedactionEntryTypes.REDACTION, this._dossier),
this._manualAnnotationService.getTitle(ManualRedactionEntryTypes.REDACTION, this.dossier),
),
onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.REDACTION),
},
@ -541,7 +536,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
dataElement: dataElements.ADD_DICTIONARY,
img: this._convertPath('/assets/icons/general/pdftron-action-add-dict.svg'),
title: this._translateService.instant(
this._manualAnnotationService.getTitle(ManualRedactionEntryTypes.DICTIONARY, this._dossier),
this._manualAnnotationService.getTitle(ManualRedactionEntryTypes.DICTIONARY, this.dossier),
),
onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.DICTIONARY),
},
@ -570,7 +565,11 @@ export class PdfViewerComponent implements OnInit, OnChanges {
];
if (this.canPerformActions && !this.utils.isCurrentPageExcluded) {
this.instance.UI.enableTools(['AnnotationCreateRectangle']);
try {
this.instance.UI.enableTools(['AnnotationCreateRectangle']);
} catch (e) {
console.log(e);
}
this.instance.UI.enableElements(elements);
if (this._selectedText.length > 2) {

11
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
View File

@ -76,10 +76,11 @@
(manualAnnotationRequested)="openManualAnnotationDialog($event)"
(pageChanged)="viewerPageChanged($event)"
(viewerReady)="viewerReady($event)"
*ngIf="displayPDFViewer"
*ngIf="displayPdfViewer"
[annotations]="annotations"
[canPerformActions]="canPerformAnnotationActions$ | async"
[fileData]="fileData.fileData"
[dossier]="dossier"
[fileData]="fileData?.fileData"
[file]="file"
[shouldDeselectAnnotationsOnPageChange]="shouldDeselectAnnotationsOnPageChange"
></redaction-pdf-viewer>
@ -93,11 +94,7 @@
icon="red:needs-work"
></iqser-empty-state>
<redaction-document-info
*ngIf="viewDocumentInfo$ | async"
[dossier]="dossier"
[file]="fileData.file"
></redaction-document-info>
<redaction-document-info *ngIf="viewDocumentInfo$ | async" [dossier]="dossier" [file]="file"></redaction-document-info>
<redaction-file-workload
#fileWorkloadComponent

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

@ -76,7 +76,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
annotationData: AnnotationData;
selectedAnnotations: AnnotationWrapper[];
hideSkipped = false;
displayPDFViewer = false;
displayPdfViewer = false;
@ViewChild(PdfViewerComponent) readonly viewerComponent: PdfViewerComponent;
readonly dossierId: string;
readonly canPerformAnnotationActions$: Observable<boolean>;
@ -217,9 +217,9 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
}
ngOnDetach(): void {
this.displayPDFViewer = false;
this._changeDetectorRef.markForCheck();
this.displayPdfViewer = false;
super.ngOnDestroy();
this._changeDetectorRef.markForCheck();
}
async ngOnAttach(previousRoute: ActivatedRouteSnapshot): Promise<boolean> {
@ -230,6 +230,8 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
await this.ngOnInit();
this._lastPage = previousRoute.queryParams.page;
this._changeDetectorRef.markForCheck();
this._loadingService.stop();
}
async ngOnInit(): Promise<void> {
@ -242,7 +244,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
await this._reanalysisService.reanalyzeFilesForDossier([this.fileId], this.dossierId, true).toPromise();
}
this.displayPDFViewer = true;
this.displayPdfViewer = true;
}
rebuildFilters(deletePreviousAnnotations = false): void {

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "redaction",
"version": "3.84.0",
"version": "3.86.0",
"private": true,
"license": "MIT",
"scripts": {

BIN
paligo-theme.tar.gz
View File

Binary file not shown.