diff --git a/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.html index 8283e05a8..5fc1dd487 100644 --- a/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.html @@ -42,6 +42,15 @@ type="text" /> +
+ + +
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 e8a628491..65ee0ac16 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 @@ -17,12 +17,14 @@ interface DialogData { dossierTemplateId: string; mapping: IComponentMapping; } + interface DialogResult { id: string; name: string; file: Blob; encoding: string; delimiter: string; + quoteChar: string; fileName?: string; } @@ -72,14 +74,14 @@ export class AddEditComponentMappingDialogComponent const file = new Blob([fileContent.body as Blob], { type: 'text/csv' }); this.form.get('file').setValue(file); this.initialFormValue = this.form.getRawValue(); - this.#disableEncodingAndDelimiter(); + this.#disableEncodingAndQuoteCharAndDelimiter(); } } changeFile(file: File) { this.form.get('file').setValue(file); this.form.get('fileName').setValue(file?.name); - this.#enableEncodingAndDelimiter(); + this.#enableEncodingAndQuoteCharAndDelimiter(); } save() { @@ -93,16 +95,19 @@ export class AddEditComponentMappingDialogComponent 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], + quoteChar: [this.data?.mapping?.quoteChar ?? '"', Validators.required], }); } - #disableEncodingAndDelimiter() { + #disableEncodingAndQuoteCharAndDelimiter() { this.form.get('encoding').disable(); this.form.get('delimiter').disable(); + this.form.get('quoteChar').disable(); } - #enableEncodingAndDelimiter() { + #enableEncodingAndQuoteCharAndDelimiter() { this.form.get('encoding').enable(); this.form.get('delimiter').enable(); + this.form.get('quoteChar').enable(); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.ts index b451d54b3..997aefcc2 100644 --- a/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/component-mappings/component-mappings-screen.component.ts @@ -99,8 +99,8 @@ export default class ComponentMappingsScreenComponent extends ListingComponent