Skip to content

[NAE-1960] Enumeration Map does not propagate changes when selecting #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
machacjozef merged 2 commits into from
Apr 19, 2024
Merged

[NAE-1960] Enumeration Map does not propagate changes when selecting #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca56221
[NAE-1960] Enumeration Map does not propagate changes when selecting …
Kovy95 Apr 5, 2024
2c35f23
[NAE-1960] Enumeration Map does not propagate changes when selecting …
Kovy95 Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rc/lib/data-fields/user-field/user-default-field/abstract-user-default-field.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export abstract class AbstractUserDefaultFieldComponent extends AbstractBaseData
}

public deleteUser() {
this.dataField.value = undefined;
this.dataField.value = null;
}

public getCutProperty(i18nLabel): string {
Expand Down
2 changes: 1 addition & 1 deletion ...cts/netgrif-components-core/src/lib/task-content/services/field-converter.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand Down
5 changes: 4 additions & 1 deletion projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion projects/netgrif-components-core/src/lib/task/services/task-data.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ export class TaskDataService extends TaskHandlingService implements OnDestroy {
}

protected isAutocompleteEnumException(field: DataField<unknown>): boolean{
return (field instanceof EnumerationField) && (field.getComponentType() === 'autocomplete') && !field.valid;
return (field instanceof EnumerationField) && (field.getComponentType() === 'autocomplete') && !(field.valid || field.value === null);
}

/**
Expand Down
1 change: 1 addition & 0 deletions ...ata-fields/file-list-field/file-list-default-field/file-list-default-field.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
'clip-path': getCutProperty(fileLabel)
}">
<button mat-icon-button matPrefix
class="file-button-size"
[disabled]="formControlRef.disabled"
color="primary"
(click)="chooseFile()"
Expand Down
5 changes: 5 additions & 0 deletions ...ata-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,8 @@
padding-bottom: 13px;
position: relative;
}

.file-button-size {
height: 38px;
width: 38px;
}
1 change: 1 addition & 0 deletions ...-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
.i18n-hint-error {
padding: 0 1em;
font-size: 75%;
width: auto !important;
}

.language-svg-wrapper {
Expand Down