inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "AAE-40604 Fix case when rest/variable are okay and dropdown is requir…" (#11634)

Browse Source 
This reverts commit 31bafd718e.
This commit is contained in:
Darren Thornton
2026-02-10 07:02:35 -06:00
committed by GitHub
parent 4d99262ba3
commit 0b805f3e9b
2 changed files with 4 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts
-135
View File
@@ -303,34 +303,6 @@ describe('DropdownCloudWidgetComponent', () => {
});
});
describe('when options load successfully from restUrl', () => {
beforeEach(() => {
spyOn(formCloudService, 'getRestWidgetData').and.returnValue(of(fakeOptionList));
widget.field.restUrl = 'https://fake-rest-url';
widget.field.optionType = 'rest';
widget.field.required = true;
widget.field.value = '';
widget.field.isVisible = true;
});
it('should show required message for rest type when required and value is empty after touch', fakeAsync(() => {
widget.ngOnInit();
fixture.detectChanges();
tick(DROPDOWN_CLOUD_WIDGET_SET_VALUE_DEBOUNCE);
fixture.detectChanges();
expect(widget.isRestApiFailed).toBe(false);
expect(widget.dropdownControl.errors?.required).toBeTruthy();
widget.dropdownControl.markAsTouched();
fixture.detectChanges();
const requiredErrorElement = fixture.debugElement.query(By.css('.adf-dropdown-required-message .adf-error-text'));
expect(requiredErrorElement).toBeTruthy();
expect(requiredErrorElement.nativeElement.innerText).toEqual('FORM.FIELD.REQUIRED');
}));
});
it('should preselect dropdown widget value when Json (rest call) passed', async () => {
widget.field.restUrl = 'https://fake-rest-url';
widget.field.optionType = 'rest';
@@ -1155,86 +1127,6 @@ describe('DropdownCloudWidgetComponent', () => {
expect(widget.dropdownControl.value).toEqual({ id: 'testValueObj', name: 'testValueObjName' });
}));
it('should set dropdownControl value to null when field value is undefined', fakeAsync(() => {
widget.field = {
value: undefined,
options: [],
isVisible: true,
markAsValid: () => {}
} as FormFieldModel;
fixture.detectChanges();
widget['setFormControlValue']();
tick(DROPDOWN_CLOUD_WIDGET_SET_VALUE_DEBOUNCE);
expect(widget.dropdownControl.value).toBeNull();
}));
it('should set dropdownControl value to null when field value is empty string', fakeAsync(() => {
widget.field = {
value: '',
options: [],
isVisible: true,
markAsValid: () => {}
} as FormFieldModel;
fixture.detectChanges();
widget['setFormControlValue']();
tick(DROPDOWN_CLOUD_WIDGET_SET_VALUE_DEBOUNCE);
expect(widget.dropdownControl.value).toBeNull();
}));
it('should set dropdownControl value to null when field value is null', fakeAsync(() => {
widget.field = {
value: null,
options: [],
isVisible: true,
markAsValid: () => {}
} as FormFieldModel;
fixture.detectChanges();
widget['setFormControlValue']();
tick(DROPDOWN_CLOUD_WIDGET_SET_VALUE_DEBOUNCE);
expect(widget.dropdownControl.value).toBeNull();
}));
it('should set dropdownControl value to null when field value is default/empty option object', fakeAsync(() => {
widget.field = {
value: { id: 'empty', name: 'Choose one...' },
options: [],
isVisible: true,
markAsValid: () => {}
} as FormFieldModel;
fixture.detectChanges();
widget['setFormControlValue']();
tick(DROPDOWN_CLOUD_WIDGET_SET_VALUE_DEBOUNCE);
expect(widget.dropdownControl.value).toBeNull();
}));
it('should set dropdownControl value to null when field value object has empty id', fakeAsync(() => {
widget.field = {
value: { id: '', name: 'label' },
options: [],
isVisible: true,
markAsValid: () => {}
} as FormFieldModel;
fixture.detectChanges();
widget['setFormControlValue']();
tick(DROPDOWN_CLOUD_WIDGET_SET_VALUE_DEBOUNCE);
expect(widget.dropdownControl.value).toBeNull();
}));
it('should display options persisted from process variable', async () => {
widget.field = getVariableDropdownWidget(
'variables.json-variable',
@@ -1320,33 +1212,6 @@ describe('DropdownCloudWidgetComponent', () => {
expect(variableFailedElement).toBeTruthy();
});
it('should show required message for variable type when options load successfully and required and value is empty after touch', fakeAsync(() => {
widget.field = getVariableDropdownWidget(
'variables.json-variable',
'response.people.players',
'playerId',
'playerFullName',
mockProcessVariablesWithJson
);
widget.field.required = true;
widget.field.value = '';
widget.field.isVisible = true;
widget.ngOnInit();
fixture.detectChanges();
tick(DROPDOWN_CLOUD_WIDGET_SET_VALUE_DEBOUNCE);
fixture.detectChanges();
expect(widget.variableOptionsFailed).toBe(false);
expect(widget.dropdownControl.errors?.required).toBeTruthy();
widget.dropdownControl.markAsTouched();
fixture.detectChanges();
const requiredErrorElement = fixture.debugElement.query(By.css('.adf-dropdown-required-message .adf-error-text'));
expect(requiredErrorElement).toBeTruthy();
expect(requiredErrorElement.nativeElement.innerText).toEqual('FORM.FIELD.REQUIRED');
}));
it('should return empty array and display error when id is incorrect', () => {
widget.field = getVariableDropdownWidget(
'variables.json-variable',
lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts
+4 -13
View File
@@ -142,14 +142,9 @@ export class DropdownCloudWidgetComponent extends WidgetComponent implements OnI
if (Array.isArray(this.field.value)) {
value = this.field?.value;
} else if (this.field?.value && typeof this.field?.value === 'object') {
const obj = this.field.value;
if (obj.id === DEFAULT_OPTION.id || obj.id === '' || obj.id === undefined) {
value = null;
} else {
value = { id: obj.id, name: obj.name };
}
} else if (this.field.value === null || this.field.value === undefined || this.field.value === '') {
value = null;
value = { id: this.field?.value.id, name: this.field?.value.name };
} else if (this.field.value === null) {
value = this.field.value;
} else {
value = { id: this.field?.value, name: '' };
}
@@ -524,11 +519,7 @@ export class DropdownCloudWidgetComponent extends WidgetComponent implements OnI
return event.field.type === FormFieldTypes.DROPDOWN;
}
private setOptionValue(option: FormFieldOption | FormFieldOption[] | null, field: FormFieldModel) {
if (option == null) {
field.value = undefined;
return;
}
private setOptionValue(option: FormFieldOption | FormFieldOption[], field: FormFieldModel) {
if (Array.isArray(option) || field.hasMultipleValues) {
field.value = option;
return;