diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts
index 223ac0aa6..a4877078d 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Inject, ViewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject, ViewChild } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { AddEditEntityComponent } from '@shared/components/add-edit-entity/add-edit-entity.component';
import { BaseDialogComponent, IconButtonTypes } from '@iqser/common-ui';
@@ -16,14 +16,10 @@ interface DialogData {
export class AddEntityDialogComponent extends BaseDialogComponent {
readonly iconButtonTypes = IconButtonTypes;
readonly roles = ROLES;
- readonly dossierTemplateId = this._data.dossierTemplateId;
-
+ readonly data = inject
(MAT_DIALOG_DATA);
@ViewChild(AddEditEntityComponent, { static: true }) private readonly _addEditEntityComponent: AddEditEntityComponent;
- constructor(
- protected readonly _dialogRef: MatDialogRef,
- @Inject(MAT_DIALOG_DATA) private readonly _data: DialogData,
- ) {
+ constructor(protected readonly _dialogRef: MatDialogRef) {
super(_dialogRef, false);
}
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/audit-info-dialog/audit-info-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/audit-info-dialog/audit-info-dialog.component.html
index 85ff1afba..6b8f9f46d 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/audit-info-dialog/audit-info-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/audit-info-dialog/audit-info-dialog.component.html
@@ -6,7 +6,7 @@
-
+
{{ entry.key | humanize }}
{{ entry.value }}
diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts
index 4749cf685..eacc00d60 100644
--- a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts
@@ -6,6 +6,11 @@ import { JustificationsService } from '@services/entity-services/justifications.
import { BaseDialogComponent } from '@iqser/common-ui';
import { firstValueFrom } from 'rxjs';
+interface DialogData {
+ justification?: Justification;
+ dossierTemplateId: string;
+}
+
@Component({
templateUrl: './add-edit-justification-dialog.component.html',
changeDetection: ChangeDetectionStrategy.OnPush,
@@ -14,7 +19,7 @@ export class AddEditJustificationDialogComponent extends BaseDialogComponent {
constructor(
private readonly _justificationService: JustificationsService,
protected readonly _dialogRef: MatDialogRef,
- @Inject(MAT_DIALOG_DATA) readonly data: { justification?: Justification; dossierTemplateId: string },
+ @Inject(MAT_DIALOG_DATA) readonly data: DialogData,
) {
super(_dialogRef, !!data.justification);
diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts
index 39c650687..5c59fa254 100644
--- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts
@@ -30,12 +30,12 @@ const placeholderTypes: PlaceholderType[] = ['generalPlaceholders', 'fileAttribu
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class ReportsScreenComponent implements OnInit {
- placeholders$ = new BehaviorSubject([]);
- availableTemplates$ = new BehaviorSubject([]);
+ readonly placeholders$ = new BehaviorSubject([]);
+ readonly availableTemplates$ = new BehaviorSubject([]);
readonly currentUser = getCurrentUser();
readonly roles = ROLES;
+ @ViewChild('fileInput') private readonly _fileInput: ElementRef;
readonly #dossierTemplateId = getParam(DOSSIER_TEMPLATE_ID);
- @ViewChild('fileInput') private _fileInput: ElementRef;
constructor(
private readonly _reportTemplateService: ReportTemplateService,
@@ -91,7 +91,7 @@ export class ReportsScreenComponent implements OnInit {
},
};
- this._dialogService.openDialog('confirm', data, null, async result => {
+ this._dialogService.openDialog('confirm', data, null, async (result: number) => {
if (result) {
const multiFileReport = result > 1;
if (
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
index f12e67ff5..d89c12eb8 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
@@ -1,11 +1,10 @@
-import { ChangeDetectorRef, Component, ElementRef, Inject, OnInit, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core';
import WebViewer, { WebViewerInstance } from '@pdftron/webviewer';
import { HttpClient } from '@angular/common/http';
import { FormBuilder, FormGroup } from '@angular/forms';
import {
AsControl,
BASE_HREF_FN,
- BaseHrefFn,
Debounce,
getCurrentUser,
getParam,
@@ -64,9 +63,10 @@ export class WatermarkScreenComponent implements OnInit {
];
readonly orientationOptions = ['DIAGONAL', 'HORIZONTAL', 'VERTICAL'];
instance: WebViewerInstance;
- readonly #loaded$ = new BehaviorSubject(false);
- readonly loaded$ = this.#loaded$.asObservable().pipe(tap(() => setTimeout(() => this._changeDetectorRef.detectChanges())));
+ readonly loaded$: Observable;
@ViewChild('viewer', { static: true }) private readonly _viewer: ElementRef;
+ private readonly _convertPath = inject(BASE_HREF_FN);
+ readonly #loaded$ = new BehaviorSubject(false);
readonly #dossierTemplateId = getParam(DOSSIER_TEMPLATE_ID);
readonly #watermarkId = Number(getParam(WATERMARK_ID));
#watermark: Partial = {};
@@ -79,13 +79,13 @@ export class WatermarkScreenComponent implements OnInit {
private readonly _loadingService: LoadingService,
private readonly _tenantContextHolder: TenantContextHolder,
private readonly _licenseService: LicenseService,
- @Inject(BASE_HREF_FN) private readonly _convertPath: BaseHrefFn,
private readonly _watermarkService: WatermarkService,
private readonly _userPreferenceService: UserPreferenceService,
private readonly _router: Router,
private readonly _changeDetectorRef: ChangeDetectorRef,
watermarksMapService: WatermarksMapService,
) {
+ this.loaded$ = this.#loaded$.asObservable().pipe(tap(() => setTimeout(() => this._changeDetectorRef.detectChanges())));
const watermark$ = watermarksMapService.watch$(this.#dossierTemplateId, this.#watermarkId);
const obs$: Observable> = this.#watermarkId ? watermark$ : of(DEFAULT_WATERMARK);
this.watermark$ = obs$.pipe(tap(watermark => this.#initForm(watermark)));
@@ -125,15 +125,15 @@ export class WatermarkScreenComponent implements OnInit {
return form;
}
- async ngOnInit() {
- await this.#loadViewer();
- }
-
@Debounce()
async configChanged() {
await this.#drawWatermark();
}
+ async ngOnInit() {
+ await this.#loadViewer();
+ }
+
async save(): Promise {
const watermark: IWatermark = {
id: this.#watermark.id,
diff --git a/apps/red-ui/src/app/modules/admin/services/audit.service.ts b/apps/red-ui/src/app/modules/admin/services/audit.service.ts
index cb586ed42..e451a924e 100644
--- a/apps/red-ui/src/app/modules/admin/services/audit.service.ts
+++ b/apps/red-ui/src/app/modules/admin/services/audit.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
-import { GenericService, RequiredParam, Validate } from '@iqser/common-ui';
+import { GenericService } from '@iqser/common-ui';
import { IAudit, IAuditResponse, IAuditSearchRequest, ICategory } from '@red/domain';
import { Observable } from 'rxjs';
@@ -11,8 +11,7 @@ export class AuditService extends GenericService {
return super.getAll(`${this._defaultModelPath}/categories`);
}
- @Validate()
- searchAuditLog(@RequiredParam() body: IAuditSearchRequest): Observable {
+ searchAuditLog(body: IAuditSearchRequest): Observable {
return this._post(body, `${this._defaultModelPath}/search`);
}
}
diff --git a/apps/red-ui/src/app/modules/admin/services/digital-signature.service.ts b/apps/red-ui/src/app/modules/admin/services/digital-signature.service.ts
index 998ebf473..90fb98194 100644
--- a/apps/red-ui/src/app/modules/admin/services/digital-signature.service.ts
+++ b/apps/red-ui/src/app/modules/admin/services/digital-signature.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
-import { filterEach, GenericService, RequiredParam, Validate } from '@iqser/common-ui';
+import { filterEach, GenericService } from '@iqser/common-ui';
import { forkJoin, Observable, of } from 'rxjs';
import {
IDigitalSignatureRequest,
@@ -14,18 +14,15 @@ import { catchError, map } from 'rxjs/operators';
export class DigitalSignatureService extends GenericService {
protected readonly _defaultModelPath = 'digital-signature';
- @Validate()
- updateSignature(@RequiredParam() body: IPkcsDigitalSignatureRequest): Observable {
+ updateSignature(body: IPkcsDigitalSignatureRequest): Observable {
return this._put(body);
}
- @Validate()
- saveSignature(@RequiredParam() body: IPkcsDigitalSignature): Observable {
+ saveSignature(body: IPkcsDigitalSignature): Observable {
return this._post(body);
}
- @Validate()
- saveKmsSignature(@RequiredParam() body: IKmsDigitalSignature): Observable {
+ saveKmsSignature(body: IKmsDigitalSignature): Observable {
return this._post(body, `${this._defaultModelPath}/kms`);
}
diff --git a/apps/red-ui/src/app/modules/admin/services/rules.service.ts b/apps/red-ui/src/app/modules/admin/services/rules.service.ts
index f91956b43..bb221a185 100644
--- a/apps/red-ui/src/app/modules/admin/services/rules.service.ts
+++ b/apps/red-ui/src/app/modules/admin/services/rules.service.ts
@@ -1,18 +1,16 @@
import { Injectable } from '@angular/core';
-import { GenericService, RequiredParam, Validate } from '@iqser/common-ui';
+import { GenericService } from '@iqser/common-ui';
import { IRules } from '@red/domain';
@Injectable()
export class RulesService extends GenericService {
protected readonly _defaultModelPath = 'rules';
- @Validate()
- download(@RequiredParam() dossierTemplateId: string) {
+ download(dossierTemplateId: string) {
return this._getOne([dossierTemplateId]);
}
- @Validate()
- uploadRules(@RequiredParam() body: IRules) {
+ uploadRules(body: IRules) {
return this._post(body);
}
}
diff --git a/apps/red-ui/src/app/modules/admin/services/smtp-config.service.ts b/apps/red-ui/src/app/modules/admin/services/smtp-config.service.ts
index 41024bbc1..b0a702473 100644
--- a/apps/red-ui/src/app/modules/admin/services/smtp-config.service.ts
+++ b/apps/red-ui/src/app/modules/admin/services/smtp-config.service.ts
@@ -1,18 +1,16 @@
import { Injectable } from '@angular/core';
-import { GenericService, RequiredParam, Validate } from '@iqser/common-ui';
+import { GenericService } from '@iqser/common-ui';
import { ISmtpConfiguration } from '@red/domain';
@Injectable()
export class SmtpConfigService extends GenericService {
protected readonly _defaultModelPath = 'configuration';
- @Validate()
- updateSMTPConfiguration(@RequiredParam() body: ISmtpConfiguration) {
+ updateSMTPConfiguration(body: ISmtpConfiguration) {
return this._post(body, `${this._defaultModelPath}/smtp`);
}
- @Validate()
- testSMTPConfiguration(@RequiredParam() body: ISmtpConfiguration) {
+ testSMTPConfiguration(body: ISmtpConfiguration) {
return this._post(body, `${this._defaultModelPath}/smtp/test`);
}
diff --git a/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html
index 37ff664ac..3c61d6076 100644
--- a/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html
+++ b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html
@@ -3,7 +3,7 @@
[config]="dossiersChartConfig$ | async"
[radius]="80"
[strokeWidth]="15"
- [subtitles]="['dossier-template-stats.active-dossiers' | translate: { count: stats.numberOfActiveDossiers }]"
+ [subtitles]="['dossier-template-stats.active-dossiers' | translate : { count: stats.numberOfActiveDossiers }]"
filterKey="dossierStatesFilters"
>
@@ -29,10 +29,10 @@
diff --git a/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts b/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts
index 879e5a07e..bae39ff8c 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts
@@ -11,7 +11,7 @@ import type {
ManualRedactionActions,
} from '@red/domain';
import { type AnnotationWrapper } from '@models/file/annotation.wrapper';
-import { GenericService, IqserPermissionsService, List, RequiredParam, Toaster, Validate } from '@iqser/common-ui';
+import { GenericService, IqserPermissionsService, List, Toaster } from '@iqser/common-ui';
import { tap } from 'rxjs/operators';
import { PermissionsService } from '@services/permissions.service';
import { dictionaryActionsTranslations, manualRedactionActionsTranslations } from '@translations/annotation-actions-translations';
@@ -53,15 +53,13 @@ export class ManualRedactionService extends GenericService {
super();
}
- @Validate()
- async addComment(@RequiredParam() comment: string, @RequiredParam() annotationId: string, dossierId: string, fileId: string) {
+ async addComment(comment: string, annotationId: string, dossierId: string, fileId: string) {
const url = `${this._defaultModelPath}/comment/add/${dossierId}/${fileId}/${annotationId}`;
const request = await firstValueFrom(this._post<{ commentId: string }>({ text: comment }, url));
return request.commentId;
}
- @Validate()
- deleteComment(@RequiredParam() commentId: string, @RequiredParam() annotationId: string, dossierId: string, fileId: string) {
+ deleteComment(commentId: string, annotationId: string, dossierId: string, fileId: string) {
const url = `${this._defaultModelPath}/comment/undo/${dossierId}/${fileId}/${annotationId}/${commentId}`;
return firstValueFrom(super.delete({}, url));
}
@@ -180,116 +178,73 @@ export class ManualRedactionService extends GenericService {
}
}
- @Validate()
- add(@RequiredParam() body: List, @RequiredParam() dossierId: string, @RequiredParam() fileId: string) {
+ add(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRedaction}/add/${dossierId}/${fileId}`).pipe(this.#log('Add', body));
}
- @Validate()
- recategorize(
- @RequiredParam() body: List,
- @RequiredParam() dossierId: string,
- @RequiredParam() fileId: string,
- ) {
+ recategorize(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRedaction}/recategorize/${dossierId}/${fileId}`).pipe(this.#log('Recategorize', body));
}
- @Validate()
- requestRecategorize(
- @RequiredParam() body: List,
- @RequiredParam() dossierId: string,
- @RequiredParam() fileId: string,
- ) {
+ requestRecategorize(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRequest}/recategorize/${dossierId}/${fileId}`).pipe(this.#log('Request recategorize', body));
}
- @Validate()
- legalBasisChange(
- @RequiredParam() body: List,
- @RequiredParam() dossierId: string,
- @RequiredParam() fileId: string,
- ) {
+ legalBasisChange(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRedaction}/legalBasisChange/${dossierId}/${fileId}`).pipe(
this.#log('Legal basis change', body),
);
}
- @Validate()
- requestLegalBasisChange(
- @RequiredParam() body: List,
- @RequiredParam() dossierId: string,
- @RequiredParam() fileId: string,
- ) {
+ requestLegalBasisChange(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRequest}/legalBasis/${dossierId}/${fileId}`).pipe(
this.#log('Request legal basis change', body),
);
}
- @Validate()
- requestRemoveRedaction(
- @RequiredParam() body: List,
- @RequiredParam() dossierId: string,
- @RequiredParam() fileId: string,
- ) {
+ requestRemoveRedaction(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRequest}/remove/${dossierId}/${fileId}`).pipe(this.#log('Request remove', body));
}
- @Validate()
- approve(@RequiredParam() annotationIds: List, @RequiredParam() dossierId: string, @RequiredParam() fileId: string) {
+ approve(annotationIds: List, dossierId: string, fileId: string) {
return this._post(annotationIds, `${this._defaultModelPath}/bulk/approve/${dossierId}/${fileId}`).pipe(
this.#log('Approve', annotationIds),
this.#showToast('approve'),
);
}
- @Validate()
- decline(@RequiredParam() annotationIds: List, @RequiredParam() dossierId: string, @RequiredParam() fileId: string) {
+ decline(annotationIds: List, dossierId: string, fileId: string) {
return this._post(annotationIds, `${this._defaultModelPath}/bulk/decline/${dossierId}/${fileId}`).pipe(
this.#log('Decline', annotationIds),
);
}
- @Validate()
- undo(@RequiredParam() annotationIds: List, @RequiredParam() dossierId: string, @RequiredParam() fileId: string) {
+ undo(annotationIds: List, dossierId: string, fileId: string) {
const url = `${this._defaultModelPath}/bulk/undo/${dossierId}/${fileId}`;
return super.delete(annotationIds, url).pipe(this.#log('Undo', annotationIds));
}
- @Validate()
- remove(@RequiredParam() body: List, @RequiredParam() dossierId: string, @RequiredParam() fileId: string) {
+ remove(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRedaction}/remove/${dossierId}/${fileId}`).pipe(this.#log('Remove', body));
}
- @Validate()
- requestAdd(@RequiredParam() body: List, @RequiredParam() dossierId: string, @RequiredParam() fileId: string) {
+ requestAdd(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRequest}/add/${dossierId}/${fileId}`).pipe(this.#log('Request add', body));
}
- @Validate()
- forceRedaction(
- @RequiredParam() body: List,
- @RequiredParam() dossierId: string,
- @RequiredParam() fileId: string,
- ) {
+ forceRedaction(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRedaction}/force/${dossierId}/${fileId}`).pipe(this.#log('Force redaction', body));
}
- @Validate()
- forceRequest(
- @RequiredParam() body: List,
- @RequiredParam() dossierId: string,
- @RequiredParam() fileId: string,
- ) {
+ forceRequest(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRequest}/force/${dossierId}/${fileId}`).pipe(this.#log('Request force redaction', body));
}
- @Validate()
- resize(@RequiredParam() body: List, @RequiredParam() dossierId: string, @RequiredParam() fileId: string) {
+ resize(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRedaction}/resize/${dossierId}/${fileId}`).pipe(this.#log('Resize', body));
}
- @Validate()
- requestResize(@RequiredParam() body: List, @RequiredParam() dossierId: string, @RequiredParam() fileId: string) {
+ requestResize(body: List, dossierId: string, fileId: string) {
return this._post(body, `${this.#bulkRequest}/resize/${dossierId}/${fileId}`).pipe(this.#log('Request resize', body));
}
@@ -302,10 +257,10 @@ export class ManualRedactionService extends GenericService {
#showToast(action: ManualRedactionActions | DictionaryActions, isDictionary = false) {
return tap({
next: () => this._toaster.success(getMessage(action, isDictionary), { positionClass: 'toast-file-preview' }),
- error: (error: HttpErrorResponse) => {
- const isConflict = error.status === HttpStatusCode.Conflict;
+ error: (error: unknown) => {
+ const isConflict = (error as HttpErrorResponse).status === HttpStatusCode.Conflict;
this._toaster.error(getMessage(action, isDictionary, true, isConflict), {
- error,
+ error: error as HttpErrorResponse,
positionClass: 'toast-file-preview',
});
},
@@ -315,10 +270,10 @@ export class ManualRedactionService extends GenericService {
#showAddToDictionaryToast(body: List, dictionaryLabel?: string) {
return tap({
next: () => this._toaster.success(getDictionaryMessage('add'), { positionClass: 'toast-file-preview' }),
- error: (error: HttpErrorResponse) => {
- const isConflict = error.status === HttpStatusCode.Conflict;
+ error: (error: unknown) => {
+ const isConflict = (error as HttpErrorResponse).status === HttpStatusCode.Conflict;
this._toaster.error(getDictionaryMessage('add', true, isConflict), {
- error,
+ error: error as HttpErrorResponse,
params: {
dictionaryName: dictionaryLabel,
content: body[0].value,
diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
index e3c3c2045..b7cd0b2d4 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Inject, Injectable, NgZone } from '@angular/core';
+import { ChangeDetectorRef, inject, Injectable, NgZone } from '@angular/core';
import { IHeaderElement, IManualRedactionEntry, ViewModes } from '@red/domain';
import { Core } from '@pdftron/webviewer';
import { TranslateService } from '@ngx-translate/core';
@@ -9,7 +9,7 @@ import {
} from '@models/file/manual-redaction-entry.wrapper';
import { AnnotationDrawService } from '../../pdf-viewer/services/annotation-draw.service';
import { UserPreferenceService } from '@users/user-preference.service';
-import { BASE_HREF_FN, BaseHrefFn, IqserPermissionsService, isJustOne, shareDistinctLast } from '@iqser/common-ui';
+import { BASE_HREF_FN, IqserPermissionsService, isJustOne, shareDistinctLast } from '@iqser/common-ui';
import { toPosition } from '../utils/pdf-calculation.utils';
import { MultiSelectService } from './multi-select.service';
import { FilePreviewStateService } from './file-preview-state.service';
@@ -48,8 +48,8 @@ export class PdfProxyService {
shareDistinctLast(),
);
canPerformActions = true;
-
readonly canPerformAnnotationActions$: Observable;
+ private readonly _convertPath = inject(BASE_HREF_FN);
readonly #visibilityOffIcon = this._convertPath('/assets/icons/general/visibility-off.svg');
readonly #visibilityIcon = this._convertPath('/assets/icons/general/visibility.svg');
readonly #falsePositiveIcon = this._convertPath('/assets/icons/general/pdftron-action-false-positive.svg');
@@ -59,7 +59,6 @@ export class PdfProxyService {
readonly #addDictIcon = this._convertPath('/assets/icons/general/pdftron-action-add-dict.svg');
constructor(
- @Inject(BASE_HREF_FN) private readonly _convertPath: BaseHrefFn,
private readonly _translateService: TranslateService,
private readonly _manualRedactionService: ManualRedactionService,
private readonly _annotationsActionsService: AnnotationActionsService,
@@ -117,6 +116,145 @@ export class PdfProxyService {
this._documentViewer.setRectangleToolStyles(color);
}
+ private _configureRectangleAnnotationPopup(annotation: Annotation) {
+ if (!this._pdf.isCompare || annotation.getPageNumber() % 2 === 1) {
+ const addRectangleButton = {
+ type: 'actionButton',
+ dataElement: TextPopups.ADD_RECTANGLE,
+ img: this.#addRedactionIcon,
+ title: this.#getTitle(ManualRedactionEntryTypes.REDACTION),
+ onClick: () => this._addRectangleManualRedaction(),
+ };
+
+ this._pdf.instance.UI.annotationPopup.add([addRectangleButton]);
+ }
+ }
+
+ private _addRectangleManualRedaction() {
+ const activeAnnotation = this._annotationManager.selected[0];
+ const activePage = activeAnnotation.getPageNumber();
+ const quads = [this._annotationDrawService.annotationToQuads(activeAnnotation)];
+ const manualRedactionEntry = this._getManualRedaction({ [activePage]: quads });
+ this._cleanUpSelectionAndButtonState();
+
+ this.manualAnnotationRequested$.next({ manualRedactionEntry, type: 'REDACTION' });
+ }
+
+ private _cleanUpSelectionAndButtonState() {
+ this._viewerHeaderService.disable([HeaderElements.SHAPE_TOOL_GROUP_BUTTON]);
+ this._viewerHeaderService.enable([HeaderElements.SHAPE_TOOL_GROUP_BUTTON]);
+ }
+
+ private _configureTextPopup() {
+ const popups: IHeaderElement[] = [];
+
+ if (!this._state.file.isApproved) {
+ // Adding directly to the false-positive dict is only available in dev-mode
+ if (this._userPreferenceService.areDevFeaturesEnabled) {
+ popups.push({
+ type: 'actionButton',
+ dataElement: TextPopups.ADD_FALSE_POSITIVE,
+ img: this.#falsePositiveIcon,
+ title: this.#getTitle(ManualRedactionEntryTypes.FALSE_POSITIVE),
+ onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.FALSE_POSITIVE),
+ });
+ }
+
+ if (this._iqserPermissionsService.has(ROLES.redactions.write) || this._iqserPermissionsService.has(ROLES.redactions.request)) {
+ popups.push({
+ type: 'actionButton',
+ dataElement: TextPopups.ADD_REDACTION,
+ img: this.#addRedactionIcon,
+ title: this.#getTitle(ManualRedactionEntryTypes.REDACTION),
+ onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.REDACTION),
+ });
+
+ if (!this._iqserPermissionsService.has(ROLES.getRss)) {
+ popups.push({
+ type: 'actionButton',
+ dataElement: TextPopups.ADD_DICTIONARY,
+ img: this.#addDictIcon,
+ title: this.#getTitle(ManualRedactionEntryTypes.DICTIONARY),
+ onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.DICTIONARY),
+ });
+ }
+ }
+ }
+
+ this._pdf.configureTextPopups(popups);
+
+ return this._handleCustomActions();
+ }
+
+ private _addManualRedactionOfType(type: ManualRedactionEntryType) {
+ const selectedQuads: Record = this._pdf.documentViewer.getSelectedTextQuads();
+ const text = this._documentViewer.selectedText;
+ const manualRedactionEntry = this._getManualRedaction(selectedQuads, text, true);
+ this.manualAnnotationRequested$.next({ manualRedactionEntry, type });
+ }
+
+ private _handleCustomActions() {
+ const isCurrentPageExcluded = this._state.file.isPageExcluded(this._pdf.currentPage);
+
+ if (this._viewModeService.viewMode === ViewModes.REDACTED) {
+ this._viewerHeaderService.enable([HeaderElements.TOGGLE_READABLE_REDACTIONS]);
+ } else {
+ this._viewerHeaderService.disable([HeaderElements.TOGGLE_READABLE_REDACTIONS]);
+ }
+
+ if (!isCurrentPageExcluded) {
+ if (this.canPerformActions) {
+ try {
+ this._pdf.instance.UI.enableTools([AnnotationToolNames.AnnotationCreateRectangle]);
+ } catch (e) {
+ // happens
+ }
+ this._pdf.enable(TEXT_POPUPS_TO_TOGGLE);
+ this._viewerHeaderService.enable(HEADER_ITEMS_TO_TOGGLE);
+
+ if (this._documentViewer.selectedText.length > 2) {
+ this._pdf.enable([TextPopups.ADD_DICTIONARY, TextPopups.ADD_FALSE_POSITIVE]);
+ }
+ } else {
+ this._pdf.instance.UI.disableTools([AnnotationToolNames.AnnotationCreateRectangle]);
+ this._pdf.disable(TEXT_POPUPS_TO_TOGGLE);
+ this._viewerHeaderService.disable(HEADER_ITEMS_TO_TOGGLE);
+ }
+ } else {
+ let textPopupElementsToDisable = [...TEXT_POPUPS_TO_TOGGLE];
+ let headerElementsToDisable = [...HEADER_ITEMS_TO_TOGGLE];
+
+ if (this.canPerformActions) {
+ this._pdf.enable(ALLOWED_ACTIONS_WHEN_PAGE_EXCLUDED);
+ this._viewerHeaderService.enable(ALLOWED_ACTIONS_WHEN_PAGE_EXCLUDED as HeaderElementType[]);
+
+ textPopupElementsToDisable = textPopupElementsToDisable.filter(
+ element => !ALLOWED_ACTIONS_WHEN_PAGE_EXCLUDED.includes(element),
+ );
+ headerElementsToDisable = headerElementsToDisable.filter(element => !ALLOWED_ACTIONS_WHEN_PAGE_EXCLUDED.includes(element));
+ }
+
+ this._pdf.disable(textPopupElementsToDisable);
+ this._viewerHeaderService.disable(headerElementsToDisable);
+ }
+ }
+
+ private _getManualRedaction(quads: Record, text?: string, convertQuads = false): IManualRedactionEntry {
+ const entry: IManualRedactionEntry = { positions: [] };
+
+ for (const key of Object.keys(quads)) {
+ for (const quad of quads[key]) {
+ const page = parseInt(key, 10);
+ const pageHeight = this._documentViewer.getHeight(page);
+ entry.positions.push(toPosition(page, pageHeight, convertQuads ? this._pdf.translateQuad(page, quad) : quad));
+ }
+ }
+
+ entry.value = text;
+ entry.rectangle = !text;
+ return entry;
+ }
+
#deactivateMultiSelect() {
this._multiSelectService.deactivate();
this._annotationManager.deselect();
@@ -236,146 +374,7 @@ export class PdfProxyService {
this._pdf.instance.UI.annotationPopup.add(actions);
}
- private _configureRectangleAnnotationPopup(annotation: Annotation) {
- if (!this._pdf.isCompare || annotation.getPageNumber() % 2 === 1) {
- const addRectangleButton = {
- type: 'actionButton',
- dataElement: TextPopups.ADD_RECTANGLE,
- img: this.#addRedactionIcon,
- title: this.#getTitle(ManualRedactionEntryTypes.REDACTION),
- onClick: () => this._addRectangleManualRedaction(),
- };
-
- this._pdf.instance.UI.annotationPopup.add([addRectangleButton]);
- }
- }
-
- private _addRectangleManualRedaction() {
- const activeAnnotation = this._annotationManager.selected[0];
- const activePage = activeAnnotation.getPageNumber();
- const quads = [this._annotationDrawService.annotationToQuads(activeAnnotation)];
- const manualRedactionEntry = this._getManualRedaction({ [activePage]: quads });
- this._cleanUpSelectionAndButtonState();
-
- this.manualAnnotationRequested$.next({ manualRedactionEntry, type: 'REDACTION' });
- }
-
- private _cleanUpSelectionAndButtonState() {
- this._viewerHeaderService.disable([HeaderElements.SHAPE_TOOL_GROUP_BUTTON]);
- this._viewerHeaderService.enable([HeaderElements.SHAPE_TOOL_GROUP_BUTTON]);
- }
-
- private _configureTextPopup() {
- const popups: IHeaderElement[] = [];
-
- if (!this._state.file.isApproved) {
- // Adding directly to the false-positive dict is only available in dev-mode
- if (this._userPreferenceService.areDevFeaturesEnabled) {
- popups.push({
- type: 'actionButton',
- dataElement: TextPopups.ADD_FALSE_POSITIVE,
- img: this.#falsePositiveIcon,
- title: this.#getTitle(ManualRedactionEntryTypes.FALSE_POSITIVE),
- onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.FALSE_POSITIVE),
- });
- }
-
- if (this._iqserPermissionsService.has(ROLES.redactions.write) || this._iqserPermissionsService.has(ROLES.redactions.request)) {
- popups.push({
- type: 'actionButton',
- dataElement: TextPopups.ADD_REDACTION,
- img: this.#addRedactionIcon,
- title: this.#getTitle(ManualRedactionEntryTypes.REDACTION),
- onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.REDACTION),
- });
-
- if (!this._iqserPermissionsService.has(ROLES.getRss)) {
- popups.push({
- type: 'actionButton',
- dataElement: TextPopups.ADD_DICTIONARY,
- img: this.#addDictIcon,
- title: this.#getTitle(ManualRedactionEntryTypes.DICTIONARY),
- onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.DICTIONARY),
- });
- }
- }
- }
-
- this._pdf.configureTextPopups(popups);
-
- return this._handleCustomActions();
- }
-
#getTitle(type: ManualRedactionEntryType) {
return this._translateService.instant(this._manualRedactionService.getTitle(type, this._state.dossier));
}
-
- private _addManualRedactionOfType(type: ManualRedactionEntryType) {
- const selectedQuads: Record = this._pdf.documentViewer.getSelectedTextQuads();
- const text = this._documentViewer.selectedText;
- const manualRedactionEntry = this._getManualRedaction(selectedQuads, text, true);
- this.manualAnnotationRequested$.next({ manualRedactionEntry, type });
- }
-
- private _handleCustomActions() {
- const isCurrentPageExcluded = this._state.file.isPageExcluded(this._pdf.currentPage);
-
- if (this._viewModeService.viewMode === ViewModes.REDACTED) {
- this._viewerHeaderService.enable([HeaderElements.TOGGLE_READABLE_REDACTIONS]);
- } else {
- this._viewerHeaderService.disable([HeaderElements.TOGGLE_READABLE_REDACTIONS]);
- }
-
- if (!isCurrentPageExcluded) {
- if (this.canPerformActions) {
- try {
- this._pdf.instance.UI.enableTools([AnnotationToolNames.AnnotationCreateRectangle]);
- } catch (e) {
- // happens
- }
- this._pdf.enable(TEXT_POPUPS_TO_TOGGLE);
- this._viewerHeaderService.enable(HEADER_ITEMS_TO_TOGGLE);
-
- if (this._documentViewer.selectedText.length > 2) {
- this._pdf.enable([TextPopups.ADD_DICTIONARY, TextPopups.ADD_FALSE_POSITIVE]);
- }
- } else {
- this._pdf.instance.UI.disableTools([AnnotationToolNames.AnnotationCreateRectangle]);
- this._pdf.disable(TEXT_POPUPS_TO_TOGGLE);
- this._viewerHeaderService.disable(HEADER_ITEMS_TO_TOGGLE);
- }
- } else {
- let textPopupElementsToDisable = [...TEXT_POPUPS_TO_TOGGLE];
- let headerElementsToDisable = [...HEADER_ITEMS_TO_TOGGLE];
-
- if (this.canPerformActions) {
- this._pdf.enable(ALLOWED_ACTIONS_WHEN_PAGE_EXCLUDED);
- this._viewerHeaderService.enable(ALLOWED_ACTIONS_WHEN_PAGE_EXCLUDED as HeaderElementType[]);
-
- textPopupElementsToDisable = textPopupElementsToDisable.filter(
- element => !ALLOWED_ACTIONS_WHEN_PAGE_EXCLUDED.includes(element),
- );
- headerElementsToDisable = headerElementsToDisable.filter(element => !ALLOWED_ACTIONS_WHEN_PAGE_EXCLUDED.includes(element));
- }
-
- this._pdf.disable(textPopupElementsToDisable);
- this._viewerHeaderService.disable(headerElementsToDisable);
- }
- }
-
- private _getManualRedaction(quads: Record, text?: string, convertQuads = false): IManualRedactionEntry {
- const entry: IManualRedactionEntry = { positions: [] };
-
- for (const key of Object.keys(quads)) {
- for (const quad of quads[key]) {
- const page = parseInt(key, 10);
- const pageHeight = this._documentViewer.getHeight(page);
- entry.positions.push(toPosition(page, pageHeight, convertQuads ? this._pdf.translateQuad(page, quad) : quad));
- }
- }
-
- entry.value = text;
- entry.rectangle = !text;
- return entry;
- }
}
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts
index aaf4f88d2..c1e9d47d3 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts
@@ -1,6 +1,6 @@
-import { inject, Inject, Injectable, Injector } from '@angular/core';
+import { inject, Injectable, Injector } from '@angular/core';
import WebViewer, { Core, WebViewerInstance, WebViewerOptions } from '@pdftron/webviewer';
-import { BASE_HREF_FN, BaseHrefFn, ErrorService, getConfig, shareDistinctLast } from '@iqser/common-ui';
+import { BASE_HREF_FN, ErrorService, getConfig, shareDistinctLast } from '@iqser/common-ui';
import { AppConfig, File, IHeaderElement } from '@red/domain';
import { ActivatedRoute } from '@angular/router';
import { map, startWith } from 'rxjs/operators';
@@ -35,6 +35,7 @@ export class PdfViewer {
compareMode$: Observable;
totalPages$: Observable;
+ private readonly _convertPath = inject(BASE_HREF_FN);
#instance: WebViewerInstance;
readonly #licenseKey = inject(LicenseService).activeLicenseKey;
readonly #config = getConfig();
@@ -54,7 +55,6 @@ export class PdfViewer {
private readonly _injector: Injector,
private readonly _errorService: ErrorService,
private readonly _userPreferenceService: UserPreferenceService,
- @Inject(BASE_HREF_FN) private readonly _convertPath: BaseHrefFn,
) {}
get instance() {
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/readable-redactions.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/readable-redactions.service.ts
index ee7eb278d..6b453ee04 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/services/readable-redactions.service.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/services/readable-redactions.service.ts
@@ -1,5 +1,5 @@
-import { Inject, Injectable } from '@angular/core';
-import { BASE_HREF_FN, BaseHrefFn, bool } from '@iqser/common-ui';
+import { inject, Injectable } from '@angular/core';
+import { BASE_HREF_FN } from '@iqser/common-ui';
import { TranslateService } from '@ngx-translate/core';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { HeaderElements } from '../../file-preview/utils/constants';
@@ -13,12 +13,12 @@ import Annotation = Core.Annotations.Annotation;
@Injectable()
export class ReadableRedactionsService {
readonly active$: Observable;
+ private readonly _convertPath = inject(BASE_HREF_FN);
readonly #enableIcon = this._convertPath('/assets/icons/general/redaction-preview.svg');
readonly #disableIcon = this._convertPath('/assets/icons/general/redaction-final.svg');
readonly #active$ = new BehaviorSubject(true);
constructor(
- @Inject(BASE_HREF_FN) private readonly _convertPath: BaseHrefFn,
private readonly _pdf: PdfViewer,
private readonly _translateService: TranslateService,
private readonly _annotationManager: REDAnnotationManager,
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/tooltips.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/tooltips.service.ts
index c51474c6c..945d64bbb 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/services/tooltips.service.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/services/tooltips.service.ts
@@ -1,19 +1,19 @@
-import { Inject, Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { UserPreferenceService } from '@users/user-preference.service';
import { HeaderElements } from '../../file-preview/utils/constants';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { TranslateService } from '@ngx-translate/core';
-import { BASE_HREF_FN, BaseHrefFn } from '@iqser/common-ui';
+import { BASE_HREF_FN } from '@iqser/common-ui';
import { PdfViewer } from './pdf-viewer.service';
import { REDDocumentViewer } from './document-viewer.service';
@Injectable()
export class TooltipsService {
+ private readonly _convertPath = inject(BASE_HREF_FN);
readonly #enableIcon = this._convertPath('/assets/icons/general/pdftron-action-enable-tooltips.svg');
readonly #disableIcon = this._convertPath('/assets/icons/general/pdftron-action-disable-tooltips.svg');
constructor(
- @Inject(BASE_HREF_FN) private readonly _convertPath: BaseHrefFn,
private readonly _pdf: PdfViewer,
private readonly _documentViewer: REDDocumentViewer,
private readonly _userPreferenceService: UserPreferenceService,
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts
index 226bae523..152b3c2cd 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts
@@ -1,8 +1,8 @@
-import { Inject, Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { IHeaderElement, RotationTypes } from '@red/domain';
import { HeaderElements, HeaderElementType } from '../../file-preview/utils/constants';
import { TranslateService } from '@ngx-translate/core';
-import { BASE_HREF_FN, BaseHrefFn } from '@iqser/common-ui';
+import { BASE_HREF_FN } from '@iqser/common-ui';
import { TooltipsService } from './tooltips.service';
import { PageRotationService } from './page-rotation.service';
import { PdfViewer } from './pdf-viewer.service';
@@ -23,6 +23,7 @@ const divider: IHeaderElement = {
export class ViewerHeaderService {
readonly events$: Observable;
toggleLoadAnnotations$: Observable;
+ private readonly _convertPath = inject(BASE_HREF_FN);
#buttons: Map;
readonly #config = new Map([
[HeaderElements.SHAPE_TOOL_GROUP_BUTTON, true],
@@ -40,7 +41,6 @@ export class ViewerHeaderService {
readonly #events$ = new Subject();
constructor(
- @Inject(BASE_HREF_FN) private readonly _convertPath: BaseHrefFn,
private readonly _filesMapService: FilesMapService,
private readonly _translateService: TranslateService,
private readonly _pdf: PdfViewer,
@@ -311,19 +311,6 @@ export class ViewerHeaderService {
this.enable([HeaderElements.COMPARE_BUTTON]);
}
- #discardRotation(): void {
- this._rotationService.discardRotation();
- this.disable(ROTATION_ACTION_BUTTONS);
- }
-
- #toggleRotationActionButtons() {
- if (this._rotationService.hasRotations) {
- this.enable(ROTATION_ACTION_BUTTONS);
- } else {
- this.disable(ROTATION_ACTION_BUTTONS);
- }
- }
-
private _closeCompareMode() {
this._pdf.closeCompareMode();
const { dossierId, fileId } = this._pdf;
@@ -353,4 +340,17 @@ export class ViewerHeaderService {
private _isEnabled(key: HeaderElementType): boolean {
return this.#config.get(key);
}
+
+ #discardRotation(): void {
+ this._rotationService.discardRotation();
+ this.disable(ROTATION_ACTION_BUTTONS);
+ }
+
+ #toggleRotationActionButtons() {
+ if (this._rotationService.hasRotations) {
+ this.enable(ROTATION_ACTION_BUTTONS);
+ } else {
+ this.disable(ROTATION_ACTION_BUTTONS);
+ }
+ }
}
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/date-column/date-column.component.html b/apps/red-ui/src/app/modules/shared-dossiers/components/date-column/date-column.component.html
index a270e03f9..2cbd731e0 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/components/date-column/date-column.component.html
+++ b/apps/red-ui/src/app/modules/shared-dossiers/components/date-column/date-column.component.html
@@ -1,3 +1,3 @@
- {{ date | date: 'd MMM yyyy' }}
+ {{ date | date : 'd MMM yyyy' }}
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
index 110ff493e..8c23e65e9 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
@@ -5,7 +5,7 @@
- {{ 'edit-dossier-dialog.dictionary.entries' | translate: { length: (dossierDictionary?.entries || []).length } }}
+ {{ 'edit-dossier-dialog.dictionary.entries' | translate : { length: (dossierDictionary?.entries || []).length } }}
diff --git a/apps/red-ui/src/app/modules/shared/components/file-stats/file-stats.component.html b/apps/red-ui/src/app/modules/shared/components/file-stats/file-stats.component.html
index 0078aa46a..7f7f93323 100644
--- a/apps/red-ui/src/app/modules/shared/components/file-stats/file-stats.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/file-stats/file-stats.component.html
@@ -9,6 +9,6 @@