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

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

Browse Source
This commit is contained in:
Dan Percic 2024-07-29 11:40:49 +03:00
commit f25d134590
5 changed files with 78 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts
View File

@ -73,19 +73,20 @@ export class AddEditComponentMappingDialogComponent
} }
} }
fileChanged(file: Blob) { fileChanged(file: File) {
this.form.get('file').setValue(file); this.form.get('file').setValue(file);
this.form.get('fileName').setValue(file?.name);
} }
save() { save() {
const fileName = document.getElementById('file-name-label')?.textContent; this.dialogRef.close({ ...this.data.mapping, ...this.form.getRawValue() });
this.dialogRef.close({ ...this.data.mapping, ...this.form.getRawValue(), fileName });
} }
#getForm(): UntypedFormGroup { #getForm(): UntypedFormGroup {
return this._formBuilder.group({ return this._formBuilder.group({
name: [this.data?.mapping?.name, Validators.required], name: [this.data?.mapping?.name, Validators.required],
file: [null, 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], encoding: this.encodingTypeOptions.find(e => e === this.data?.mapping?.encoding) ?? this.encodingTypeOptions[0],
delimiter: [this.data?.mapping?.delimiter ?? ',', Validators.required], delimiter: [this.data?.mapping?.delimiter ?? ',', Validators.required],
}); });

18
apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.html
View File

@ -33,7 +33,7 @@
</mat-checkbox> </mat-checkbox>
<div class="iqser-input-group datepicker-wrapper"> <div class="iqser-input-group datepicker-wrapper">
<ng-container *ngIf="hasValidFrom()"> @if (hasValidFrom()) {
<input <input
(dateChange)="applyValidityIntervalConstraints()" (dateChange)="applyValidityIntervalConstraints()"
[matDatepicker]="fromPicker" [matDatepicker]="fromPicker"
@ -44,7 +44,7 @@
<mat-icon matDatepickerToggleIcon svgIcon="iqser:calendar"></mat-icon> <mat-icon matDatepickerToggleIcon svgIcon="iqser:calendar"></mat-icon>
</mat-datepicker-toggle> </mat-datepicker-toggle>
<mat-datepicker #fromPicker></mat-datepicker> <mat-datepicker #fromPicker></mat-datepicker>
</ng-container> }
</div> </div>
</div> </div>
@ -53,7 +53,7 @@
{{ 'add-edit-clone-dossier-template.form.valid-to' | translate }} {{ 'add-edit-clone-dossier-template.form.valid-to' | translate }}
</mat-checkbox> </mat-checkbox>
<div class="iqser-input-group datepicker-wrapper"> <div class="iqser-input-group datepicker-wrapper">
<ng-container *ngIf="hasValidTo()"> @if (hasValidTo()) {
<input <input
(dateChange)="applyValidityIntervalConstraints()" (dateChange)="applyValidityIntervalConstraints()"
[matDatepicker]="toPicker" [matDatepicker]="toPicker"
@ -64,12 +64,13 @@
<mat-icon matDatepickerToggleIcon svgIcon="iqser:calendar"></mat-icon> <mat-icon matDatepickerToggleIcon svgIcon="iqser:calendar"></mat-icon>
</mat-datepicker-toggle> </mat-datepicker-toggle>
<mat-datepicker #toPicker></mat-datepicker> <mat-datepicker #toPicker></mat-datepicker>
</ng-container> }
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="!isDocumine" class="mt-24"> @if (!isDocumine) {
<div class="mt-24">
<div class="heading"> <div class="heading">
{{ 'add-edit-clone-dossier-template.form.apply-updates-default.heading' | translate }} {{ 'add-edit-clone-dossier-template.form.apply-updates-default.heading' | translate }}
</div> </div>
@ -88,7 +89,7 @@
'download-type.label' 'download-type.label'
| translate | translate
: { : {
length: form.controls['downloadFileTypes'].value.length length: form.controls['downloadFileTypes'].value.length,
} }
" "
[options]="downloadTypes" [options]="downloadTypes"
@ -96,7 +97,7 @@
></redaction-select> ></redaction-select>
</div> </div>
<div *ngIf="!isDocumine" class="mt-24"> <div class="mt-24">
<div class="heading"> <div class="heading">
{{ 'add-edit-clone-dossier-template.form.upload-settings.heading' | translate }} {{ 'add-edit-clone-dossier-template.form.upload-settings.heading' | translate }}
</div> </div>
@ -112,7 +113,7 @@
</div> </div>
</div> </div>
<div *ngIf="!isDocumine" class="mt-24 hidden-elements"> <div class="mt-24 hidden-elements">
<div class="heading">{{ 'add-edit-clone-dossier-template.form.hidden-text.heading' | translate }}</div> <div class="heading">{{ 'add-edit-clone-dossier-template.form.hidden-text.heading' | translate }}</div>
<div class="iqser-input-group"> <div class="iqser-input-group">
<mat-checkbox color="primary" formControlName="keepHiddenText"> <mat-checkbox color="primary" formControlName="keepHiddenText">
@ -135,6 +136,7 @@
</div> </div>
</div> </div>
</div> </div>
}
</div> </div>
<div class="dialog-actions"> <div class="dialog-actions">

2
apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts
View File

@ -26,6 +26,7 @@ import { NgIf } from '@angular/common';
import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatIcon } from '@angular/material/icon'; import { MatIcon } from '@angular/material/icon';
import { SelectComponent } from '@shared/components/select/select.component'; import { SelectComponent } from '@shared/components/select/select.component';
import { MatSuffix } from '@angular/material/form-field';
const downloadTypes = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(type => ({ const downloadTypes = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(type => ({
key: type, key: type,
@ -47,6 +48,7 @@ const downloadTypes = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(t
SelectComponent, SelectComponent,
IconButtonComponent, IconButtonComponent,
MatIcon, MatIcon,
MatSuffix,
], ],
}) })
export default class DossierTemplateInfoScreenComponent extends BaseFormComponent implements OnInit { export default class DossierTemplateInfoScreenComponent extends BaseFormComponent implements OnInit {

1
apps/red-ui/src/assets/i18n/redact/de.json
View File

@ -568,6 +568,7 @@
}, },
"search": "Nach Name suchen...", "search": "Nach Name suchen...",
"table-col-names": { "table-col-names": {
"column-labels": "Column labels",
"name": "Name", "name": "Name",
"number-of-lines": "Zeilenzahl", "number-of-lines": "Zeilenzahl",
"version": "Version" "version": "Version"

1
apps/red-ui/src/assets/i18n/scm/de.json
View File

@ -568,6 +568,7 @@
}, },
"search": "Search by name...", "search": "Search by name...",
"table-col-names": { "table-col-names": {
"column-labels": "Column labels",
"name": "name", "name": "name",
"number-of-lines": "Number of lines", "number-of-lines": "Number of lines",
"version": "version" "version": "version"