diff options
| author |   Amichai Hemli <ah0398@intl.att.com> | 2019-07-09 14:23:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-07-09 14:23:37 +0000 |
| commit | 58d22b526418ffeb89337fed9e20406da420bc6f (patch) | |
| tree | 4357c9cfe1c92d57ac0a3f90167cade7af505b95 /vid-webpack-master/src/app/shared/components/formControls/component | |
| parent | 302b02a847e7aa8ccf3ff4bc14ff8a9cf67511b0 (diff) | |
| parent | 97d9f66df456ef4573047a90baa3cc3ee4bfb0b7 (diff) | |
Merge changes Ib4430bf2,Icc0bdb9e,I2736b984
* changes:
Merge from ecomp 718fd196 - Ext. Services Simulator
Merge from ecomp 718fd196 - Integration Tests
Merge from ecomp 718fd196 - Modern UI
Diffstat (limited to 'vid-webpack-master/src/app/shared/components/formControls/component')
2 files changed, 4 insertions, 3 deletions
diff --git a/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.html b/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.html index 6d13e52f8..12f62a96f 100644 --- a/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.html +++ b/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.html @@ -6,7 +6,7 @@ [attr.data-tests-id]="data?.dataTestId" name="{{data?.name}}" [formControl]="form.controls[data.controlName]" - [ngClass]="{'error-style' : (form?.controls[data?.controlName]?.touched && form?.controls[data?.controlName]?.errors) || data?.hasEmptyOptions , + [ngClass]="{'error-style' : ((form?.controls[data?.controlName]?.touched && form?.controls[data?.controlName]?.errors) || data?.hasEmptyOptions) && data?.isRequired(), 'grayColor': form?.controls[data?.controlName]?.value == null || form?.controls[data?.controlName]?.value == undefined, 'blackColor' : form?.controls[data?.controlName]?.value != null}" (blur)="data.onBlur()"> @@ -16,6 +16,5 @@ [value]="option[data.ngValue]" [disabled]="!option?.isPermitted && option?.isPermitted != undefined">{{option.name}} </option> </select> - <form-control-error *ngIf="data?.hasEmptyOptions" [message]="'No results for this request. Please change criteria.'"></form-control-error> + <form-control-error *ngIf="data?.hasEmptyOptions && data?.isRequired()" [message]="'No results for this request. Please change criteria.'"></form-control-error> </div> - diff --git a/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.ts b/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.ts index 550feca22..8148368dd 100644 --- a/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.ts +++ b/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.ts @@ -11,11 +11,13 @@ export class DropdownFormControlComponent implements OnChanges{ @Input() data: DropdownFormControl = null; @Input() form: FormGroup = null; + ngOnChanges(changes: SimpleChanges): void { if (changes["data"] !== undefined && changes["data"].currentValue !== changes["data"].previousValue && changes["data"].firstChange) { if(this.data.onInit){ this.data.onInit(this.data, this.form); } + let isRequired: boolean =this.data.isRequired(); } if (changes["data"] !== undefined) { |