Compare commits

...

39 Commits

Author SHA1 Message Date
Valentin Mihai
79149ea45f RED-9417 - updated the display condition for excluded page indicator 2024-11-13 17:32:57 +02:00
Nicoleta Panaghiu
06a5d2a844 RED-9337: display reanalyse button for bulk select. 2024-06-25 10:42:17 +03:00
Dan Percic
db1a618061 add pdftron version to assets 2024-06-20 15:24:28 +03:00
Nicoleta Panaghiu
1d68267288 RED-9337: owner and file assignee can reanalyse error file. 2024-06-19 17:02:34 +03:00
Nicoleta Panaghiu
73f6ad7321 RED-9125: upgrade webviewer. 2024-06-07 16:18:01 +03:00
Nicoleta Panaghiu
1eb1512d67 RED-9175: prevent search re-trigger upon navigating the file pages. 2024-06-03 15:42:25 +03:00
Valentin Mihai
ee0d544d94 RED-8342 - Component Editor not showing all values for a multi-value-component 2024-05-27 13:21:34 +03:00
Dan Percic
843dcde601 filter entries without positions 2024-03-07 15:22:57 +02:00
Nicoleta Panaghiu
8ba4721828 RED-8126: hidden sourceMaps. 2024-01-16 09:27:40 +02:00
Dan Percic
0bb0d2591f RED-8128 add frame ancestors CSP 2024-01-15 20:10:57 +02:00
Valentin Mihai
c70d8d75c0 RED-8072 - Do not allow any annotations or annotation changes while auto-analysis is disabled 2023-12-13 12:41:17 +02:00
Valentin Mihai
23a0c0940d RED-8072 - Do not allow any annotations or annotation changes while auto-analysis is disabled 2023-12-12 15:07:11 +02:00
Dan Percic
14e5c53272 Merge branch 'hotfix/4.488.x-filename' into 'release/4.488.x'
Hotfix: Fix filename for export of redaction log json/xml

See merge request redactmanager/red-ui!221
2023-12-07 17:50:39 +01:00
Kresnadi Budisantoso
9e797e6398 Hotfix: Fix filename for export of redaction log json/xml 2023-12-07 16:24:59 +01:00
Valentin Mihai
551445c522 DM-588 - Do not allow any annotations or annotation changes while auto-analysis is disabled 2023-12-07 13:56:53 +02:00
Nicoleta Panaghiu
53f64d0279 RED-8032: backported new way of managing comments. 2023-12-06 16:48:46 +02:00
Dan Percic
d073980d41 RED-7990 fix rule based annotations cannot be resized 2023-12-04 19:07:28 +02:00
Dan Percic
de31be252b RED-7989 update edit entity form 2023-12-04 18:54:38 +02:00
Dan Percic
f1f3bffcf1 RED-7990 fix rule based annotations cannot be resized 2023-11-30 15:52:13 +02:00
Dan Percic
0ad2966a5c DM-604 fix actions show when file is done 2023-11-30 13:49:47 +02:00
Dan Percic
5d97da46cb DM-604 hide watermark options & skip dossier_redaction dictionary 2023-11-29 14:35:51 +02:00
Valentin Mihai
e8fe6f37de RED-7989 - Case Sensitive field not updated correctly in UI 2023-11-29 11:05:35 +02:00
Adina Țeudan
0d7c5efd7d RED-7692: Add linebreak if comment is too long 2023-11-29 00:30:44 +02:00
Valentin Mihai
6493422688 DM-598 - Component values cannot be changed manually 2023-11-28 14:20:47 +02:00
Nicoleta Panaghiu
44dc6519d3 RED-7935: fixed internal server error. 2023-11-28 14:00:19 +02:00
Valentin Mihai
9c951712ae DM-588 - Do not allow any annotations or annotation changes while auto-analysis is disabled 2023-11-27 16:56:59 +02:00
Valentin Mihai
9bdacfcfdb DM-598 - Component values cannot be changed manually 2023-11-27 12:48:58 +02:00
Nicoleta Panaghiu
643541d20c RED-7953: fixed cannot save force annotation. 2023-11-21 14:20:13 +02:00
Valentin Mihai
e7001e1e2b DM-536 - Extraction output bulk download for dossiers 2023-11-20 21:58:10 +02:00
Adina Țeudan
19c3154130 RED-6435: Removed add to dict character limit 2023-11-14 17:49:07 +02:00
Adina Țeudan
52dfb13a15 RED-6435: Cleanup unecessary code 2023-11-14 17:43:49 +02:00
Adina Țeudan
534f84bdba RED-6435: Removed add to dict character limit 2023-11-14 17:43:40 +02:00
Marius Schummer
a7be372068 DM-556: Update en.json to change workload label for dict-based annotations (backport) 2023-11-13 15:48:43 +01:00
Valentin Mihai
28cdf481ea DM-579 - Help Mode Link for Component Download 2023-11-10 20:30:05 +02:00
Valentin Mihai
64a446ebaf DM-536 - Extraction output bulk download for dossiers 2023-11-10 20:17:00 +02:00
Dan Percic
7afbc38e03 DM-536 addition: Change tooltip for standard download button 2023-11-09 18:04:58 +02:00
Valentin Mihai
a881da891d DM-536 - Extraction output bulk download for dossiers 2023-11-08 19:34:06 +02:00
Adina Țeudan
9e6c466c4b RED-7858: Remove Email Report button in License Information screen 2023-11-07 13:50:48 +02:00
Dan Percic
db294fc909 DM-540 backport to documine 2023-11-07 13:50:20 +02:00
53 changed files with 603 additions and 521 deletions

2
.gitignore vendored
View File

@ -48,3 +48,5 @@ migrations.json
*.iml
docker-compose.yml
.nx/cache/

View File

@ -40,7 +40,7 @@
{
"glob": "**/*",
"input": "node_modules/@pdftron/webviewer/public/",
"output": "/assets/wv-resources/"
"output": "/assets/wv-resources/10.9.0"
},
{
"glob": "**/*",
@ -67,7 +67,7 @@
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"sourceMap": false,
"optimization": false,
"namedChunks": true
},

View File

