diff --git a/lib/core/src/lib/form/components/form-field/form-field.component.spec.ts b/lib/core/src/lib/form/components/form-field/form-field.component.spec.ts index 83c2981cdf..2ac69fc423 100644 --- a/lib/core/src/lib/form/components/form-field/form-field.component.spec.ts +++ b/lib/core/src/lib/form/components/form-field/form-field.component.spec.ts @@ -103,29 +103,6 @@ describe('FormFieldComponent', () => { }); }); - it('should set field preview state', () => { - const field = new FormFieldModel(form, { - type: FormFieldTypes.DROPDOWN, - id: 'FAKE-DROPDOWN-WIDGET' - }); - component.field = field; - component.preview = true; - fixture.detectChanges(); - - expect(component.field.preview).toBe(true); - }); - - it('should field preview state be false as default', () => { - const field = new FormFieldModel(form, { - type: FormFieldTypes.DROPDOWN, - id: 'FAKE-DROPDOWN-WIDGET' - }); - component.field = field; - fixture.detectChanges(); - - expect(component.field.preview).toBe(false); - }); - it('should hide the field when it is not visible', (done) => { const field = new FormFieldModel(form, { type: FormFieldTypes.TEXT, diff --git a/lib/core/src/lib/form/components/form-field/form-field.component.ts b/lib/core/src/lib/form/components/form-field/form-field.component.ts index e9ce10309a..6d61c168de 100644 --- a/lib/core/src/lib/form/components/form-field/form-field.component.ts +++ b/lib/core/src/lib/form/components/form-field/form-field.component.ts @@ -63,9 +63,6 @@ export class FormFieldComponent implements OnInit, OnDestroy { @Input() field: FormFieldModel = null; - @Input() - preview: boolean = false; - componentRef: ComponentRef; focus: boolean = false; @@ -83,7 +80,6 @@ export class FormFieldComponent implements OnInit, OnDestroy { } const originalField = this.getField(); if (originalField) { - this.setFieldPreviewState(); const customTemplate = this.field.form.customFieldTemplates[originalField.type]; if (customTemplate && this.hasController(originalField.type)) { const factory = this.getComponentFactorySync(originalField.type, customTemplate); @@ -158,10 +154,6 @@ export class FormFieldComponent implements OnInit, OnDestroy { return module.componentFactories.find((x) => x.componentType === decoratedCmp); } - private setFieldPreviewState(): void { - this.field.preview = this.preview; - } - focusToggle() { setTimeout(() => { this.focus = !this.focus; diff --git a/lib/core/src/lib/form/components/widgets/core/form-field.model.ts b/lib/core/src/lib/form/components/widgets/core/form-field.model.ts index 6704796c6a..8488bd2757 100644 --- a/lib/core/src/lib/form/components/widgets/core/form-field.model.ts +++ b/lib/core/src/lib/form/components/widgets/core/form-field.model.ts @@ -83,7 +83,6 @@ export class FormFieldModel extends FormWidgetModel { groupsRestriction: string[]; leftLabels: boolean = false; variableConfig: VariableConfig; - preview: boolean = false; // container model members numberOfColumns: number = 1; diff --git a/lib/core/src/lib/form/components/widgets/core/form.model.ts b/lib/core/src/lib/form/components/widgets/core/form.model.ts index 8673004ba4..14c0ae7eff 100644 --- a/lib/core/src/lib/form/components/widgets/core/form.model.ts +++ b/lib/core/src/lib/form/components/widgets/core/form.model.ts @@ -90,7 +90,6 @@ export class FormModel implements ProcessFormModel { isValid = true; processVariables: ProcessVariableModel[] = []; variables: FormVariableModel[] = []; - preview: boolean = false; constructor( json?: any, diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts index 6a408e55c4..fddc165652 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts @@ -1093,30 +1093,6 @@ describe('FormCloudComponent', () => { expect(formComponent.disableSaveButton).toBeTrue(); }); - it('should set form preview state', () => { - const formModel = new FormModel(); - formComponent.form = formModel; - formComponent.preview = true; - formComponent.ngOnChanges({ - preview: { - currentValue: true, - previousValue: undefined, - firstChange: false, - isFirstChange: () => false - } - }); - - expect(formComponent.form.preview).toBe(true); - }); - - it('should form preview state be false as default', () => { - const formModel = new FormModel(); - formComponent.form = formModel; - fixture.detectChanges(); - - expect(formComponent.form.preview).toBe(false); - }); - describe('form validations', () => { it('should be able to set visibility conditions for Attach File widget', async () => { spyOn(formCloudService, 'getForm').and.returnValue(of(conditionalUploadWidgetsMock)); diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts index 2f3bec4fd5..7b5da60ade 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts @@ -82,9 +82,6 @@ export class FormCloudComponent extends FormBaseComponent implements OnChanges, @Input() fieldValidators: FormFieldValidator[] = [...FORM_FIELD_VALIDATORS]; - @Input() - preview: boolean = false; - /** Emitted when the form is submitted with the `Save` or custom outcomes. */ @Output() formSaved = new EventEmitter(); @@ -179,10 +176,6 @@ export class FormCloudComponent extends FormBaseComponent implements OnChanges, this.refreshFormData(); return; } - - if (changes?.preview?.currentValue) { - this.setFormPreviewState(); - } } /** @@ -364,10 +357,6 @@ export class FormCloudComponent extends FormBaseComponent implements OnChanges, this.onFormDataRefreshed(this.form); } - private setFormPreviewState(): void { - this.form.preview = this.preview; - } - protected onFormLoaded(form: FormModel) { this.formLoaded.emit(form); } 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 e7ea77a3a6..3d13bef038 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 @@ -1023,18 +1023,9 @@ describe('DropdownCloudWidgetComponent', () => { expect(logServiceSpy).toHaveBeenCalledWith('variables.json-variable not found'); }); - it('should NOT display errors if field is in the preview state', () => { - widget.field = getVariableDropdownWidget('variables.json-variable', 'response.wrongPath.players', 'playerId', 'playerFullName', mockProcessVariablesWithJson); - widget.field.preview = true; - fixture.detectChanges(); - - const failedErrorMsgElement = fixture.debugElement.query(By.css('.adf-dropdown-failed-message')); - expect(failedErrorMsgElement).toBeNull(); - }); - it('should NOT display errors if form is in the preview state', () => { widget.field = getVariableDropdownWidget('variables.json-variable', 'response.wrongPath.players', 'playerId', 'playerFullName', mockProcessVariablesWithJson); - widget.field.form.preview = true; + spyOn(formCloudService, 'getPreviewState').and.returnValue(true); fixture.detectChanges(); const failedErrorMsgElement = fixture.debugElement.query(By.css('.adf-dropdown-failed-message')); diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts index 58d40e1e68..bbfed58e9b 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts @@ -375,11 +375,13 @@ export class DropdownCloudWidgetComponent extends WidgetComponent implements OnI } private setPreviewState(): void { - this.previewState = this.field?.form?.preview ||this.field?.preview; + this.previewState = this.formCloudService.getPreviewState(); } private handleError(error: any) { - this.logService.error(error); + if (!this.previewState) { + this.logService.error(error); + } } isReadOnlyType(): boolean { diff --git a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts index 0f9b183dbc..b9fe37c1dd 100644 --- a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts @@ -229,4 +229,8 @@ export class FormCloudService extends BaseCloudService implements FormCloudServi } return null; } + + getPreviewState(): boolean { + return false; + } }