diff --git a/projects/netgrif-components-core/src/lib/data-fields/user-field/user-default-field/abstract-user-default-field.component.ts b/projects/netgrif-components-core/src/lib/data-fields/user-field/user-default-field/abstract-user-default-field.component.ts index dc2a7e1b4..5a62b55a1 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/user-field/user-default-field/abstract-user-default-field.component.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/user-field/user-default-field/abstract-user-default-field.component.ts @@ -60,7 +60,7 @@ export abstract class AbstractUserDefaultFieldComponent extends AbstractBaseData } public deleteUser() { - this.dataField.value = undefined; + this.dataField.value = null; } public getCutProperty(i18nLabel): string { diff --git a/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.spec.ts b/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.spec.ts index 4c1ae1f4f..7b85e07da 100644 --- a/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.spec.ts @@ -52,7 +52,7 @@ describe('FieldConvertorService', () => { const date = moment(); dataField.type = FieldTypeResource.DATE; - expect(service.formatValueForBackend(service.toClass(dataField), null)).toEqual(undefined); + expect(service.formatValueForBackend(service.toClass(dataField), null)).toEqual(null); expect(service.formatValueForBackend(service.toClass(dataField), date)) .toEqual(date.format('YYYY-MM-DD')); diff --git a/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.ts b/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.ts index 30bead05b..aec119d6e 100644 --- a/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.ts +++ b/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.ts @@ -163,7 +163,10 @@ export class FieldConverterService { if (this.resolveType(field) === FieldTypeResource.TEXT && field.component && field.component.name === 'password') { return encodeBase64(value); } - if (value === undefined || value === null) { + if (value === null) { + return null; + } + if (value === undefined) { return; } if (this.resolveType(field) === FieldTypeResource.DATE) { diff --git a/projects/netgrif-components-core/src/lib/task/services/task-data.service.ts b/projects/netgrif-components-core/src/lib/task/services/task-data.service.ts index b34013884..73b3b00af 100644 --- a/projects/netgrif-components-core/src/lib/task/services/task-data.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/task-data.service.ts @@ -348,7 +348,7 @@ export class TaskDataService extends TaskHandlingService implements OnDestroy { } protected isAutocompleteEnumException(field: DataField): boolean{ - return (field instanceof EnumerationField) && (field.getComponentType() === 'autocomplete') && !field.valid; + return (field instanceof EnumerationField) && (field.getComponentType() === 'autocomplete') && !(field.valid || field.value === null); } /** diff --git a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.html index c98986c56..49158098b 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.html @@ -10,6 +10,7 @@ 'clip-path': getCutProperty(fileLabel) }">