diff --git a/apps/red-ui/src/app/models/file/annotation-permissions.utils.ts b/apps/red-ui/src/app/models/file/annotation-permissions.utils.ts index cfd8afc3d..aa0830d0c 100644 --- a/apps/red-ui/src/app/models/file/annotation-permissions.utils.ts +++ b/apps/red-ui/src/app/models/file/annotation-permissions.utils.ts @@ -16,10 +16,7 @@ export const canForceRedaction = (annotation: AnnotationWrapper, canAddRedaction export const canAcceptRecommendation = (annotation: AnnotationWrapper) => annotation.isRecommendation && !annotation.pending; export const canMarkAsFalsePositive = (annotation: AnnotationWrapper, annotationEntity: Dictionary) => - annotation.canBeMarkedAsFalsePositive && - !annotation.hasBeenForcedRedaction && - !annotation.hasBeenResizedLocally && - annotationEntity?.hasDictionary; + annotation.canBeMarkedAsFalsePositive && !annotation.hasBeenResizedLocally && annotationEntity?.hasDictionary; export const canRemoveOnlyHere = (annotation: AnnotationWrapper, canAddRedaction: boolean, autoAnalysisDisabled: boolean) => canAddRedaction && @@ -30,7 +27,7 @@ export const canRemoveFromDictionary = (annotation: AnnotationWrapper, autoAnaly annotation.isModifyDictionary && (annotation.isRedacted || annotation.isSkipped || annotation.isHint || (annotation.isIgnoredHint && !annotation.isRuleBased)) && (autoAnalysisDisabled || !annotation.pending) && - [LogEntryEngines.DICTIONARY, LogEntryEngines.DOSSIER_DICTIONARY].some(engine => annotation.engines.includes(engine)); + annotation.isDictBased; export const canRemoveRedaction = (annotation: AnnotationWrapper, permissions: AnnotationPermissions) => (!annotation.isIgnoredHint || !annotation.isRuleBased) && diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index 96c3456c3..fe01347fd 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -74,13 +74,17 @@ export class AnnotationWrapper implements IListable { } get isDictBased() { - return this.engines.includes(LogEntryEngines.DICTIONARY); + return [LogEntryEngines.DICTIONARY, LogEntryEngines.DOSSIER_DICTIONARY].some(engine => this.engines.includes(engine)); } get isRedactedImageHint() { return this.IMAGE_HINT && this.superType === SuperTypes.Redaction; } + get isSkippedImageHint() { + return this.IMAGE_HINT && this.superType === SuperTypes.Hint; + } + get searchKey(): string { return this.id; } diff --git a/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts index 28c4fd351..2542e31eb 100644 --- a/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { CircleButtonComponent, IconButtonComponent, IconButtonTypes, IqserDialogComponent, UploadFileComponent } from '@iqser/common-ui'; +import { CircleButtonComponent, IconButtonComponent, IqserDialogComponent, UploadFileComponent } from '@iqser/common-ui'; import { FileAttributeEncodingTypes, IComponentMapping } from '@red/domain'; import { FormBuilder, ReactiveFormsModule, UntypedFormGroup, Validators } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; @@ -22,6 +22,7 @@ interface DialogResult { file: Blob; encoding: string; delimiter: string; + fileName?: string; } @Component({ @@ -63,16 +64,18 @@ export class AddEditComponentMappingDialogComponent async ngOnInit() { if (this.data.mapping?.fileName) { this.activeFile = { name: this.data.mapping.fileName } as File; - const file = await firstValueFrom( + const fileContent = await firstValueFrom( this._componentMappingService.getComponentMappingFile(this.data.dossierTemplateId, this.data.mapping.id), ); + const file = new Blob([fileContent.body as Blob], { type: 'text/csv' }); this.form.get('file').setValue(file); this.initialFormValue = this.form.getRawValue(); } } - fileChanged(file: Blob) { + fileChanged(file: File) { this.form.get('file').setValue(file); + this.form.get('fileName').setValue(file?.name); } save() { @@ -83,6 +86,7 @@ export class AddEditComponentMappingDialogComponent return this._formBuilder.group({ name: [this.data?.mapping?.name, Validators.required], file: [null, Validators.required], + fileName: [this.data?.mapping?.fileName, Validators.required], encoding: this.encodingTypeOptions.find(e => e === this.data?.mapping?.encoding) ?? this.encodingTypeOptions[0], delimiter: [this.data?.mapping?.delimiter ?? ',', Validators.required], }); diff --git a/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.html index 4b2923982..1ecc27038 100644 --- a/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.html @@ -44,6 +44,10 @@ {{ entity.numberOfLines }} +
+ {{ entity.columnLabelsString }} +
+
implements OnInit { @@ -61,6 +64,7 @@ export default class ComponentMappingsScreenComponent extends ListingComponent
- + @if (hasValidFrom()) { - + }
@@ -53,7 +53,7 @@ {{ 'add-edit-clone-dossier-template.form.valid-to' | translate }}
- + @if (hasValidTo()) { - + }
-
-
- {{ 'add-edit-clone-dossier-template.form.apply-updates-default.heading' | translate }} -
-
- - {{ 'add-edit-clone-dossier-template.form.apply-updates-default.description' | translate }} - -
-
- -
-
{{ 'download-includes' | translate }}
- - -
- -
-
- {{ 'add-edit-clone-dossier-template.form.upload-settings.heading' | translate }} -
-
- - {{ 'add-edit-clone-dossier-template.form.upload-settings.ocr-by-default' | translate }} - -
-
- - {{ 'add-edit-clone-dossier-template.form.upload-settings.remove-watermark' | translate }} - -
-
- -
-
{{ 'add-edit-clone-dossier-template.form.hidden-text.heading' | translate }}
-
- - {{ 'add-edit-clone-dossier-template.form.hidden-text.title' | translate }} - -
{{ 'add-edit-clone-dossier-template.form.hidden-text.description' | translate }}
-
-
- - {{ 'add-edit-clone-dossier-template.form.image-metadata.title' | translate }} - -
{{ 'add-edit-clone-dossier-template.form.image-metadata.description' | translate }}
-
-
- - {{ 'add-edit-clone-dossier-template.form.overlapping-elements.title' | translate }} - -
- {{ 'add-edit-clone-dossier-template.form.overlapping-elements.description' | translate }} + @if (!isDocumine) { +
+
+ {{ 'add-edit-clone-dossier-template.form.apply-updates-default.heading' | translate }} +
+
+ + {{ 'add-edit-clone-dossier-template.form.apply-updates-default.description' | translate }} +
-
+ +
+
{{ 'download-includes' | translate }}
+ + +
+ +
+
+ {{ 'add-edit-clone-dossier-template.form.upload-settings.heading' | translate }} +
+
+ + {{ 'add-edit-clone-dossier-template.form.upload-settings.ocr-by-default' | translate }} + +
+
+ + {{ 'add-edit-clone-dossier-template.form.upload-settings.remove-watermark' | translate }} + +
+
+ +
+
{{ 'add-edit-clone-dossier-template.form.hidden-text.heading' | translate }}
+
+ + {{ 'add-edit-clone-dossier-template.form.hidden-text.title' | translate }} + +
{{ 'add-edit-clone-dossier-template.form.hidden-text.description' | translate }}
+
+
+ + {{ 'add-edit-clone-dossier-template.form.image-metadata.title' | translate }} + +
{{ 'add-edit-clone-dossier-template.form.image-metadata.description' | translate }}
+
+
+ + {{ 'add-edit-clone-dossier-template.form.overlapping-elements.title' | translate }} + +
+ {{ 'add-edit-clone-dossier-template.form.overlapping-elements.description' | translate }} +
+
+
+ }
diff --git a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts index 0d21402f1..a9b2ffd59 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts @@ -26,6 +26,7 @@ import { NgIf } from '@angular/common'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatIcon } from '@angular/material/icon'; import { SelectComponent } from '@shared/components/select/select.component'; +import { MatSuffix } from '@angular/material/form-field'; const downloadTypes = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(type => ({ key: type, @@ -47,6 +48,7 @@ const downloadTypes = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(t SelectComponent, IconButtonComponent, MatIcon, + MatSuffix, ], }) export default class DossierTemplateInfoScreenComponent extends BaseFormComponent implements OnInit { diff --git a/apps/red-ui/src/app/modules/file-preview/components/documine-export/documine-export.component.ts b/apps/red-ui/src/app/modules/file-preview/components/documine-export/documine-export.component.ts index 2a412ffb4..74c75e514 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/documine-export/documine-export.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/documine-export/documine-export.component.ts @@ -1,6 +1,6 @@ -import { Component, Input } from '@angular/core'; +import { Component, input, Input } from '@angular/core'; import { firstValueFrom } from 'rxjs'; -import { Dossier } from '@red/domain'; +import { Dossier, File } from '@red/domain'; import { ComponentLogService } from '@services/files/component-log.service'; import { MatTooltip } from '@angular/material/tooltip'; import { TranslateModule } from '@ngx-translate/core'; @@ -13,15 +13,18 @@ import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu'; imports: [MatTooltip, TranslateModule, MatMenuTrigger, MatMenu, MatMenuItem], }) export class DocumineExportComponent { - @Input() dossier: Dossier; + readonly dossier = input(); + readonly file = input(); constructor(private readonly _componentLogService: ComponentLogService) {} downloadComponentAsJSON() { - return firstValueFrom(this._componentLogService.exportJSON(this.dossier.dossierTemplateId, this.dossier.dossierId)); + return firstValueFrom( + this._componentLogService.exportJSON(this.dossier().dossierTemplateId, this.dossier().dossierId, this.file()), + ); } async downloadComponentAsXML() { - return firstValueFrom(this._componentLogService.exportXML(this.dossier.dossierTemplateId, this.dossier.dossierId)); + return firstValueFrom(this._componentLogService.exportXML(this.dossier().dossierTemplateId, this.dossier().dossierId, this.file())); } } diff --git a/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.html b/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.html index 42be825f6..92216e66a 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.html @@ -1,64 +1,76 @@
{{ entryLabel }}
-
-
- - -
-
- -
-
-
- -
- - -
-
- -
- + @if (!editing) { +
+
+ @for (componentValue of entry.componentValues; track componentValue) { + + } +
+
+ @if (canEdit) { + + @if (hasUpdatedValues) { +
+ } + }
-
-
-
- -
-
- - + } @else { +
+ @for (value of entry.componentValues; track value) { +
+ +
+ +
+ +
+ }
-
- +
+ +
+
+ @if (hasUpdatedValues && canEdit) { + + } + +
+
+ } + @if (!editing) { + + } +
diff --git a/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.scss b/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.scss index 288ed4125..3ee2c0515 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.scss @@ -59,7 +59,6 @@ &:not(.header):hover, &.selected { background-color: var(--iqser-grey-8); - border-left: 4px solid var(--iqser-primary); margin-left: 0; margin-right: 0; @@ -67,18 +66,31 @@ cursor: pointer; } - .component { - margin-left: 22px; - } .value { margin-right: 26px; + } + } + &:hover { + .component { + margin-left: 26px; + } + + .value { .actions { iqser-circle-button { visibility: visible; } } } + } + + &.selected { + border-left: 4px solid var(--iqser-primary); + + .component { + margin-left: 22px; + } .arrow-right { visibility: visible; @@ -129,6 +141,10 @@ } } +.hidden-button { + visibility: hidden; +} + ::ng-deep .add-value { mat-icon { transform: scale(2); diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-header/file-header.component.html b/apps/red-ui/src/app/modules/file-preview/components/file-header/file-header.component.html index a18228626..f7606feb3 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-header/file-header.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/file-header/file-header.component.html @@ -1,7 +1,7 @@
- +
diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html index 8236f6291..9e6fac31b 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html @@ -32,197 +32,212 @@ -
- - - - - - +@if (displayedAnnotations$ | async; as annotations) { +
+ + + + + + -
-
- +
+
+ - {{ listingService.selectedLength$ | async }} selected + {{ listingService.selectedLength$ | async }} selected - -
- - -
- -
-
-
-
- -
- - - -
- -
-
-
- -
-
- - - - - - - - -
-
-
-
+
-
- - +
+ +
+
+
+
- - {{ 'file-preview.tabs.annotations.page-is' | translate }} - . - - - - {{ 'file-preview.tabs.annotations.no-annotations' | translate }} - - - {{ 'file-preview.tabs.annotations.wrong-filters' | translate }} - - {{ 'file-preview.tabs.annotations.the-filters' | translate }} - - - -
- - - +
- - + + +
+ +
+
- +
+ @if (state.file().excluded && documentInfoService.hidden()) { + + } @else { +
+ + + + + + + + +
+
+
+
+
+ +
+ + + + {{ 'file-preview.tabs.annotations.page-is' | translate }} + . + + + + {{ 'file-preview.tabs.annotations.no-annotations' | translate }} + + + {{ 'file-preview.tabs.annotations.wrong-filters' | translate }} + + {{ 'file-preview.tabs.annotations.the-filters' | translate }} + + + +
+ + + +
+ + + +
+ } + +
-
+} this.#filterAnnotations(annotations, primary, secondary)), map(annotations => this.#mapListItemsFromAnnotationWrapperArray(annotations)), + tap(annotations => this.#scrollToFirstAnnotationPage(annotations)), ); } @@ -520,4 +521,11 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On }); return listItemsMap; } + + #scrollToFirstAnnotationPage(annotations: Map[]>) { + if (this.isDocumine && annotations.size && !this.displayedPages.includes(this.pdf.currentPage())) { + const page = annotations.keys().next().value; + this.pdf.navigateTo(page); + } + } } diff --git a/apps/red-ui/src/app/modules/file-preview/components/right-container/file-preview-right-container.component.html b/apps/red-ui/src/app/modules/file-preview/components/right-container/file-preview-right-container.component.html index 54f172f50..c11a4a464 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/right-container/file-preview-right-container.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/right-container/file-preview-right-container.component.html @@ -1,6 +1,6 @@ - + diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.html index 74d340e88..2013a2410 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.html @@ -1,9 +1,6 @@
-
+
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.ts index a2f2de68a..c51877fb3 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-redaction-dialog/resize-redaction-dialog.component.ts @@ -63,6 +63,10 @@ export class ResizeRedactionDialogComponent extends IqserDialogComponent< this.form = this.#getForm(); } + get dialogHeaderType() { + return this.data.redaction.HINT ? 'hint' : this.data.redaction.isSkippedImageHint ? 'image' : 'redaction'; + } + get displayedDictionaryLabel() { const dictType = this.form.get('dictionary').value; if (dictType) { diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss index b708a86bd..caada04ca 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss @@ -39,7 +39,7 @@ } &.documine-container { - width: 70%; + width: 60%; } } 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 41b4d7d05..e50423b4c 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 @@ -275,6 +275,7 @@ export class ViewerHeaderService { updateElements(): void { this._pdf.instance?.UI.setHeaderItems(header => { + const documineButtons = this.#isDocumine ? 1 : 0; const enabledItems: IHeaderElement[] = []; const groups: HeaderElementType[][] = [ [HeaderElements.COMPARE_BUTTON, HeaderElements.CLOSE_COMPARE_BUTTON], @@ -293,15 +294,15 @@ export class ViewerHeaderService { groups.forEach(group => this.#pushGroup(enabledItems, group)); const loadAllAnnotationsButton = this.#buttons.get(HeaderElements.LOAD_ALL_ANNOTATIONS); - let startButtons = 11; - let deleteCount = 15; + let startButtons = 11 - documineButtons; + let deleteCount = 15 - documineButtons; if (this.#isEnabled(HeaderElements.LOAD_ALL_ANNOTATIONS)) { if (!header.getItems().includes(loadAllAnnotationsButton)) { header.get('leftPanelButton').insertAfter(loadAllAnnotationsButton); } - startButtons = 12; - deleteCount = 16; + startButtons = 12 - documineButtons; + deleteCount = 16 - documineButtons; } else { header.delete(HeaderElements.LOAD_ALL_ANNOTATIONS); } diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html index 1f9e0bfc3..836273140 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html @@ -20,6 +20,7 @@ [tooltipPosition]="tooltipPosition" [helpModeKeyPrefix]="helpModeKeyPrefix" [isDossierOverviewWorkflow]="isDossierOverviewWorkflow" + [file]="file" >
diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html index 26cf74e17..b7e7f9e05 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html @@ -1,3 +1,14 @@ +@if (isDocumine) { + +} + + + + + + diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts index 8f310dc0d..dc211ba1d 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts @@ -1,6 +1,6 @@ import { Component, inject, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core'; import { Action, ActionTypes, Dossier, File } from '@red/domain'; -import { CircleButtonComponent, CircleButtonType, IqserDialog, StopPropagationDirective, Toaster } from '@iqser/common-ui'; +import { CircleButtonComponent, CircleButtonType, getConfig, IqserDialog, StopPropagationDirective, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FileDownloadService } from '@upload-download/services/file-download.service'; import { PermissionsService } from '@services/permissions.service'; @@ -13,6 +13,8 @@ import { FileDownloadBtnComponent } from '@shared/components/buttons/file-downlo import { MatSlideToggle } from '@angular/material/slide-toggle'; import { MatTooltip } from '@angular/material/tooltip'; import { MatIcon } from '@angular/material/icon'; +import { firstValueFrom } from 'rxjs'; +import { ComponentLogService } from '@services/files/component-log.service'; @Component({ selector: 'redaction-expandable-file-actions', @@ -44,11 +46,13 @@ export class ExpandableFileActionsComponent implements OnChanges { @Input() tooltipPosition: IqserTooltipPosition; @Input() helpModeKeyPrefix: 'dossier' | 'editor'; @Input() isDossierOverviewWorkflow = false; + @Input() file: File; displayedButtons: Action[]; hiddenButtons: Action[]; expanded = false; @ViewChild(MatMenuTrigger) readonly matMenu: MatMenuTrigger; readonly trackBy = trackByFactory(); + readonly isDocumine = getConfig().IS_DOCUMINE; readonly #appBaseHref = inject(APP_BASE_HREF); constructor( @@ -56,6 +60,7 @@ export class ExpandableFileActionsComponent implements OnChanges { private readonly _toaster: Toaster, private readonly _permissionsService: PermissionsService, private readonly _dialog: IqserDialog, + private readonly _componentLogService: ComponentLogService, ) {} ngOnChanges(changes: SimpleChanges) { @@ -124,4 +129,12 @@ export class ExpandableFileActionsComponent implements OnChanges { params: { downloadHref: `${this.#appBaseHref}/main/downloads` }, }); } + + downloadComponentAsJSON() { + return firstValueFrom(this._componentLogService.exportJSON(this.file.dossierTemplateId, this.file.dossierId, this.file)); + } + + async downloadComponentAsXML() { + return firstValueFrom(this._componentLogService.exportXML(this.file.dossierTemplateId, this.file.dossierId, this.file)); + } } diff --git a/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts b/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts index b124f0681..76be4dd06 100644 --- a/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts +++ b/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts @@ -22,7 +22,7 @@ export class ComponentMappingsService extends EntitiesService { const formParams = new FormData(); - formParams.append('file', file); + formParams.append('file', file, componentMapping.fileName); const queryParams: List = [ { key: 'name', value: componentMapping.name }, diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index 57cc94144..91a25aeb1 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -568,6 +568,7 @@ }, "search": "Nach Name suchen...", "table-col-names": { + "column-labels": "Column labels", "name": "Name", "number-of-lines": "Zeilenzahl", "version": "Version" diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 856ceb02b..cba884999 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -568,6 +568,7 @@ }, "search": "Search by name...", "table-col-names": { + "column-labels": "Column labels", "name": "name", "number-of-lines": "Number of lines", "version": "version" diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index 515f352af..9c1134212 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -568,6 +568,7 @@ }, "search": "Search by name...", "table-col-names": { + "column-labels": "Column labels", "name": "name", "number-of-lines": "Number of lines", "version": "version" diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index 55ab7cdab..e8686af82 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -568,6 +568,7 @@ }, "search": "Search by name...", "table-col-names": { + "column-labels": "Column labels", "name": "name", "number-of-lines": "Number of lines", "version": "version" @@ -1271,8 +1272,8 @@ "dictionary": "Dictionary", "dossier-attributes": "Dossier attributes", "dossier-dictionary": "Dossier dictionary", - "dossier-info": "Dossier Info", - "download-package": "Download Package", + "dossier-info": "Dossier info", + "download-package": "Download package", "general-info": "General Information", "members": "Members", "team-members": "Team Members" diff --git a/apps/red-ui/src/styles.scss b/apps/red-ui/src/styles.scss index 205a6afba..da0a70cfa 100644 --- a/apps/red-ui/src/styles.scss +++ b/apps/red-ui/src/styles.scss @@ -164,7 +164,7 @@ $dark-accent-10: darken(vars.$accent, 10%); body { --workload-width: 350px; --documine-workload-content-width: 287px; - --structured-component-management-width: 30%; + --structured-component-management-width: 40%; --qiuck-navigation-width: 61px; --iqser-app-name-font-family: OpenSans Extrabold, sans-serif; --iqser-app-name-font-size: 13px; diff --git a/libs/common-ui b/libs/common-ui index 98ac49fbc..9bbaecb7e 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 98ac49fbc81bb9989c14a8ca06c11d98ed042c86 +Subproject commit 9bbaecb7e566afe2efb8dbce73dce6eb5373801b diff --git a/libs/red-domain/src/lib/component-mappings/component-mapping.ts b/libs/red-domain/src/lib/component-mappings/component-mapping.ts index b8e1e7745..9bfa2d6b1 100644 --- a/libs/red-domain/src/lib/component-mappings/component-mapping.ts +++ b/libs/red-domain/src/lib/component-mappings/component-mapping.ts @@ -6,6 +6,7 @@ export interface IComponentMapping extends IListable { fileName: string; version: number; columnLabels: string[]; + columnLabelsString: string; numberOfLines: number; encoding: string; delimiter: string; @@ -17,6 +18,7 @@ export class ComponentMapping implements IComponentMapping, IListable { readonly fileName: string; readonly version: number; readonly columnLabels: string[]; + readonly columnLabelsString: string; readonly numberOfLines: number; readonly encoding: string; readonly delimiter: string; @@ -27,6 +29,7 @@ export class ComponentMapping implements IComponentMapping, IListable { this.fileName = componentMapping.fileName; this.version = componentMapping.version; this.columnLabels = componentMapping.columnLabels; + this.columnLabelsString = componentMapping.columnLabels?.join(', '); this.numberOfLines = componentMapping.numberOfLines; this.encoding = componentMapping.encoding; this.delimiter = componentMapping.delimiter;