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/genericFormPopup/generic-form-popup.component.ts | |
| 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/genericFormPopup/generic-form-popup.component.ts')
| -rw-r--r-- | vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.ts index 2b6417e33..8a95d108f 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.ts @@ -1,4 +1,4 @@ -import {Component, OnChanges, OnDestroy, OnInit} from '@angular/core'; +import {Component, OnDestroy, OnInit} from '@angular/core'; import {FormPopupDetails} from "../../models/formControlModels/formPopupDetails.model"; import {DialogComponent, DialogService} from "ng2-bootstrap-modal"; import {FormGroup} from "@angular/forms"; @@ -82,7 +82,7 @@ export class GenericFormPopupComponent extends DialogComponent<PopupModel, boole this._genericFormPopupService.initReduxOnCreateNewService().then((serviceModelId : string)=>{ this.uuidData = <any>{ bulkSize : 1, - isMacro : this._store.getState().service.serviceHierarchy[serviceModelId].service.instantiationType === 'Macro', + isMacro : this._store.getState().service.serviceHierarchy[serviceModelId].service.vidNotions.instantiationType === 'Macro', type : PopupType.SERVICE, serviceId: serviceModelId, popupService: this._servicePopupService, @@ -113,7 +113,7 @@ export class GenericFormPopupComponent extends DialogComponent<PopupModel, boole this.closeDialog(that); }); - this.uuidData['isMacro'] = this._store.getState().service.serviceHierarchy[this.uuidData['serviceId']].service.instantiationType === 'Macro'; + this.uuidData['isMacro'] = this._store.getState().service.serviceHierarchy[this.uuidData['serviceId']].service.vidNotions.instantiationType === 'Macro'; this.formPopupDetails = this._genericFormPopupService.getGenericFormDetails(this.uuidData, this.node, this.isUpdateMode); } } @@ -133,7 +133,7 @@ export class GenericFormPopupComponent extends DialogComponent<PopupModel, boole } } - return formPopupDetails.formControlList.filter((item : FormControlModel) =>item.type === 'DROPDOWN' && item['hasEmptyOptions']).length > 0 + return formPopupDetails.formControlList.filter((item : FormControlModel) => item.type === 'DROPDOWN' && item['hasEmptyOptions'] && item.isRequired()).length > 0 } } |