diff --git a/lib/core/src/lib/form/components/widgets/widget.component.ts b/lib/core/src/lib/form/components/widgets/widget.component.ts index f46dff9494..ee8e7a9a49 100644 --- a/lib/core/src/lib/form/components/widgets/widget.component.ts +++ b/lib/core/src/lib/form/components/widgets/widget.component.ts @@ -70,11 +70,11 @@ export class WidgetComponent implements AfterViewInit { // Note for developers: // returns object to be able binding it to the attribute - isRequired(): any { + isRequired(): boolean { if (this.field?.required) { return true; } - return null; + return false; } isValid(): boolean { diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.html b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.html index a3209be565..dea0bd26db 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.html +++ b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.html @@ -12,7 +12,7 @@
- {{ field.name | translate }}* + {{ field.name | translate }} diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts index 20c9fceceb..351e0b3bf4 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts @@ -336,7 +336,13 @@ describe('DropdownCloudWidgetComponent', () => { }); }); - it('should be able to display label with asterisk', () => { + it('should be able to display label with asterisk when left-label is present', () => { + widget.field = new FormFieldModel(new FormModel({ taskId: 'fake-task-id', readOnly: false, leftLabels: true }), { + id: 'dropdown-id', + name: 'option list', + type: FormFieldTypes.DROPDOWN, + options: filterOptionList + }); fixture.detectChanges(); const asterisk: HTMLElement = element.querySelector('.adf-asterisk'); @@ -402,6 +408,7 @@ describe('DropdownCloudWidgetComponent', () => { describe('and NOT visible', () => { beforeEach(() => { widget.field.isVisible = false; + widget.field.required = false; }); it('should be valid with no option selected', () => {