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

Pull request #400: RED-6122, pass the date as a string for file attributes.

Browse Source 
Merge in RED/ui from RED-6122 to master

* commit '831b30dd9f81d6baa83f12e29cbd26f6c906241d':
  RED-6122, pass the date as a string for file attributes.
This commit is contained in:
George Balanesc 2023-02-14 16:10:31 +01:00 committed by Dan Percic
commit 631296c3ab
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.ts
View File

@ -7,6 +7,7 @@ import { ActiveDossiersService } from '@services/dossiers/active-dossiers.servic
import { FilesService } from '@services/files/files.service';
import { BaseDialogComponent } from '@iqser/common-ui';
import { firstValueFrom } from 'rxjs';
import dayjs from 'dayjs';
@Component({
templateUrl: './document-info-dialog.component.html',
@ -39,7 +40,7 @@ export class DocumentInfoDialogComponent extends BaseDialogComponent implements
async save() {
const attributeIdToValue = {
...this.file.fileAttributes?.attributeIdToValue,
...this.form.getRawValue(),
...this._mapFormValues(this.form.getRawValue()),
};
await firstValueFrom(this._fileAttributesService.setFileAttributes({ attributeIdToValue }, this.file.dossierId, this.file.fileId));
await firstValueFrom(this._filesService.reload(this.file.dossierId, this.file));
@ -48,13 +49,27 @@ export class DocumentInfoDialogComponent extends BaseDialogComponent implements
private _getForm(): UntypedFormGroup {
return this._formBuilder.group(
this.attributes.reduce(
(acc, attr) => ({
this.attributes.reduce((acc, attr) => {
const attrValue = this.file.fileAttributes?.attributeIdToValue[attr.id];
return {
...acc,
[attr.id]: [this.file.fileAttributes?.attributeIdToValue[attr.id]],
}),
{},
),
[attr.id]: [this._isDate(attr.id) ? dayjs(attrValue).toDate() : attrValue],
};
}, {}),
);
}
private _isDate(attrId: string) {
return this.attributes.find(a => a.id === attrId).type === 'DATE';
}
private _mapFormValues(formValue) {
return Object.keys(formValue).reduce((acc, key) => {
const crtValue = formValue[key];
return {
...acc,
[key]: this._isDate(key) ? dayjs(crtValue).format('YYYY-MM-DD') : crtValue,
};
}, {});
}
}