@ -15,7 +15,7 @@ import { ifNotLoggedIn } from '@guards/if-not-logged-in.guard';
import { TrashGuard } from '@guards/trash.guard';
import { CompositeRouteGuard, DEFAULT_REDIRECT_KEY, IqserPermissionsGuard, IqserRoutes, orderedAsyncGuards } from '@iqser/common-ui';
import { TenantSelectComponent } from '@iqser/common-ui/lib/tenants';
import { hasAnyRoleGuard, IqserAuthGuard } from '@iqser/common-ui/lib/users';
import { doesNotHaveAnyRole, hasAnyRole, IqserAuthGuard } from '@iqser/common-ui/lib/users';
import { CustomRouteReuseStrategy } from '@iqser/common-ui/lib/utils';
import { ARCHIVE_ROUTE, BreadcrumbTypes, DOSSIER_ID, DOSSIER_TEMPLATE_ID, DOSSIERS_ARCHIVE, DOSSIERS_ROUTE, FILE_ID } from '@red/domain';
import { RedRoleGuard } from '@users/red-role.guard';
@ -211,14 +211,14 @@ const routes: IqserRoutes = [
},
{
path: ':tenant/main',
canActivate: [orderedAsyncGuards([ifLoggedIn(), mainGuard()])],
canActivate: [orderedAsyncGuards([ifLoggedIn(), hasAnyRole(), mainGuard()])],
component: BaseScreenComponent,
children: mainRoutes,
},
{
path: ':tenant/auth-error',
component: AuthErrorComponent,
canActivate: [hasAnyRoleGuard()],
canActivate: [doesNotHaveAnyRole()],
},
{
path: '**',

View File

@ -1,16 +1,19 @@
import { Injectable, Injector, ProviderToken } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
import { FilesMapService } from '@services/files/files-map.service';
import { FilesService } from '@services/files/files.service';
import { firstValueFrom } from 'rxjs';
import { getConfig } from '@iqser/common-ui';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
import { DOSSIER_ID, DOSSIER_TEMPLATE_ID } from '@red/domain';
import { DossiersService } from '@services/dossiers/dossiers.service';
import { DictionaryService } from '@services/entity-services/dictionary.service';
import { DossierDictionariesMapService } from '@services/entity-services/dossier-dictionaries-map.service';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
import { FilesMapService } from '@services/files/files-map.service';
import { FilesService } from '@services/files/files.service';
import { firstValueFrom } from 'rxjs';
@Injectable({ providedIn: 'root' })
export class DossierFilesGuard implements CanActivate {
readonly isDocumine = getConfig().IS_DOCUMINE;
constructor(
private readonly _injector: Injector,
private readonly _tenantsService: TenantsService,
@ -45,7 +48,7 @@ export class DossierFilesGuard implements CanActivate {
async loadDossierData(dossierId: string, dossierTemplateId: string) {
const promises = [];
if (!this._dictionaryMapService.has(dossierId)) {
if (!this._dictionaryMapService.has(dossierId) && !this.isDocumine) {
const dictionaryPromise = this._dictionaryService.loadDossierDictionary(dossierTemplateId, dossierId);
promises.push(dictionaryPromise);
}

View File

@ -37,11 +37,12 @@ export const canRecategorizeAnnotation = (annotation: AnnotationWrapper, canReca
((annotation.isImage && !annotation.isSuggestion) || annotation.isSuggestionRecategorizeImage || annotation.hintDictionary) &&
!annotation.pending;
export const canResizeAnnotation = (annotation: AnnotationWrapper, canAddRedaction: boolean) =>
export const canResizeAnnotation = (annotation: AnnotationWrapper, canAddRedaction: boolean, hasDictionary = false) =>
canAddRedaction &&
!annotation.isSkipped &&
!annotation.pending &&
(((annotation.isRedacted || annotation.isImage) && !annotation.isSuggestion) ||
annotation.isSuggestionResize ||
annotation.isDictBasedHint ||
annotation.isRecommendation);
annotation.isRecommendation ||
(hasDictionary && annotation.isRuleBased));

View File

@ -2,6 +2,7 @@ import { IqserPermissionsService } from '@iqser/common-ui';
import { Dictionary } from '@red/domain';
import { Roles } from '@users/roles';
import { isArray } from 'lodash-es';
import { IMAGE_CATEGORIES } from '../../modules/file-preview/utils/constants';
import {
canAcceptRecommendation,
canChangeLegalBasis,
@ -16,7 +17,6 @@ import {
canUndo,
} from './annotation-permissions.utils';
import { AnnotationWrapper } from './annotation.wrapper';
import { IMAGE_CATEGORIES } from '../../modules/file-preview/utils/constants';
export class AnnotationPermissions {
canUndo = true;
@ -60,7 +60,7 @@ export class AnnotationPermissions {
permissions.canRemoveRedaction = canRemoveRedaction(annotation, permissions);
permissions.canChangeLegalBasis = canChangeLegalBasis(annotation, canAddRedaction);
permissions.canRecategorizeAnnotation = canRecategorizeAnnotation(annotation, canAddRedaction);
permissions.canResizeAnnotation = canResizeAnnotation(annotation, canAddRedaction);
permissions.canResizeAnnotation = canResizeAnnotation(annotation, canAddRedaction, annotationEntity.hasDictionary);
permissions.canEditAnnotations = (annotation.isSkipped || annotation.isRedacted) && !annotation.isImage;
permissions.canEditHints =

View File

@ -10,7 +10,6 @@ import {
Dictionary,
Earmark,
FalsePositiveSuperTypes,
IComment,
ILegalBasis,
IManualChange,
IPoint,
@ -38,7 +37,7 @@ export class AnnotationWrapper implements IListable {
recategorizationType: string;
color: string;
entity: Dictionary;
comments: IComment[] = [];
numberOfComments = 0;
firstTopLeftPoint: IPoint;
id: string;
shortContent: string;
@ -197,6 +196,10 @@ export class AnnotationWrapper implements IListable {
return !!SuggestionsSuperTypes[this.superType];
}
get isRuleBased() {
return this.engines.includes(LogEntryEngines.RULE);
}
get isSuggestionResize() {
return this.superType === SuperTypes.SuggestionResize;
}
@ -323,7 +326,6 @@ export class AnnotationWrapper implements IListable {
annotationWrapper.image = redactionLogEntry.image;
annotationWrapper.imported = redactionLogEntry.imported;
annotationWrapper.legalBasisValue = redactionLogEntry.legalBasis;
annotationWrapper.comments = redactionLogEntry.comments || [];
annotationWrapper.manual = redactionLogEntry.manualChanges?.length > 0;
annotationWrapper.engines = redactionLogEntry.engines;
annotationWrapper.section = redactionLogEntry.section;

View File

@ -1,6 +1,5 @@
<iqser-page-header
(closeAction)="routerHistoryService.navigateToLastDossiersScreen()"
[buttonConfigs]="buttonConfigs"
[pageLabel]="'license-information' | translate"
[showCloseButton]="currentUser.isUser && permissionsService.has$(roles.dossiers.read) | async"
></iqser-page-header>

View File

@ -1,9 +1,6 @@
import { Component } from '@angular/core';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { List } from '@common-ui/utils';
import { ButtonConfig, getConfig, IconButtonTypes, IqserPermissionsService } from '@iqser/common-ui';
import { getConfig, IqserPermissionsService } from '@iqser/common-ui';
import { getCurrentUser } from '@iqser/common-ui/lib/users';
import { TranslateService } from '@ngx-translate/core';
import type { AppConfig, User } from '@red/domain';
import { LicenseService } from '@services/license.service';
import { RouterHistoryService } from '@services/router-history.service';
@ -18,38 +15,10 @@ export class LicenseScreenComponent {
protected readonly roles = Roles;
protected readonly currentUser = getCurrentUser<User>();
protected readonly currentYear = new Date().getFullYear();
protected readonly buttonConfigs: List<ButtonConfig> = [
{
label: _('license-info-screen.email-report'),
action: (): void => this.sendMail(),
type: IconButtonTypes.primary,
helpModeKey: 'license_information',
hide: !this.permissionsService.has(Roles.license.readReport),
},
];
constructor(
readonly licenseService: LicenseService,
readonly permissionsService: IqserPermissionsService,
readonly routerHistoryService: RouterHistoryService,
private readonly _translateService: TranslateService,
) {}
sendMail(): void {
const licenseCustomer = this.licenseService.selectedLicense.licensedTo;
const subject = this._translateService.instant('license-info-screen.email.title', {
licenseCustomer,
}) as string;
const lineBreak = '%0D%0A';
const body = [
this._translateService.instant('license-info-screen.email.body.analyzed', {
pages: this.licenseService.selectedLicenseReport.numberOfAnalyzedPages,
}),
this._translateService.instant('license-info-screen.email.body.licensed', {
pages: this.licenseService.totalLicensedNumberOfPages,
}),
].join(lineBreak);
const mail = this.licenseService.selectedLicense.licensedToEmail;
window.location.href = `mailto:${mail}?subject=${subject}&body=${body}`;
}
}

View File

@ -1,8 +1,14 @@
import { ChangeDetectorRef, Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core';
import WebViewer, { WebViewerInstance } from '@pdftron/webviewer';
import { HttpClient } from '@angular/common/http';
import { ChangeDetectorRef, Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { Router } from '@angular/router';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { environment } from '@environments/environment';
import { getConfig, IconButtonTypes, IqserPermissionsService, LoadingService, Toaster } from '@iqser/common-ui';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
import { getCurrentUser } from '@iqser/common-ui/lib/users';
import { AsControl, BASE_HREF_FN, Debounce, getParam, trackByFactory } from '@iqser/common-ui/lib/utils';
import WebViewer, { WebViewerInstance } from '@pdftron/webviewer';
import {
AppConfig,
DOSSIER_TEMPLATE_ID,
@ -17,21 +23,15 @@ import {
WatermarkOrientations,
WatermarkVerticalAlignment,
} from '@red/domain';
import { stampPDFPage } from '@utils/page-stamper';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { WatermarkService } from '@services/entity-services/watermark.service';
import { BehaviorSubject, firstValueFrom, Observable, of } from 'rxjs';
import { LicenseService } from '@services/license.service';
import { UserPreferenceService } from '@users/user-preference.service';
import { Router } from '@angular/router';
import { WatermarksMapService } from '@services/entity-services/watermarks-map.service';
import { Roles } from '@users/roles';
import { environment } from '@environments/environment';
import { tap } from 'rxjs/operators';
import { LicenseService } from '@services/license.service';
import { watermarkTranslations } from '@translations/watermark-translations';
import { getCurrentUser } from '@iqser/common-ui/lib/users';
import { AsControl, BASE_HREF_FN, Debounce, getParam, trackByFactory } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
import { Roles } from '@users/roles';
import { UserPreferenceService } from '@users/user-preference.service';
import { stampPDFPage } from '@utils/page-stamper';
import { BehaviorSubject, firstValueFrom, Observable, of } from 'rxjs';
import { tap } from 'rxjs/operators';
export const DEFAULT_WATERMARK: Partial<IWatermark> = {
text: 'Watermark',
@ -222,7 +222,7 @@ export class WatermarkScreenComponent implements OnInit {
this.instance = await WebViewer(
{
licenseKey: this._licenseService.activeLicenseKey,
path: this._convertPath('/assets/wv-resources'),
path: this._convertPath('/assets/wv-resources/10.9.0'),
css: this._convertPath('/assets/pdftron/stylesheet.css'),
fullAPI: true,
isReadOnly: true,

View File

@ -132,7 +132,9 @@ export class DossierOverviewBulkActionsComponent implements OnChanges {
action: () => this._bulkActionsService.reanalyse(this.selectedFiles),
tooltip: _('dossier-overview.bulk.reanalyse'),
icon: 'iqser:refresh',
show: this.#canReanalyse && (this.#analysisForced || this.#canEnableAutoAnalysis),
show:
this.#canReanalyse &&
(this.#analysisForced || this.#canEnableAutoAnalysis || this.selectedFiles.every(file => file.isError)),
},
{
id: 'stop-automatic-analysis-btn',

View File

@ -6,10 +6,23 @@
[viewModeSelection]="viewModeSelection"
>
<ng-container slot="right">
<iqser-circle-button
*allow="roles.getRss"
[attr.help-mode-key]="'component_download'"
[icon]="'red:extract'"
[tooltip]="
((downloadComponentLogsDisabled$ | async) ? 'component-download.disabled-tooltip' : 'component-download.tooltip')
| translate
"
[matMenuTriggerFor]="bulkComponentDownloadMenu"
[disabled]="downloadComponentLogsDisabled$ | async"
[dropdownButton]="true"
></iqser-circle-button>
<redaction-file-download-btn
[attr.help-mode-key]="'download_dossier_in_dossier'"
[buttonId]="'download-files-btn'"
[disabled]="downloadBtnDisabled$ | async"
[disabled]="downloadFilesDisabled$ | async"
[dossier]="dossier"
[files]="entitiesService.all$ | async"
></redaction-file-download-btn>
@ -49,3 +62,8 @@
<ng-template #viewModeSelection>
<redaction-view-mode-selection iqserDisableStopPropagation></redaction-view-mode-selection>
</ng-template>
<mat-menu #bulkComponentDownloadMenu="matMenu">
<button [innerHTML]="'component-download.json' | translate" (click)="downloadComponentAsJSON()" mat-menu-item></button>
<button [innerHTML]="'component-download.xml' | translate" (click)="downloadComponentAsXML()" mat-menu-item></button>
</mat-menu>

View File

@ -14,6 +14,7 @@ import { Roles } from '@users/roles';
import { SortingService } from '@iqser/common-ui/lib/sorting';
import { List, some } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
import { ComponentLogService } from '@services/files/component-log.service';
@Component({
selector: 'redaction-dossier-overview-screen-header [dossier] [upload]',
@ -25,7 +26,8 @@ export class DossierOverviewScreenHeaderComponent implements OnInit {
readonly circleButtonTypes = CircleButtonTypes;
readonly roles = Roles;
actionConfigs: List<ActionConfig>;
readonly downloadBtnDisabled$: Observable<boolean>;
readonly downloadFilesDisabled$: Observable<boolean>;
readonly downloadComponentLogsDisabled$: Observable<boolean>;
readonly isDocumine = getConfig().IS_DOCUMINE;
constructor(
@ -41,11 +43,15 @@ export class DossierOverviewScreenHeaderComponent implements OnInit {
private readonly _reanalysisService: ReanalysisService,
private readonly _loadingService: LoadingService,
private readonly _primaryFileAttributeService: PrimaryFileAttributeService,
private readonly _componentLogService: ComponentLogService,
) {
const someNotProcessed$ = this.entitiesService.all$.pipe(some(file => !file.lastProcessed));
this.downloadBtnDisabled$ = combineLatest([this.listingService.areSomeSelected$, someNotProcessed$]).pipe(
this.downloadFilesDisabled$ = combineLatest([this.listingService.areSomeSelected$, someNotProcessed$]).pipe(
map(([someSelected, someNotProcessed]) => someSelected || someNotProcessed),
);
this.downloadComponentLogsDisabled$ = combineLatest([this.entitiesService.allLength$, someNotProcessed$]).pipe(
map(([length, someNotProcessed]) => !length || someNotProcessed),
);
}
ngOnInit() {
@ -92,4 +98,12 @@ export class DossierOverviewScreenHeaderComponent implements OnInit {
];
saveAsCSV(fileName, entities, fileFields, mapper);
}
downloadComponentAsJSON() {
return firstValueFrom(this._componentLogService.exportJSON(this.dossier.dossierTemplateId, this.dossier.dossierId));
}
async downloadComponentAsXML() {
return firstValueFrom(this._componentLogService.exportXML(this.dossier.dossierTemplateId, this.dossier.dossierId));
}
}

View File

@ -27,7 +27,8 @@
<ng-container *ngIf="!resizing">
<iqser-circle-button
(action)="resize()"
*ngIf="annotationPermissions.canResizeAnnotation && annotations.length === 1"
*ngIf="canResize"
[attr.help-mode-key]="helpModeKey('resize')"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.resize.label' | translate"
[type]="buttonType"
@ -47,7 +48,7 @@
<iqser-circle-button
(action)="acceptRecommendation()"
*ngIf="annotationPermissions.canAcceptRecommendation"
*ngIf="canAcceptRecommendation"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.accept-recommendation.label' | translate"
[type]="buttonType"
@ -101,7 +102,7 @@
<iqser-circle-button
(action)="annotationActionsService.forceAnnotation(annotations)"
*ngIf="annotationPermissions.canForceRedaction"
*ngIf="canForceRedaction"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.force-redaction.label' | translate"
[type]="buttonType"
@ -110,7 +111,7 @@
<iqser-circle-button
(action)="annotationActionsService.forceAnnotation(annotations, true)"
*ngIf="annotationPermissions.canForceHint"
*ngIf="canForceHint"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.force-hint.label' | translate"
[type]="buttonType"

View File

@ -61,17 +61,36 @@ export class AnnotationActionsComponent implements OnChanges {
this.annotationPermissions.canRecategorizeAnnotation ||
this.annotationPermissions.canForceHint ||
this.annotationPermissions.canForceRedaction;
return this.annotations.length > 1
? this.#isDocumine
? this.annotationPermissions.canEditAnnotations
: this.annotationPermissions.canEditHints ||
this.annotationPermissions.canEditImages ||
this.annotationPermissions.canEditAnnotations
: canEditRedactions;
return (
this.#annotationChangesAllowed &&
(this.annotations.length > 1
? this.#isDocumine
? this.annotationPermissions.canEditAnnotations
: this.annotationPermissions.canEditHints ||
this.annotationPermissions.canEditImages ||
this.annotationPermissions.canEditAnnotations
: canEditRedactions)
);
}
get canResize(): boolean {
return this.#annotationChangesAllowed && this.annotationPermissions.canResizeAnnotation && this.annotations.length === 1;
}
get canRemoveRedaction(): boolean {
return this.annotationPermissions.canRemoveRedaction && this.#sameType;
return this.#annotationChangesAllowed && this.annotationPermissions.canRemoveRedaction && this.#sameType;
}
get canForceRedaction() {
return this.#annotationChangesAllowed && this.annotationPermissions.canForceRedaction;
}
get canForceHint() {
return this.#annotationChangesAllowed && this.annotationPermissions.canForceHint;
}
get canAcceptRecommendation() {
return this.#annotationChangesAllowed && this.annotationPermissions.canAcceptRecommendation;
}
get viewerAnnotations() {
@ -148,4 +167,8 @@ export class AnnotationActionsComponent implements OnChanges {
this._iqserPermissionsService,
);
}
get #annotationChangesAllowed() {
return !this.#isDocumine || !this._state.file().excludedFromAutomaticAnalysis;
}
}

View File

@ -10,14 +10,14 @@
<div *ngIf="!annotation.item.isEarmark" class="actions-wrapper">
<div
(click)="comments.toggleExpandComments()"
[matTooltip]="'comments.comments' | translate : { count: annotation.item.comments?.length }"
(click)="showComments = !showComments"
[matTooltip]="'comments.comments' | translate: { count: annotation.item.numberOfComments }"
class="comments-counter"
iqserStopPropagation
matTooltipPosition="above"
>
<mat-icon svgIcon="red:comment"></mat-icon>
{{ annotation.item.comments.length }}
{{ annotation.item.numberOfComments }}
</div>
<div *ngIf="_multiSelectService.inactive()" class="actions">
@ -29,7 +29,16 @@
</div>
</div>
<redaction-comments #comments [annotation]="annotation.item"></redaction-comments>
<ng-container *ngIf="showComments">
<redaction-comments [annotation]="annotation.item"></redaction-comments>
<div
(click)="showComments = false"
class="all-caps-label pointer hide-comments"
iqserStopPropagation
translate="comments.hide-comments"
></div>
</ng-container>
</div>
<redaction-annotation-details [annotation]="annotation"></redaction-annotation-details>

View File

@ -5,6 +5,8 @@ import { ListItem } from '@models/file/list-item';
import { MultiSelectService } from '../../services/multi-select.service';
import { PdfProxyService } from '../../services/pdf-proxy.service';
import { ActionsHelpModeKeys } from '../../utils/constants';
import { CommentsApiService } from '@services/comments-api.service';
import { FilePreviewStateService } from '../../services/file-preview-state.service';
@Component({
selector: 'redaction-annotation-wrapper',
@ -13,15 +15,22 @@ import { ActionsHelpModeKeys } from '../../utils/constants';
})
export class AnnotationWrapperComponent implements OnChanges {
readonly #isDocumine = getConfig().IS_DOCUMINE;
readonly #commentsApiService = inject(CommentsApiService);
protected readonly _pdfProxyService = inject(PdfProxyService);
protected readonly _multiSelectService = inject(MultiSelectService);
readonly state = inject(FilePreviewStateService);
actionsHelpModeKey?: string;
showComments = false;
@Input({ required: true }) annotation!: ListItem<AnnotationWrapper>;
@HostBinding('attr.annotation-id') annotationId: string;
@HostBinding('class.active') active = false;
actionsHelpModeKey?: string;
ngOnChanges() {
this.annotationId = this.annotation.item.id;
const request = this.#commentsApiService.fetch(this.state.dossierId, this.state.fileId, this.annotationId);
request.then(comments => {
this.annotation.item.numberOfComments = comments.length;
});
this.active = this.annotation.isSelected;
this.actionsHelpModeKey = this.#getActionsHelpModeKey();
}

View File

@ -1,39 +1,30 @@
<ng-container *ngIf="componentContext$ | async as ctx">
<div *ngFor="let comment of annotation.comments; trackBy: trackBy" class="comment">
<div class="comment-details-wrapper">
<div [matTooltipPosition]="'above'" [matTooltip]="comment.date | date : 'exactDate'" class="small-label">
<strong> {{ comment.user | name }} </strong>
{{ comment.date | date : 'sophisticatedDate' }}
</div>
<div class="comment-actions">
<iqser-circle-button
(action)="deleteComment(comment)"
*ngIf="permissionsService.canDeleteComment(comment, _state.file(), _state.dossier())"
[iconSize]="10"
[size]="20"
class="pointer"
icon="iqser:trash"
></iqser-circle-button>
</div>
<div *ngFor="let comment of comments(); trackBy: trackBy" class="comment">
<div class="comment-details-wrapper">
<div [matTooltipPosition]="'above'" [matTooltip]="comment.date | date: 'exactDate'" class="small-label">
<strong> {{ comment.userId | name }} </strong>
{{ comment.date | date: 'sophisticatedDate' }}
</div>
<div>{{ comment.text }}</div>
<div class="comment-actions">
<iqser-circle-button
(action)="remove(comment)"
*ngIf="permissionsService.canDeleteComment(comment, state.file(), state.dossier())"
[iconSize]="10"
[size]="20"
class="pointer"
icon="iqser:trash"
></iqser-circle-button>
</div>
</div>
<iqser-input-with-action
(action)="addComment($event)"
*ngIf="permissionsService.canAddComment(_state.file(), _state.dossier())"
[placeholder]="'comments.add-comment' | translate"
autocomplete="off"
icon="iqser:collapse"
width="full"
></iqser-input-with-action>
<div>{{ comment.text }}</div>
</div>
<div
(click)="toggleExpandComments()"
class="all-caps-label pointer hide-comments"
iqserStopPropagation
translate="comments.hide-comments"
></div>
</ng-container>
<iqser-input-with-action
(action)="add($event)"
*ngIf="permissionsService.canAddComment(state.file(), state.dossier())"
[placeholder]="'comments.add-comment' | translate"
autocomplete="off"
icon="iqser:collapse"
width="full"
></iqser-input-with-action>

View File

@ -5,6 +5,7 @@
.comment {
margin-bottom: 10px;
overflow-wrap: anywhere;
.comment-details-wrapper {
margin-bottom: 4px;

View File

@ -1,84 +1,75 @@
import { ChangeDetectorRef, Component, HostBinding, Input, OnInit, ViewChild } from '@angular/core';
import type { IComment, User } from '@red/domain';
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { PermissionsService } from '@services/permissions.service';
import { Component, inject, Input, OnChanges, signal, SimpleChanges, ViewChild } from '@angular/core';
import { InputWithActionComponent, LoadingService } from '@iqser/common-ui';
import { 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';
import { getCurrentUser } from '@iqser/common-ui/lib/users';
import { ContextComponent, trackByFactory } from '@iqser/common-ui/lib/utils';
interface CommentsContext {
hiddenComments: boolean;
}
import { trackByFactory } from '@iqser/common-ui/lib/utils';
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import type { IComment, User } from '@red/domain';
import { CommentsApiService } from '@services/comments-api.service';
import { PermissionsService } from '@services/permissions.service';
import { NGXLogger } from 'ngx-logger';
import { FilePreviewStateService } from '../../services/file-preview-state.service';
@Component({
selector: 'redaction-comments',
templateUrl: './comments.component.html',
styleUrls: ['./comments.component.scss'],
})
export class CommentsComponent extends ContextComponent<CommentsContext> implements OnInit {
@HostBinding('class.hidden') private _hidden = true;
@ViewChild(InputWithActionComponent) private readonly _input: InputWithActionComponent;
@Input() annotation: AnnotationWrapper;
readonly trackBy = trackByFactory();
readonly currentUser = getCurrentUser<User>();
hiddenComments$: Observable<boolean>;
export class CommentsComponent implements OnChanges {
readonly #commentsApiService = inject(CommentsApiService);
readonly #logger = inject(NGXLogger);
protected readonly trackBy = trackByFactory();
protected readonly currentUser = getCurrentUser<User>();
readonly comments = signal<IComment[]>([]);
@ViewChild(InputWithActionComponent) protected readonly input: InputWithActionComponent;
@Input({ required: true }) annotation: AnnotationWrapper;
constructor(
readonly permissionsService: PermissionsService,
private readonly _manualRedactionService: ManualRedactionService,
private readonly _commentingService: CommentingService,
private readonly _loadingService: LoadingService,
private readonly _changeRef: ChangeDetectorRef,
protected readonly _state: FilePreviewStateService,
) {
super();
protected readonly state: FilePreviewStateService,
) {}
ngOnChanges(changes: SimpleChanges) {
const currentAnnotation: AnnotationWrapper = changes.annotation?.currentValue;
const previousAnnotation: AnnotationWrapper = changes.annotation?.previousValue;
const annotationChanged = currentAnnotation?.id !== previousAnnotation?.id;
const commentsChanged = currentAnnotation?.numberOfComments !== previousAnnotation?.numberOfComments;
if (annotationChanged || commentsChanged) {
this.#logger.info(`[COMMENTS] State of annotation ${this.annotation.value} changed. Fetch comments.`);
const request = this.#commentsApiService.fetch(this.state.dossierId, this.state.fileId, this.annotation.id);
request.then(comments => {
this.comments.set(comments);
});
}
}
ngOnInit() {
this.hiddenComments$ = this._commentingService.isActive$(this.annotation.id).pipe(
tap(active => {
this._hidden = !active;
}),
);
super._initContext({
hiddenComments: this.hiddenComments$,
});
}
async addComment(value: string): Promise<void> {
async add(value: string): Promise<void> {
if (!value) {
return;
}
this._loadingService.start();
const { dossierId, fileId } = this._state;
const commentId = await this._manualRedactionService.addComment(value, this.annotation.id, dossierId, fileId);
this.annotation.comments.push({
text: value,
id: commentId,
annotationId: this.annotation.id,
user: this.currentUser.id,
});
this._input.reset();
this._changeRef.markForCheck();
const { dossierId, fileId } = this.state;
const commentId = await this.#commentsApiService.add(value, this.annotation.id, dossierId, fileId);
this.annotation.numberOfComments++;
this.comments.update(current => [
...current,
{
text: value,
id: commentId,
annotationId: this.annotation.id,
userId: this.currentUser.id,
},
]);
this.input.reset();
this._loadingService.stop();
}
toggleExpandComments(): void {
this._commentingService.toggle(this.annotation.id);
}
async deleteComment(comment: IComment): Promise<void> {
async remove(comment: IComment): Promise<void> {
this._loadingService.start();
const { dossierId, fileId } = this._state;
await this._manualRedactionService.deleteComment(comment.id, this.annotation.id, dossierId, fileId);
this.annotation.comments.splice(this.annotation.comments.indexOf(comment), 1);
this._changeRef.markForCheck();
const { dossierId, fileId } = this.state;
await this.#commentsApiService.remove(comment.id, this.annotation.id, dossierId, fileId);
this.annotation.numberOfComments--;
this.comments.update(current => current.filter(c => c.id !== comment.id));
this._loadingService.stop();
}
}

View File

@ -86,11 +86,7 @@
<mat-icon svgIcon="iqser:nav-first"></mat-icon>
</div>
<redaction-pages
(click)="pagesPanelActive = true"
[displayedAnnotations]="displayedAnnotations"
[pages]="displayedPages"
></redaction-pages>
<redaction-pages (click)="pagesPanelActive = true" [pages]="displayedPages"></redaction-pages>
<div
(click)="scrollQuickNavLast()"

View File

@ -36,6 +36,7 @@ export class PageExclusionComponent {
try {
const pageRanges = extractPageRanges(inputValue, file);
await this._reanalysisService.excludePages({ pageRanges }, file);
this._state.excludedPages.update(value => [...value, ...this._flattenPageRanges(pageRanges)]);
this._inputComponent.reset();
} catch (e) {
this._toaster.error(_('file-preview.tabs.exclude-pages.error'));
@ -46,6 +47,7 @@ export class PageExclusionComponent {
async includePagesRange(range: IPageRange): Promise<void> {
this._loadingService.start();
await this._reanalysisService.includePages({ pageRanges: [range] }, this._state.file());
this._state.excludedPages.update(value => value.filter(page => !this._flattenPageRanges([range]).includes(page)));
this._inputComponent.reset();
this._loadingService.stop();
}
@ -64,4 +66,15 @@ export class PageExclusionComponent {
return ranges;
}, []);
}
private _flattenPageRanges(ranges: IPageRange[]) {
const flattenedPages = [];
ranges.forEach(range => {
for (let page = range.startPage; page <= range.endPage; page++) {
flattenedPages.push(page);
}
});
return flattenedPages;
}
}

View File

@ -3,7 +3,6 @@ import { List } from '@iqser/common-ui/lib/utils';
import { PdfViewer } from '../../../pdf-viewer/services/pdf-viewer.service';
import { MultiSelectService } from '../../services/multi-select.service';
import { AnnotationsListingService } from '../../services/annotations-listing.service';
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { FilePreviewStateService } from '../../services/file-preview-state.service';
import { ViewedPagesMapService } from '@services/files/viewed-pages-map.service';
import { ViewedPage } from '@red/domain';
@ -20,7 +19,6 @@ export class PagesComponent implements AfterViewInit {
readonly #listingService = inject(AnnotationsListingService);
protected readonly _pdf = inject(PdfViewer);
@Input({ required: true }) pages: List<number>;
@Input({ required: true }) displayedAnnotations: Map<number, AnnotationWrapper[]>;
readonly viewedPages$ = inject(ViewedPagesMapService).get$(this.#state.fileId);
ngAfterViewInit() {
@ -50,8 +48,7 @@ export class PagesComponent implements AfterViewInit {
}
hasOnlyManualRedactionsAndIsExcluded(pageNumber: number): boolean {
const hasOnlyManualRedactions = this.displayedAnnotations.get(pageNumber)?.every(annotation => annotation.manual);
return hasOnlyManualRedactions && this.#state.file().excludedPages.includes(pageNumber);
return this.#state.file().excludedPages.includes(pageNumber);
}
getViewedPage(viewedPages: ViewedPage[], pageNumber: number) {

View File

@ -13,6 +13,8 @@ export interface LegalBasisOption {
description?: string;
}
const DOCUMINE_LEGAL_BASIS = 'n-a.';
@Component({
selector: 'redaction-force-annotation-dialog',
templateUrl: './force-annotation-dialog.component.html',
@ -41,22 +43,23 @@ export class ForceAnnotationDialogComponent extends BaseDialogComponent implemen
}
async ngOnInit() {
const data = await firstValueFrom(this._justificationsService.getForDossierTemplate(this._data.dossier.dossierTemplateId));
if (!this.isDocumine) {
const data = await firstValueFrom(this._justificationsService.getForDossierTemplate(this._data.dossier.dossierTemplateId));
this.legalOptions = data.map(lbm => ({
legalBasis: lbm.reason,
description: lbm.description,
label: lbm.name,
}));
this.legalOptions = data.map(lbm => ({
legalBasis: lbm.reason,
description: lbm.description,
label: lbm.name,
}));
this.legalOptions.sort((a, b) => a.label.localeCompare(b.label));
this.legalOptions.sort((a, b) => a.label.localeCompare(b.label));
// Set pre-existing reason if it exists
const existingReason = this.legalOptions.find(option => option.legalBasis === this._data.annotations[0].legalBasis);
if (!this._data.hint && existingReason) {
this.form.patchValue({ reason: existingReason }, { emitEvent: false });
// Set pre-existing reason if it exists
const existingReason = this.legalOptions.find(option => option.legalBasis === this._data.annotations[0].legalBasis);
if (!this._data.hint && existingReason) {
this.form.patchValue({ reason: existingReason }, { emitEvent: false });
}
}
this.initialFormValue = this.form.getRawValue();
}
@ -66,7 +69,7 @@ export class ForceAnnotationDialogComponent extends BaseDialogComponent implemen
private _getForm(): UntypedFormGroup {
return this._formBuilder.group({
reason: this._data.hint ? ['Forced Hint'] : [null, Validators.required],
reason: this._data.hint ? ['Forced Hint'] : [null, !this.isDocumine ? Validators.required : null],
comment: [null],
});
}
@ -74,9 +77,7 @@ export class ForceAnnotationDialogComponent extends BaseDialogComponent implemen
private _createForceRedactionRequest(): ILegalBasisChangeRequest {
const request: ILegalBasisChangeRequest = {};
const legalOption: LegalBasisOption = this.form.get('reason').value;
request.legalBasis = legalOption.legalBasis;
request.legalBasis = !this.isDocumine ? this.form.get('reason').value.legalBasis : DOCUMINE_LEGAL_BASIS;
request.comment = this.form.get('comment').value;
return request;

View File

@ -11,34 +11,47 @@
<ng-container *ngFor="let entry of componentLogEntries; let index = index">
<div class="bold">{{ entry.name }}</div>
<div [id]="getValueCellId(index)">
<iqser-editable-input
(save)="saveEdit($event, entry.name)"
[canEdit]="canEdit"
[cancelTooltip]="'component-log-dialog.actions.cancel-edit' | translate"
[editTooltip]="'component-log-dialog.actions.edit' | translate"
[id]="'value-' + index"
[parentId]="getValueCellId(index)"
[saveTooltip]="'component-log-dialog.actions.save' | translate"
[value]="entry.componentValues[0].value ?? entry.componentValues[0].originalValue"
[attr.helpModeKey]="'scm_edit_DIALOG'"
>
<ng-container slot="editing">
<iqser-circle-button
(action)="undo(entry.name)"
*ngIf="entry.componentValues[0].value !== entry.componentValues[0].originalValue && canEdit"
[showDot]="true"
[tooltip]="
'component-log-dialog.actions.undo'
| translate: { value: entry.componentValues[0].originalValue }
| replaceNbsp
"
[attr.help-mode-key]="'scm_undo_DIALOG'"
class="ml-2"
icon="red:undo"
></iqser-circle-button>
<div [id]="getValueCellId(index)" class="component-value">
<div>
<ng-container *ngFor="let componentValue of entry.componentValues">
<iqser-editable-input
(save)="saveEdit($event, entry.originalKey)"
[canEdit]="canEdit && entry.componentValues.length === 1"
[cancelTooltip]="'component-log-dialog.actions.cancel-edit' | translate"
[editTooltip]="'component-log-dialog.actions.edit' | translate"
[id]="'value-' + index"
[parentId]="getValueCellId(index)"
[saveTooltip]="'component-log-dialog.actions.save' | translate"
[value]="componentValue.value ?? componentValue.originalValue"
[listValue]="entry.componentValues.length !== 1"
[attr.helpModeKey]="'scm_edit_DIALOG'"
[class.not-editable]="entry.componentValues.length !== 1"
>
<ng-container slot="editing">
<iqser-circle-button
(action)="undo(entry.originalKey)"
*ngIf="componentValue.value !== componentValue.originalValue && canEdit"
[showDot]="true"
[tooltip]="
'component-log-dialog.actions.undo'
| translate: { value: componentValue.originalValue }
| replaceNbsp
"
[attr.help-mode-key]="'scm_undo_DIALOG'"
class="ml-2"
icon="red:undo"
></iqser-circle-button>
</ng-container>
</iqser-editable-input>
</ng-container>
</iqser-editable-input>
</div>
<iqser-circle-button
*ngIf="entry.componentValues.length !== 1"
[tooltip]="'component-log-dialog.actions.disabled-edit' | translate"
[disabled]="true"
class="edit-button"
icon="iqser:edit"
></iqser-circle-button>
</div>
<div>{{ entry.componentValues[0].valueDescription }}</div>
<div>

View File

@ -59,3 +59,17 @@ ul {
.ml-auto {
margin-left: auto;
}
.component-value {
display: flex;
align-items: center;
justify-content: space-between;
div {
width: 100%;
.not-editable {
margin: 8px 0;
}
}
}

View File

@ -64,35 +64,21 @@ export class StructuredComponentManagementDialogComponent extends BaseDialogComp
exportJSON() {
return firstValueFrom(
this._componentLogService.exportJSON(
this.data.file.dossierTemplateId,
this.data.file.dossierId,
this.data.file.fileId,
this.data.file.filename,
),
this._componentLogService.exportJSON(this.data.file.dossierTemplateId, this.data.file.dossierId, this.data.file),
);
}
exportXML() {
return firstValueFrom(
this._componentLogService.exportXML(
this.data.file.dossierTemplateId,
this.data.file.dossierId,
this.data.file.fileId,
this.data.file.filename,
),
this._componentLogService.exportXML(this.data.file.dossierTemplateId, this.data.file.dossierId, this.data.file),
);
}
async exportAllInDossier() {
const allFilesInDossier = this._filesMapService.get(this.data.file.dossierId);
for (const file of allFilesInDossier) {
await firstValueFrom(
this._componentLogService.exportJSON(this.data.file.dossierTemplateId, file.dossierId, file.fileId, file.filename),
);
await firstValueFrom(
this._componentLogService.exportXML(this.data.file.dossierTemplateId, file.dossierId, file.fileId, file.filename),
);
await firstValueFrom(this._componentLogService.exportJSON(this.data.file.dossierTemplateId, file.dossierId, file));
await firstValueFrom(this._componentLogService.exportXML(this.data.file.dossierTemplateId, file.dossierId, file));
}
}

View File

@ -107,34 +107,6 @@ export class FilePreviewScreenComponent
@ViewChild('actionsWrapper', { static: false }) private readonly _actionsWrapper: ElementRef;
readonly #isDocumine = getConfig().IS_DOCUMINE;
get changed() {
return this._pageRotationService.hasRotations();
}
get #earmarks$() {
const isEarmarksViewMode$ = this._viewModeService.viewMode$.pipe(filter(() => this._viewModeService.isEarmarks()));
const earmarks$ = isEarmarksViewMode$.pipe(
tap(() => this._loadingService.start()),
switchMap(() => this._fileDataService.loadEarmarks()),
tap(() => this.updateViewMode().then(() => this._loadingService.stop())),
);
const currentPageIfEarmarksView$ = combineLatest([this.pdf.currentPage$, this._viewModeService.viewMode$]).pipe(
filter(() => this._viewModeService.isEarmarks()),
map(([page]) => page),
);
const currentPageEarmarks$ = combineLatest([currentPageIfEarmarksView$, earmarks$]).pipe(
map(([page, earmarks]) => earmarks.get(page)),
);
return currentPageEarmarks$.pipe(
map(earmarks => [earmarks, this._skippedService.hideSkipped(), this.state.dossierTemplateId] as const),
tap(args => this._annotationDrawService.draw(...args)),
);
}
constructor(
readonly pdf: PdfViewer,
readonly state: FilePreviewStateService,
@ -195,21 +167,55 @@ export class FilePreviewScreenComponent
);
effect(() => {
this.state.shouldUpdate();
this.state.updateExcludedPagesStyle();
if (this._documentViewer.pageComplete()) {
this.#setExcludedPageStyles();
}
});
effect(() => {
if (this._viewModeService.viewMode()) {
this.updateViewMode().then();
this._viewModeService.viewMode();
this.updateViewMode().then();
});
effect(() => {
this.state.updateExcludedPagesStyle();
this._viewModeService.viewMode();
if (_documentViewer.loaded()) {
this._logger.info('[PDF] Stamp pdf');
this._stampService.stampPDF().then();
}
});
}
get changed() {
return this._pageRotationService.hasRotations();
}
get #earmarks$() {
const isEarmarksViewMode$ = this._viewModeService.viewMode$.pipe(filter(() => this._viewModeService.isEarmarks()));
const earmarks$ = isEarmarksViewMode$.pipe(
tap(() => this._loadingService.start()),
switchMap(() => this._fileDataService.loadEarmarks()),
tap(() => this.updateViewMode().then(() => this._loadingService.stop())),
);
const currentPageIfEarmarksView$ = combineLatest([this.pdf.currentPage$, this._viewModeService.viewMode$]).pipe(
filter(() => this._viewModeService.isEarmarks()),
map(([page]) => page),
);
const currentPageEarmarks$ = combineLatest([currentPageIfEarmarksView$, earmarks$]).pipe(
map(([page, earmarks]) => earmarks.get(page)),
);
return currentPageEarmarks$.pipe(
map(earmarks => [earmarks, this._skippedService.hideSkipped(), this.state.dossierTemplateId] as const),
tap(args => this._annotationDrawService.draw(...args)),
);
}
getLastAssignee() {
const { isApproved, lastReviewer, lastApprover } = this.state.file();
const isRss = this._iqserPermissionsService.has(this.roles.getRss);
@ -760,11 +766,11 @@ export class FilePreviewScreenComponent
.subscribe();
const selectedTextEffect = this._documentViewer.selectedText$.pipe(
tap(selectedText => {
tap(() => {
const canPerformActions = this.pdfProxyService.canPerformActions();
const isCurrentPageExcluded = this.state.file().isPageExcluded(this.pdf.currentPage());
if ((selectedText.length > 2 || this._isJapaneseString(selectedText)) && canPerformActions && !isCurrentPageExcluded) {
if (canPerformActions && !isCurrentPageExcluded) {
this.pdf.enable(textActions);
} else {
this.pdf.disable(textActions);
@ -852,10 +858,6 @@ export class FilePreviewScreenComponent
this._annotationManager.select(annotations);
}
private _isJapaneseString(text: string) {
return text.match(/[\u3000-\u303f\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-\u9faf\u3400-\u4dbf]/);
}
#restoreOldFilters() {
combineLatest([
this._filterService.getGroup$('primaryFilters').pipe(first(filterGroup => !!filterGroup?.filters.length)),

View File

@ -1,4 +1,4 @@
import { Injectable } from '@angular/core';
import { inject, Injectable } from '@angular/core';
import { IqserDialog } from '@common-ui/dialog/iqser-dialog.service';
import { getConfig, Toaster } from '@iqser/common-ui';
import { List, log } from '@iqser/common-ui/lib/utils';
@ -13,6 +13,7 @@ import {
IRectangle,
IResizeRequest,
} from '@red/domain';
import { CommentsApiService } from '@services/comments-api.service';
import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
import { PermissionsService } from '@services/permissions.service';
import { firstValueFrom, Observable, zip } from 'rxjs';
@ -46,6 +47,7 @@ import { SkippedService } from './skipped.service';
@Injectable()
export class AnnotationActionsService {
readonly #isDocumine = getConfig().IS_DOCUMINE;
readonly #commentsApiService = inject(CommentsApiService);
constructor(
private readonly _manualRedactionService: ManualRedactionService,
@ -129,7 +131,7 @@ export class AnnotationActionsService {
if (result.comment) {
try {
for (const a of annotations) {
await this._manualRedactionService.addComment(result.comment, a.id, dossierId, fileId);
await this.#commentsApiService.add(result.comment, a.id, dossierId, fileId);
}
} catch (error) {
this._toaster.rawError(error.error.message);
@ -259,8 +261,8 @@ export class AnnotationActionsService {
comment: result.comment,
positions: textAndPositions.positions,
value: text,
updateDictionary: result.updateDictionary,
addToAllDossiers: result.addToAllDossiers,
updateDictionary: !annotation.isRuleBased && result.updateDictionary,
addToAllDossiers: !annotation.isRuleBased && result.addToAllDossiers,
};
await this.cancelResize(annotation);

View File

@ -42,7 +42,7 @@ export class AnnotationProcessingService {
label: _('filter-menu.with-comments'),
checked: false,
topLevelFilter: true,
checker: (annotation: AnnotationWrapper) => annotation?.comments?.length > 0,
checker: (annotation: AnnotationWrapper) => annotation?.numberOfComments > 0,
},
{
id: 'redaction-changes',

View File

@ -1,10 +1,10 @@
import { HttpEvent, HttpEventType, HttpProgressEvent, HttpResponse } from '@angular/common/http';
import { computed, effect, inject, Injectable, Signal } from '@angular/core';
import { computed, effect, inject, Injectable, signal, Signal, WritableSignal } from '@angular/core';
import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
import { LoadingService, wipeCache } from '@iqser/common-ui';
import { getParam } from '@iqser/common-ui/lib/utils';
import { TranslateService } from '@ngx-translate/core';
import { Dictionary, Dossier, DOSSIER_ID, DOSSIER_TEMPLATE_ID, File, FILE_ID } from '@red/domain';
import { Dictionary, Dossier, DOSSIER_ID, DOSSIER_TEMPLATE_ID, File, FILE_ID, ViewModes } from '@red/domain';
import { DossiersService } from '@services/dossiers/dossiers.service';
import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service';
import { DossierDictionariesMapService } from '@services/entity-services/dossier-dictionaries-map.service';
@ -44,7 +44,8 @@ export class FilePreviewStateService {
readonly dossierId = getParam(DOSSIER_ID);
readonly dossierTemplateId = getParam(DOSSIER_TEMPLATE_ID);
readonly fileId = getParam(FILE_ID);
readonly shouldUpdate = computed(() => this.file().excludedPages);
readonly excludedPages: WritableSignal<number[]>;
readonly updateExcludedPagesStyle = computed(() => this.excludedPages());
constructor(
private readonly _permissionsService: PermissionsService,
@ -60,6 +61,7 @@ export class FilePreviewStateService {
this.dossier = toSignal(dossiersServiceResolver().getEntityChanged$(this.dossierId));
this.file$ = inject(FilesMapService).watch$(this.dossierId, this.fileId);
this.file = toSignal(this.file$);
this.excludedPages = signal(this.file().excludedPages);
this.isWritable = computed(() => {
const isWritable = this._permissionsService.canPerformAnnotationActions(this.file(), this.dossier());
this._logger.info('[FILE] Is writeable:', isWritable);
@ -79,7 +81,9 @@ export class FilePreviewStateService {
effect(
() => {
if (this._viewModeService.isEarmarks() && !this.file().hasHighlights) {
this._viewModeService.switchToStandard();
if (this._viewModeService.viewMode() !== ViewModes.STANDARD) {
this._viewModeService.switchToStandard();
}
}
},
{ allowSignalWrites: true },

View File

@ -21,7 +21,7 @@ import { PermissionsService } from '@services/permissions.service';
import { dictionaryActionsTranslations, manualRedactionActionsTranslations } from '@translations/annotation-actions-translations';
import { Roles } from '@users/roles';
import { NGXLogger } from 'ngx-logger';
import { firstValueFrom, of } from 'rxjs';
import { of } from 'rxjs';
import { tap } from 'rxjs/operators';
function getResponseType(error: boolean, isConflict: boolean) {
@ -54,17 +54,6 @@ export class ManualRedactionService extends GenericService<IManualAddResponse> {
super();
}
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;
}
deleteComment(commentId: string, annotationId: string, dossierId: string, fileId: string) {
const url = `${this._defaultModelPath}/comment/undo/${dossierId}/${fileId}/${annotationId}/${commentId}`;
return firstValueFrom(super.delete({}, url));
}
addRecommendation(annotations: AnnotationWrapper[], redaction: IAddRedactionRequest, dossierId: string, fileId: string) {
const recommendations: List<IAddRedactionRequest> = annotations.map(annotation => ({
addToDictionary: redaction.addToDictionary,

View File

@ -23,13 +23,13 @@ export class PdfAnnotationActionsService {
readonly #annotationManager = inject(REDAnnotationManager);
readonly #isDocumine = getConfig().IS_DOCUMINE;
get(annotations: AnnotationWrapper[]): IHeaderElement[] {
get(annotations: AnnotationWrapper[], annotationChangesAllowed: boolean): IHeaderElement[] {
const availableActions: IHeaderElement[] = [];
const permissions = this.#getAnnotationsPermissions(annotations);
const sameType = annotations.every(a => a.type === annotations[0].type);
// you can only resize one annotation at a time
if (permissions.canResizeAnnotation) {
if (permissions.canResizeAnnotation && annotationChangesAllowed) {
const firstAnnotation = annotations[0];
// if we already entered resize-mode previously
if (firstAnnotation.id === this.#annotationManager.resizingAnnotationId) {
@ -61,11 +61,11 @@ export class PdfAnnotationActionsService {
permissions.canForceHint ||
permissions.canForceRedaction;
const canEdit =
annotations.length > 1
(annotations.length > 1
? this.#isDocumine
? permissions.canEditAnnotations
: permissions.canEditHints || permissions.canEditImages || permissions.canEditAnnotations
: canEditRedactions;
: canEditRedactions) && annotationChangesAllowed;
if (canEdit) {
const editButton = this.#getButton('edit', _('annotation-actions.edit-redaction.label'), () =>
this.#annotationActionsService.editRedaction(annotations),
@ -73,28 +73,28 @@ export class PdfAnnotationActionsService {
availableActions.push(editButton);
}
if (permissions.canAcceptRecommendation) {
if (permissions.canAcceptRecommendation && annotationChangesAllowed) {
const acceptRecommendationButton = this.#getButton('check', _('annotation-actions.accept-recommendation.label'), () =>
this.#annotationActionsService.convertRecommendationToAnnotation(annotations),
);
availableActions.push(acceptRecommendationButton);
}
if (permissions.canForceRedaction) {
if (permissions.canForceRedaction && annotationChangesAllowed) {
const forceRedactionButton = this.#getButton('thumb-up', _('annotation-actions.force-redaction.label'), () =>
this.#annotationActionsService.forceAnnotation(annotations),
);
availableActions.push(forceRedactionButton);
}
if (permissions.canForceHint) {
if (permissions.canForceHint && annotationChangesAllowed) {
const forceHintButton = this.#getButton('thumb-up', _('annotation-actions.force-hint.label'), () =>
this.#annotationActionsService.forceAnnotation(annotations, true),
);
availableActions.push(forceHintButton);
}
if (permissions.canRemoveRedaction && sameType) {
if (permissions.canRemoveRedaction && sameType && annotationChangesAllowed) {
const removeRedactionButton = this.#getButton('trash', _('annotation-actions.remove-annotation.remove-redaction'), () =>
this.#annotationActionsService.removeRedaction(annotations, permissions),
);

View File

@ -184,13 +184,15 @@ export class PdfProxyService {
}
if (this._iqserPermissionsService.has(Roles.redactions.write)) {
popups.push({
type: 'actionButton',
dataElement: TextPopups.REDACT_TEXT,
img: this.#addRedactionIcon,
title: this.#getTitle(ManualRedactionEntryTypes.REDACT),
onClick: () => this._ngZone.run(() => this.#redactText(ManualRedactionEntryTypes.REDACT)),
});
if (!(this.#isDocumine && this._state.file().excludedFromAutomaticAnalysis)) {
popups.push({
type: 'actionButton',
dataElement: TextPopups.REDACT_TEXT,
img: this.#addRedactionIcon,
title: this.#getTitle(ManualRedactionEntryTypes.REDACT),
onClick: () => this._ngZone.run(() => this.#redactText(ManualRedactionEntryTypes.REDACT)),
});
}
if (!this.#isDocumine) {
popups.push({
@ -253,10 +255,6 @@ export class PdfProxyService {
this._pdf.instance.UI.enableTools([AnnotationToolNames.AnnotationCreateRectangle]);
this._pdf.enable(TEXT_POPUPS_TO_TOGGLE);
this._viewerHeaderService.enable(HEADER_ITEMS_TO_TOGGLE);
if (this._documentViewer.selectedText.length > 2) {
this._pdf.enable([TextPopups.REDACT_TEXT, TextPopups.ADD_HINT, TextPopups.ADD_FALSE_POSITIVE]);
}
}
#getManualRedaction(quads: Record<string, Quad[]>, text?: string, convertQuads = false): IManualRedactionEntry {
@ -355,6 +353,7 @@ export class PdfProxyService {
#configureAnnotationSpecificActions(viewerAnnotations: Annotation[]) {
if (!this.canPerformActions()) {
this._pdf.instance.UI.annotationPopup.update([]);
return;
}
@ -390,7 +389,10 @@ export class PdfProxyService {
actions.push(visibilityButton);
}
actions = this._multiSelectService.inactive() ? [...actions, ...this._pdfAnnotationActionsService.get(annotationWrappers)] : [];
const annotationChangesAllowed = !this.#isDocumine || !this._state.file().excludedFromAutomaticAnalysis;
actions = this._multiSelectService.inactive()
? [...actions, ...this._pdfAnnotationActionsService.get(annotationWrappers, annotationChangesAllowed)]
: [];
this._pdf.instance.UI.annotationPopup.update(actions);
}

View File

@ -359,7 +359,7 @@ export class PdfViewer {
const options: WebViewerOptions = {
licenseKey: this.#licenseKey,
fullAPI: true,
path: this.#convertPath('/assets/wv-resources'),
path: this.#convertPath('/assets/wv-resources/10.9.0'),
css: this.#convertPath('/assets/pdftron/stylesheet.css'),
backendType: 'ems',
};

View File

@ -146,10 +146,10 @@ export class AddEditEntityComponent extends BaseFormComponent implements OnInit
hint: [{ value: !!this.entity?.hint, disabled: this.#isSystemManaged }],
hasDictionary: [{ value: !!this.entity?.hasDictionary, disabled: this.#isSystemManaged }],
dossierDictionaryOnly: [{ value: !!this.entity?.dossierDictionaryOnly, disabled: this.#isSystemManaged || this.entity }],
caseSensitive: [{ value: !!this.entity?.caseInsensitive, disabled: this.#isSystemManaged }],
caseSensitive: [{ value: !this.entity?.caseInsensitive, disabled: this.#isSystemManaged }],
manageEntriesInDictionaryEditorOnly: [
{
value: !this.entity?.addToDictionaryAction,
value: this.entity?.addToDictionaryAction,
disabled: this.#isSystemManaged && !this.#isDossierRedaction,
},
],
@ -216,7 +216,7 @@ export class AddEditEntityComponent extends BaseFormComponent implements OnInit
#formToObject(): IDictionary {
// Fields which aren't set for hints, need additional check
const addToDictionaryAction = !this.form.get('manageEntriesInDictionaryEditorOnly')?.value;
const addToDictionaryAction = !!this.form.get('manageEntriesInDictionaryEditorOnly')?.value;
const hasDictionary = !!this.form.get('hasDictionary')?.value;
const dossierDictionaryOnly = !!this.form.get('dossierDictionaryOnly')?.value;

View File

@ -52,12 +52,14 @@
</div>
<redaction-watermark-selector
*ngIf="!config.IS_DOCUMINE"
[dossierTemplateId]="dossierTemplateId"
[label]="'dossier-watermark-selector.watermark' | translate"
formControlName="watermarkId"
></redaction-watermark-selector>
<redaction-watermark-selector
*ngIf="!config.IS_DOCUMINE"
[dossierTemplateId]="dossierTemplateId"
[label]="'dossier-watermark-selector.preview' | translate"
formControlName="previewWatermarkId"
@ -83,7 +85,7 @@
<div class="flex">
<redaction-select
[height]="165"
[label]="'report-type.label' | translate : { length: reportTemplateIdsLength }"
[label]="'report-type.label' | translate: { length: reportTemplateIdsLength }"
[optionTemplate]="reportTemplateOptionTemplate"
[options]="availableReportTypes"
[valueMapper]="reportTemplateValueMapper"
@ -94,7 +96,7 @@
<redaction-select
*deny="roles.getRss"
[height]="165"
[label]="'download-type.label' | translate : { length: downloadFileTypesLength }"
[label]="'download-type.label' | translate: { length: downloadFileTypesLength }"
[options]="downloadTypes"
formControlName="downloadFileTypes"
></redaction-select>

View File

@ -0,0 +1,28 @@
import { Injectable, signal } from '@angular/core';
import { GenericService } from '@common-ui/services/generic.service';
import { IComment } from '@red/domain';
import { firstValueFrom, map } from 'rxjs';
@Injectable({
providedIn: 'root',
})
export class CommentsApiService extends GenericService<IComment> {
protected readonly _defaultModelPath = 'manualRedaction';
readonly comments = signal<Record<string, IComment[]>>({});
async add(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;
}
remove(commentId: string, annotationId: string, dossierId: string, fileId: string) {
const url = `${this._defaultModelPath}/comment/undo/${dossierId}/${fileId}/${annotationId}/${commentId}`;
return firstValueFrom(super.delete({}, url));
}
fetch(dossierId: string, fileId: string, annotationId: string): Promise<IComment[]> {
const url = `${this._defaultModelPath}/comments/${dossierId}/${fileId}/${annotationId}`;
return firstValueFrom(super.getAll<{ comments: IComment[] }>(url).pipe(map(res => res.comments)));
}
}

View File

@ -12,7 +12,6 @@ import { DossierDictionariesMapService } from '@services/entity-services/dossier
import { List } from '@iqser/common-ui/lib/utils';
import { IMAGE_CATEGORIES } from '../../modules/file-preview/utils/constants';
const MIN_WORD_LENGTH = 2;
const IMAGE_TYPES = ['image', 'formula', 'ocr'];
@Injectable({
@ -100,20 +99,13 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
) {
const entriesToAdd: Array<string> = [];
const initialEntriesSet = new Set(initialEntries);
let hasInvalidRows = false;
for (let i = 0; i < entries.length; i++) {
const entry = entries.at(i);
if (!entry.trim() || initialEntriesSet.has(entry)) {
continue;
}
hasInvalidRows ||= entry.length < MIN_WORD_LENGTH;
entriesToAdd.push(entry);
}
if (hasInvalidRows) {
this._toaster.error(_('dictionary-overview.error.entries-too-short'));
throw new Error('Entries too short');
}
const deletedEntries: Array<string> = [];
const entriesSet = new Set(entries);
for (let i = 0; i < initialEntries.length; i++) {
@ -260,7 +252,15 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
}
}
if (!manualTypeExists) {
dictionaries.push(new Dictionary({ hexColor: FALLBACK_COLOR, type: SuperTypes.ManualRedaction }, true));
dictionaries.push(
new Dictionary(
{
hexColor: FALLBACK_COLOR,
type: SuperTypes.ManualRedaction,
},
true,
),
);
}
return dictionaries;

View File

@ -4,7 +4,7 @@ import { catchError, map, tap } from 'rxjs/operators';
import { Observable, of } from 'rxjs';
import { HttpHeaders } from '@angular/common/http';
import { saveAs } from 'file-saver';
import { ComponentDetails, ComponentLogEntry, IComponentLogData, IComponentLogEntry } from '@red/domain';
import { ComponentDetails, ComponentLogEntry, IComponentLogData, IComponentLogEntry, IFile } from '@red/domain';
import { mapEach } from '@common-ui/utils';
@Injectable({ providedIn: 'root' })
@ -25,6 +25,15 @@ export class ComponentLogService extends GenericService<void> {
);
}
#bulkComponentLogRequest(dossierTemplateId: string, dossierId: string, includeDetails = false): Observable<IComponentLogData> {
return this._http.get<IComponentLogData>(
`/api/dossier-templates/${dossierTemplateId}/dossiers/${dossierId}/files/bulk/get-components`,
{
params: { includeDetails },
},
);
}
getComponentLogData(dossierTemplateId: string, dossierId: string, fileId: string): Observable<ComponentLogEntry[]> {
return this.#componentLogRequest(dossierTemplateId, dossierId, fileId).pipe(
map(data => data.componentDetails),
@ -42,29 +51,34 @@ export class ComponentLogService extends GenericService<void> {
return this._post({ components }, `componentLog/override/revert/${dossierId}/${fileId}`);
}
exportJSON(dossierTemplateId: string, dossierId: string, fileId: string, name: string): Observable<IComponentLogData> {
return this.#componentLogRequest(dossierTemplateId, dossierId, fileId, false).pipe(
exportJSON(dossierTemplateId: string, dossierId: string, file?: IFile): Observable<IComponentLogData> {
const request$ = file?.fileId
? this.#componentLogRequest(dossierTemplateId, dossierId, file?.fileId, false)
: this.#bulkComponentLogRequest(dossierTemplateId, dossierId);
return request$.pipe(
tap(data => {
const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' });
saveAs(blob, name + '.component_log.json');
saveAs(blob, (file?.filename ? `${file.filename}.` : '') + 'component_log.json');
}),
);
}
exportXML(dossierTemplateId, dossierId: string, fileId: string, name: string): Observable<string> {
return this.#getComponentLogDataAsXML(dossierTemplateId, dossierId, fileId).pipe(
exportXML(dossierTemplateId, dossierId: string, file?: IFile): Observable<string> {
return this.#getComponentLogDataAsXML(dossierTemplateId, dossierId, file).pipe(
tap(data => {
const blob = new Blob([data], { type: 'application/xml' });
saveAs(blob, name + '.component_log.xml');
saveAs(blob, (file?.filename ? `${file.filename}.` : '') + 'component_log.xml');
}),
);
}
#getComponentLogDataAsXML(dossierTemplateId: string, dossierId: string, fileId: string) {
#getComponentLogDataAsXML(dossierTemplateId: string, dossierId: string, file?: IFile) {
let headers = new HttpHeaders();
headers = headers.set('accept', 'application/xml');
return this._http.get(`/api/dossier-templates/${dossierTemplateId}/dossiers/${dossierId}/files/${fileId}/components`, {
const pathSuffix = file?.fileId ? `${file.fileId}/components` : 'bulk/get-components';
return this._http.get(`/api/dossier-templates/${dossierTemplateId}/dossiers/${dossierId}/files/${pathSuffix}`, {
headers: headers,
responseType: 'text',
observe: 'body',

View File

@ -1,13 +1,15 @@
import { Injectable } from '@angular/core';
import { GenericService, QueryParam } from '@iqser/common-ui';
import { inject, Injectable } from '@angular/core';
import { GenericService, isIqserDevMode, QueryParam, Toaster } from '@iqser/common-ui';
import { IRedactionLog, ISectionGrid } from '@red/domain';
import { catchError } from 'rxjs/operators';
import { firstValueFrom, of } from 'rxjs';
import { catchError } from 'rxjs/operators';
@Injectable({
providedIn: 'root',
})
export class RedactionLogService extends GenericService<unknown> {
readonly #isIqserDevMode = isIqserDevMode();
readonly #toaster = inject(Toaster);
protected readonly _defaultModelPath = '';
async getRedactionLog(dossierId: string, fileId: string, withManualRedactions?: boolean) {
@ -18,6 +20,18 @@ export class RedactionLogService extends GenericService<unknown> {
const redactionLog$ = this._getOne<IRedactionLog>([dossierId, fileId], 'redactionLog', queryParams);
const redactionLog = await firstValueFrom(redactionLog$.pipe(catchError(() => of({} as IRedactionLog))));
redactionLog.redactionLogEntry = redactionLog.redactionLogEntry.filter(entry => {
const hasPositions = entry.positions && entry.positions.length;
if (!hasPositions && this.#isIqserDevMode) {
this.#toaster.info(`Entry ${entry.id} was skipped because has no positions`, {
timeOut: 10000,
easing: 'ease-in-out',
easeTime: 500,
useRaw: true,
});
}
return hasPositions;
});
redactionLog.redactionLogEntry.sort((a, b) => a.positions[0].page - b.positions[0].page);
return redactionLog;
}

View File

@ -341,7 +341,7 @@ export class PermissionsService {
canDeleteComment(comment: IComment, file: File, dossier: Dossier) {
return (
this._iqserPermissionsService.has(Roles.comments.delete) &&
(comment.user === this.#userId || this.isApprover(dossier)) &&
(comment.userId === this.#userId || this.isApprover(dossier)) &&
!file.isApproved
);
}
@ -407,7 +407,11 @@ export class PermissionsService {
}
#canReanalyseFile(file: File, dossier: Dossier): boolean {
return dossier.isActive && this.isAssigneeOrApprover(file, dossier) && file.analysisRequired;
return (
dossier.isActive &&
((this.isAssigneeOrApprover(file, dossier) && file.analysisRequired) ||
(file.isError && (this.isOwner(dossier) || this.isFileAssignee(file))))
);
}
#canEnableAutoAnalysis(file: File, dossier: Dossier): boolean {

View File

@ -616,5 +616,9 @@
{
"elementKey": "editor_exclude_pages",
"documentKey": "editor_exclude_pages"
},
{
"elementKey": "component_download",
"documentKey": "component_download"
}
]

View File

@ -56,8 +56,7 @@
},
"add-edit-clone-dossier-template": {
"error": {
"conflict": "Dossiervorlage konnte nicht erstellt werden: Es existiert bereits eine Dossiervorlage mit demselben Namen.",
"generic": "Fehler beim Erstellen der Dossiervorlage."
"conflict": "Dossiervorlage konnte nicht erstellt werden: Es existiert bereits eine Dossiervorlage mit demselben Namen."
},
"form": {
"apply-updates-default": {
@ -134,7 +133,7 @@
"dossier-dictionary-only": "Dossier dictionary only",
"has-dictionary": "Has dictionary",
"hint": "Hint",
"manage-entries-in-dictionary-editor-only": "Manage entries in Dictionary editor only",
"manage-entries-in-dictionary-editor-only": "Available in add/remove dialogs",
"name": "Display Name",
"name-placeholder": "Enter Name",
"rank": "Rank",
@ -256,9 +255,6 @@
"user-management": "User Management",
"watermarks": "Watermarks"
},
"annotation": {
"pending": "(Pending Analysis)"
},
"annotation-actions": {
"accept-recommendation": {
"label": "Empfehlung annehmen"
@ -341,14 +337,14 @@
"error": "Rekategorisierung des Bildes gescheitert: {error}",
"success": "Bild wurde einer neuen Kategorie zugeordnet."
},
"remove": {
"error": "Fehler beim Entfernen der Schwärzung: {error}",
"success": "Schwärzung entfernt!"
},
"remove-hint": {
"error": "Failed to remove hint: {error}",
"success": "Hint removed!"
},
"remove": {
"error": "Fehler beim Entfernen der Schwärzung: {error}",
"success": "Schwärzung entfernt!"
},
"request-change-legal-basis": {
"error": "Fehler beim Vorschlagen der Änderung der Begründung:",
"success": "Die Änderung der in der Anmerkung genannten Begründung wurde beantragt."
@ -365,14 +361,14 @@
"error": "Fehler beim Vorschlagen der Neukategorisierung des Bilds: {error}",
"success": "Bild-Neuklassifizierung angefordert."
},
"request-remove": {
"error": "Fehler beim Erstellen des Vorschlags für das Entfernen der Schwärzung: {error}",
"success": "Entfernen der Schwärzung wurde vorgeschlagen!"
},
"request-remove-hint": {
"error": "Failed to request removal of hint: {error}",
"success": "Requested to remove hint!"
},
"request-remove": {
"error": "Fehler beim Erstellen des Vorschlags für das Entfernen der Schwärzung: {error}",
"success": "Entfernen der Schwärzung wurde vorgeschlagen!"
},
"suggest": {
"error": "Vorschlag einer Schwärzung wurde nicht gespeichert: {error}",
"success": "Vorschlag einer Schwärzung gespeichert"
@ -389,15 +385,15 @@
"remove-highlights": {
"label": "Remove Selected Earmarks"
},
"resize": {
"label": "Größe ändern"
},
"resize-accept": {
"label": "Größe speichern"
},
"resize-cancel": {
"label": "Größenänderung abbrechen"
},
"resize": {
"label": "Größe ändern"
},
"see-references": {
"label": "See References"
},
@ -439,6 +435,9 @@
"suggestion-resize": "Vorgeschlagene Größenänderung",
"text-highlight": "Earmark"
},
"annotation": {
"pending": "(Pending Analysis)"
},
"archived-dossiers-listing": {
"no-data": {
"title": "No archived dossiers."
@ -558,10 +557,17 @@
"title": "Aktion bestätigen"
}
},
"component-download": {
"disabled-tooltip": "",
"json": "",
"tooltip": "",
"xml": ""
},
"component-log-dialog": {
"actions": {
"cancel-edit": "Cancel",
"close": "Close",
"disabled-edit": "",
"display-by-default": "Display by default when opening documents",
"edit": "Edit",
"export-json": "Export JSON",
@ -638,18 +644,14 @@
"warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!"
},
"confirmation-dialog": {
"approve-file": {
"question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
"title": "Warnung!"
},
"approve-file-without-analysis": {
"confirmationText": "Approve without analysis",
"denyText": "Cancel",
"question": "Analysis required to detect new redactions.",
"title": "Warning!"
},
"approve-multiple-files": {
"question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
"approve-file": {
"question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?",
"title": "Warnung!"
},
"approve-multiple-files-without-analysis": {
@ -658,6 +660,10 @@
"question": "Analysis required to detect new redactions for at least one file.",
"title": "Warning"
},
"approve-multiple-files": {
"question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?",
"title": "Warnung!"
},
"assign-file-to-me": {
"question": {
"multiple": "Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?",
@ -758,7 +764,6 @@
"download": "Download current entries",
"error": {
"400": "Cannot update dictionary because at least one of the newly added words where recognized as a general term that appear too often in texts.",
"entries-too-short": "Einige Einträge im Wörterbuch unterschreiten die Mindestlänge von 2 Zeichen. Diese sind rot markiert.",
"generic": "Es ist ein Fehler aufgetreten ... Das Wörterbuch konnte nicht aktualisiert werden!"
},
"revert-changes": "Rückgängig machen",
@ -1003,13 +1008,13 @@
"recent": "Neu ({hours} h)",
"unassigned": "Niemandem zugewiesen"
},
"reanalyse": {
"action": "Datei analysieren"
},
"reanalyse-dossier": {
"error": "Die Dateien konnten nicht für eine Reanalyse eingeplant werden. Bitte versuchen Sie es erneut.",
"success": "Dateien für Reanalyse vorgesehen."
},
"reanalyse": {
"action": "Datei analysieren"
},
"start-auto-analysis": "Enable auto-analysis",
"stop-auto-analysis": "Stop auto-analysis",
"table-col-names": {
@ -1078,14 +1083,6 @@
"total-documents": "Anzahl der Dokumente",
"total-people": "<strong>{count}</strong> {count, plural, one{User} other {Users}}"
},
"dossier-templates": {
"label": "Dossier-Vorlagen",
"status": {
"active": "Active",
"inactive": "Inactive",
"incomplete": "Incomplete"
}
},
"dossier-templates-listing": {
"action": {
"clone": "Clone Template",
@ -1121,6 +1118,14 @@
"title": "{length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}"
}
},
"dossier-templates": {
"label": "Dossier-Vorlagen",
"status": {
"active": "Active",
"inactive": "Inactive",
"incomplete": "Incomplete"
}
},
"dossier-watermark-selector": {
"heading": "Watermarks on documents",
"no-watermark": "There is no watermark defined for the dossier template.<br>Contact your app admin to define one.",
@ -1304,15 +1309,6 @@
"title": "{length} {length, plural, one{Wörterbuch} other{Wörterbücher}}"
}
},
"entity": {
"info": {
"actions": {
"revert": "Revert",
"save": "Save Changes"
},
"heading": "Edit Entity"
}
},
"entity-rules-screen": {
"error": {
"generic": "Something went wrong... Entity rules update failed!"
@ -1326,19 +1322,28 @@
"title": "Entity Rule Editor",
"warning-text": "Warning: experimental feature!"
},
"entity": {
"info": {
"actions": {
"revert": "Revert",
"save": "Save Changes"
},
"heading": "Edit Entity"
}
},
"error": {
"deleted-entity": {
"dossier": {
"action": "Zurück zur Übersicht",
"label": "Dieses Dossier wurde gelöscht!"
},
"file": {
"action": "Zurück zum Dossier",
"label": "Diese Datei wurde gelöscht!"
},
"file-dossier": {
"action": "Zurück zur Übersicht",
"label": "Das Dossier dieser Datei wurde gelöscht!"
},
"file": {
"action": "Zurück zum Dossier",
"label": "Diese Datei wurde gelöscht!"
}
},
"file-preview": {
@ -1356,12 +1361,6 @@
},
"exact-date": "{day} {month} {year} um {hour}:{minute} Uhr",
"file": "Datei",
"file-attribute": {
"update": {
"error": "Failed to update file attribute value!",
"success": "File attribute value has been updated successfully!"
}
},
"file-attribute-encoding-types": {
"ascii": "ASCII",
"iso": "ISO-8859-1",
@ -1372,6 +1371,12 @@
"number": "Nummer",
"text": "Freier Text"
},
"file-attribute": {
"update": {
"error": "Failed to update file attribute value!",
"success": "File attribute value has been updated successfully!"
}
},
"file-attributes-configurations": {
"cancel": "Cancel",
"form": {
@ -1585,6 +1590,15 @@
"csv": "File attributes were imported successfully from uploaded CSV file."
}
},
"filter-menu": {
"filter-options": "Filteroptionen",
"filter-types": "Filter",
"label": "Filter",
"pages-without-annotations": "Only pages without annotations",
"redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
"unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
"with-comments": "Nur Anmerkungen mit Kommentaren"
},
"filter": {
"analysis": "Analyse erforderlich",
"comment": "Kommentare",
@ -1595,15 +1609,6 @@
"suggestion": "Vorgeschlagene Schwärzung",
"updated": "Aktualisiert"
},
"filter-menu": {
"filter-options": "Filteroptionen",
"filter-types": "Filter",
"label": "Filter",
"pages-without-annotations": "Only pages without annotations",
"redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
"unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
"with-comments": "Nur Anmerkungen mit Kommentaren"
},
"filters": {
"assigned-people": "Beauftragt",
"documents-status": "Documents State",
@ -1671,13 +1676,6 @@
},
"title": "SMTP-Konto konfigurieren"
},
"generic-errors": {
"400": "The sent request is not valid.",
"403": "Access to the requested resource is not allowed.",
"404": "The requested resource could not be found.",
"409": "The request is incompatible with the current state.",
"500": "The server encountered an unexpected condition that prevented it from fulfilling the request."
},
"help-mode": {
"bottom-text": "Hilfe-Modus",
"button-text": "Help Mode (H)",
@ -1789,14 +1787,6 @@
"copyright-claim-text": "Copyright © 2020 - {currentYear} knecon",
"copyright-claim-title": "Copyright",
"custom-app-title": "Name der Anwendung",
"email": {
"body": {
"analyzed": "Im aktuellen Lizenzzeitraum insgesamt analysierte Seiten: {pages}.",
"licensed": "Lizenzierte Seiten: {pages}."
},
"title": "Lizenzbericht {licenseCustomer}"
},
"email-report": "E-Mail-Bericht",
"end-user-license-text": "Die Nutzung dieses Produkts unterliegt den Bedingungen der Endbenutzer-Lizenzvereinbarung für den RedactManager, sofern darin nichts anderweitig festgelegt.",
"end-user-license-title": "Endbenutzer-Lizenzvereinbarung",
"licensing-details": {
@ -1889,13 +1879,6 @@
"user-promoted-to-approver": "<b>{user}</b> wurde im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> zum Genehmiger ernannt!",
"user-removed-as-dossier-member": "<b>{user}</b> wurde als Mitglied von: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b> entfernt!"
},
"notifications": {
"button-text": "Notifications",
"deleted-dossier": "Deleted Dossier",
"label": "Benachrichtigungen",
"mark-all-as-read": "Alle als gelesen markieren",
"mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
},
"notifications-screen": {
"category": {
"email-notifications": "E-Mail Benachrichtigungen",
@ -1909,6 +1892,7 @@
"dossier": "Dossierbezogene Benachrichtigungen",
"other": "Andere Benachrichtigungen"
},
"options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
"options": {
"ASSIGN_APPROVER": "Wenn ich einem Dokument als Genehmiger zugewiesen bin",
"ASSIGN_REVIEWER": "Wenn ich einem Dokument als Überprüfer zugewiesen bin",
@ -1926,7 +1910,6 @@
"USER_PROMOTED_TO_APPROVER": "Wenn ich Genehmiger in einem Dossier werde",
"USER_REMOVED_AS_DOSSIER_MEMBER": "Wenn ich die Dossier-Mitgliedschaft verliere"
},
"options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
"schedule": {
"daily": "Tägliche Zusammenfassung",
"instant": "Sofortig",
@ -1934,6 +1917,13 @@
},
"title": "Benachrichtigungseinstellungen"
},
"notifications": {
"button-text": "Notifications",
"deleted-dossier": "Deleted Dossier",
"label": "Benachrichtigungen",
"mark-all-as-read": "Alle als gelesen markieren",
"mark-as": "Mark as {type, select, read{read} unread{unread} other{}}"
},
"ocr": {
"confirmation-dialog": {
"cancel": "Cancel",
@ -2025,16 +2015,16 @@
"warnings-subtitle": "Do not show again options",
"warnings-title": "Prompts and Dialogs Settings"
},
"processing": {
"basic": "Processing",
"ocr": "OCR"
},
"processing-status": {
"ocr": "OCR",
"pending": "Pending",
"processed": "Processed",
"processing": "Processing"
},
"processing": {
"basic": "Processing",
"ocr": "OCR"
},
"readonly": "Lesemodus",
"readonly-archived": "Read only (archived)",
"redact-text": {
@ -2264,12 +2254,6 @@
"red-user-admin": "Benutzer-Admin",
"regular": "Regulär"
},
"search": {
"active-dossiers": "ganze Plattform",
"all-dossiers": "all documents",
"placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
"this-dossier": "in diesem Dossier"
},
"search-screen": {
"cols": {
"assignee": "Bevollmächtigter",
@ -2293,6 +2277,12 @@
"no-match": "Keine Dokumente entsprechen Ihren aktuellen Filtern.",
"table-header": "{length} {length, plural, one{Suchergebnis} other{Suchergebnisse}}"
},
"search": {
"active-dossiers": "ganze Plattform",
"all-dossiers": "all documents",
"placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
"this-dossier": "in diesem Dossier"
},
"seconds": "seconds",
"size": "Size",
"smtp-auth-config": {

View File

@ -56,8 +56,7 @@
},
"add-edit-clone-dossier-template": {
"error": {
"conflict": "Failed to create dossier template: a dossier template with the same name already exists.",
"generic": "Failed to create dossier template."
"conflict": "Failed to create dossier template: a dossier template with the same name already exists."
},
"form": {
"apply-updates-default": {
@ -134,7 +133,7 @@
"dossier-dictionary-only": "Dossier dictionary only",
"has-dictionary": "Has dictionary",
"hint": "Hint",
"manage-entries-in-dictionary-editor-only": "Manage entries in Dictionary editor only",
"manage-entries-in-dictionary-editor-only": "Available in add/remove dialogs",
"name": "Display Name",
"name-placeholder": "Enter Name",
"rank": "Rank",
@ -558,10 +557,17 @@
"title": "Confirm Action"
}
},
"component-download": {
"disabled-tooltip": "You need to upload at least one file to be able to export the components as JSON or XML",
"json": "Download as JSON",
"tooltip": "Component Download",
"xml": "Download as XML"
},
"component-log-dialog": {
"actions": {
"cancel-edit": "Cancel",
"close": "Close",
"disabled-edit": "Multi-value component Read-only",
"display-by-default": "Display by default when opening documents",
"edit": "Edit",
"export-json": "Export JSON",
@ -758,7 +764,6 @@
"download": "Download current entries",
"error": {
"400": "Cannot update dictionary because at least one of the newly added words where recognized as a general term that appear too often in texts.",
"entries-too-short": "Some entries of the dictionary are below the minimum length of 2. These are highlighted with red!",
"generic": "Something went wrong... Dictionary update failed!"
},
"revert-changes": "Revert",
@ -1782,14 +1787,6 @@
"copyright-claim-text": "Copyright © 2020 - {currentYear} knecon",
"copyright-claim-title": "Copyright Claim",
"custom-app-title": "Custom Application Title",
"email-report": "Email Report",
"email": {
"body": {
"analyzed": "Total Analyzed Pages in current license period: {pages}.",
"licensed": "Licensed Pages: {pages}."
},
"title": "License Report {licenseCustomer}"
},
"end-user-license-text": "The use of this product is subject to the terms of the RedactManager End User License Agreement, unless otherwise specified therein.",
"end-user-license-title": "End User License Agreement",
"licensing-details": {
@ -2545,12 +2542,5 @@
"select": "Select"
}
},
"yesterday": "Yesterday",
"generic-errors": {
"400": "The sent request is not valid.",
"403": "Access to the requested resource is not allowed.",
"404": "The requested resource could not be found.",
"409": "The request is incompatible with the current state.",
"500": "The server encountered an unexpected condition that prevented it from fulfilling the request."
}
"yesterday": "Yesterday"
}

View File

@ -56,8 +56,7 @@
},
"add-edit-clone-dossier-template": {
"error": {
"conflict": "Dossiervorlage konnte nicht erstellt werden: Es existiert bereits eine Dossiervorlage mit demselben Namen.",
"generic": "Fehler beim Erstellen der Dossiervorlage."
"conflict": "Dossiervorlage konnte nicht erstellt werden: Es existiert bereits eine Dossiervorlage mit demselben Namen."
},
"form": {
"apply-updates-default": {
@ -558,10 +557,17 @@
"title": "Aktion bestätigen"
}
},
"component-download": {
"disabled-tooltip": "",
"json": "",
"tooltip": "",
"xml": ""
},
"component-log-dialog": {
"actions": {
"cancel-edit": "Cancel",
"close": "Close",
"disabled-edit": "",
"display-by-default": "",
"edit": "Edit",
"export-json": "Export JSON",
@ -758,7 +764,6 @@
"download": "",
"error": {
"400": "",
"entries-too-short": "Einige Einträge im Wörterbuch unterschreiten die Mindestlänge von 2 Zeichen. Diese sind rot markiert.",
"generic": "Es ist ein Fehler aufgetreten ... Das Wörterbuch konnte nicht aktualisiert werden!"
},
"revert-changes": "Rückgängig machen",
@ -1782,14 +1787,6 @@
"copyright-claim-text": "Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)",
"copyright-claim-title": "Copyright",
"custom-app-title": "Name der Anwendung",
"email-report": "E-Mail-Bericht",
"email": {
"body": {
"analyzed": "Im aktuellen Lizenzzeitraum insgesamt analysierte Seiten: {pages}.",
"licensed": "Lizenzierte Seiten: {pages}."
},
"title": "Lizenzbericht {licenseCustomer}"
},
"end-user-license-text": "Die Nutzung dieses Produkts unterliegt den Bedingungen der Endbenutzer-Lizenzvereinbarung für den RedactManager, sofern darin nichts anderweitig festgelegt.",
"end-user-license-title": "Endbenutzer-Lizenzvereinbarung",
"licensing-details": {
@ -2545,12 +2542,5 @@
"select": "Wählen"
}
},
"yesterday": "Gestern",
"generic-errors": {
"400": "",
"403": "",
"404": "",
"409": "",
"500": ""
}
"yesterday": "Gestern"
}

View File

@ -56,8 +56,7 @@
},
"add-edit-clone-dossier-template": {
"error": {
"conflict": "Failed to create dossier template: a dossier template with the same name already exists.",
"generic": "Failed to create dossier template."
"conflict": "Failed to create dossier template: a dossier template with the same name already exists."
},
"form": {
"apply-updates-default": {
@ -558,10 +557,17 @@
"title": "Confirm Action"
}
},
"component-download": {
"disabled-tooltip": "All files must be processed to be able to export the components as JSON or XML",
"json": "Download as JSON",
"tooltip": "Component Download",
"xml": "Download as XML"
},
"component-log-dialog": {
"actions": {
"cancel-edit": "Cancel",
"close": "Close",
"disabled-edit": "Multi-value component Read-only",
"display-by-default": "Display by default when opening documents",
"edit": "Edit",
"export-json": "Export JSON",
@ -747,7 +753,7 @@
}
},
"dev-mode": "DEV",
"dictionary": "Dictionary",
"dictionary": "Type",
"dictionary-overview": {
"compare": {
"compare": "Compare",
@ -758,7 +764,6 @@
"download": "Download current entries",
"error": {
"400": "Cannot update dictionary because at least one of the newly added words where recognized as a general term that appear too often in texts.",
"entries-too-short": "Some entries of the dictionary are below the minimum length of 2. These are highlighted with red!",
"generic": "Something went wrong... Dictionary update failed!"
},
"revert-changes": "Revert",
@ -963,7 +968,7 @@
"processing-documents": "{count} processing {count, plural, one{document} other{documents}}"
}
},
"download-file": "Download",
"download-file": "Report Download",
"download-file-disabled": "You need to be approver in the dossier and the {count, plural, one{file needs} other{files need}} to be initially processed in order to download.",
"file-listing": {
"file-entry": {
@ -1782,14 +1787,6 @@
"copyright-claim-text": "Copyright © 2020 - {currentYear} knecon",
"copyright-claim-title": "Copyright Claim",
"custom-app-title": "Custom Application Title",
"email-report": "Email Report",
"email": {
"body": {
"analyzed": "Total Analyzed Pages in current license period: {pages}.",
"licensed": "Licensed Pages: {pages}."
},
"title": "License Report {licenseCustomer}"
},
"end-user-license-text": "The use of this product is subject to the terms of the DocuMine End User License Agreement, unless otherwise specified therein.",
"end-user-license-title": "End User License Agreement",
"licensing-details": {
@ -2545,12 +2542,5 @@
"select": "Select"
}
},
"yesterday": "Yesterday",
"generic-errors": {
"400": "The sent request is not valid.",
"403": "Access to the requested resource is not allowed.",
"404": "The requested resource could not be found.",
"409": "The request is incompatible with the current state.",
"500": "The server encountered an unexpected condition that prevented it from fulfilling the request."
}
"yesterday": "Yesterday"
}

View File

@ -6,7 +6,7 @@ server {
root /usr/share/nginx/html;
# SSL stuff for cloudflare proxy-ing - ignores SSL certificate and uses SNI
add_header Content-Security-Policy "default-src 'self'; script-src 'self' blob: data: 'unsafe-eval' 'unsafe-inline'; script-src-elem 'self' data: blob: 'unsafe-inline'; script-src-attr 'self' data:; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:";
add_header Content-Security-Policy "frame-ancestors 'self'; default-src 'self'; script-src 'self' blob: data: 'unsafe-eval' 'unsafe-inline'; script-src-elem 'self' data: blob: 'unsafe-inline'; script-src-attr 'self' data:; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:";
proxy_ssl_verify off;
proxy_read_timeout 1m;
@ -32,4 +32,3 @@ server {
gzip_types application/javascript text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
}

@ -1 +1 @@
Subproject commit a6383c1dbc840115897a31567c3f5633ba78b43a
Subproject commit fd4580f60da3db4e847b711c5c1c4f388f26693a

View File

@ -4,15 +4,18 @@ export type ComponentDetails = Record<string, Record<'componentValues', ICompone
export interface IComponentLogEntry {
name: string;
originalKey: string;
componentValues: IComponentValue[];
}
export class ComponentLogEntry implements IComponentLogEntry {
readonly name: string;
readonly originalKey: string;
readonly componentValues: ComponentValue[];
constructor(entry: IComponentLogEntry) {
this.name = entry.name.replaceAll('_', ' ');
this.originalKey = entry.name;
this.componentValues = entry.componentValues;
}
}

View File

@ -1,6 +1,6 @@
export interface IComment {
id: string;
user: string;
userId: string;
date?: string;
text: string;
annotationId?: string;

View File

@ -39,7 +39,7 @@
"@ngx-translate/core": "15.0.0",
"@ngx-translate/http-loader": "8.0.0",
"@nx/angular": "16.10.0",
"@pdftron/webviewer": "10.5.0",
"@pdftron/webviewer": "10.9.0",
"chart.js": "4.4.0",
"dayjs": "1.11.10",
"file-saver": "^2.0.5",

View File

@ -3763,10 +3763,10 @@
node-addon-api "^3.2.1"
node-gyp-build "^4.3.0"
"@pdftron/webviewer@10.4.0":
version "10.4.0"
resolved "https://registry.yarnpkg.com/@pdftron/webviewer/-/webviewer-10.4.0.tgz#9f59c38f0ec1b7cc08d446ca1a9abc94aa549c41"
integrity sha512-aJOuAYEnkxn/tCaB1m548VfxILbBesLB7Fd1S15/KvjklM9nCQjwJv4+R99zL+WaxvVet9kem5LVPoiGXDHXmg==
"@pdftron/webviewer@10.9.0":
version "10.9.0"
resolved "https://registry.yarnpkg.com/@pdftron/webviewer/-/webviewer-10.9.0.tgz#c39105189c70cfaa0601dae02e688bb510f74e3b"
integrity sha512-na6dQE1aFVc42zeRYjk0UDWKqdsI1PcQeQdAcwpNCKyND9W3s8iG8GLkZzfvP2CZjGhj47l28LkZ0NUBrq3weQ==
"@phenomnomnominal/tsquery@^4.1.1":
version "4.2.0"