diff options
author | 2020-02-24 12:58:39 +0200 | |
---|---|---|
committer | 2020-02-24 15:30:04 +0200 | |
commit | 94cd52bc1fe7b997802dd71952c18d67cb2cd12a (patch) | |
tree | 4465b41a9c82f6983f90e520ffd95dd93db095e8 /vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts | |
parent | bf58511a20b396e97ab0a88dfe6fce3d7a54395f (diff) |
Show "retain VG" for vfModule that is allowed or that is an "alien"
Issue-ID: Issue-ID: VID-771
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Change-Id: Ie52fa194a92e0b9e21df723b708b4db877712068
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Diffstat (limited to 'vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts')
-rw-r--r-- | vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts index 5181318dc..eddfee074 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts @@ -16,7 +16,6 @@ import {FormControlModel} from "../../../../models/formControlModels/formControl import {CheckboxFormControl} from "../../../../models/formControlModels/checkboxFormControl.model"; import {FormControlType} from "../../../../models/formControlModels/formControlTypes.enum"; import {mergeObjectByPathAction} from "../../../../storeUtil/utils/general/general.actions"; -import * as _ from "lodash"; import {VfModuleInstance} from "../../../../models/vfModuleInstance"; import {SharedControllersService} from "../../../genericForm/formControlsServices/sharedControlles/shared.controllers.service"; @@ -49,7 +48,10 @@ export class VfModuleUpgradePopupService extends VfModulePopupServiceBase { this._sharedControllersService.getSDNCControl(null) ]; const vfModuleInstance :VfModuleInstance = this._vfModuleControlGenerator.getVfModuleInstance(serviceId, vnfStoreKey, this.uuidData, isUpdateMode); - if(this._store.getState().service.serviceHierarchy[serviceId].vfModules[this.uuidData['modelName']].volumeGroupAllowed){ + + let volumeGroupAllowed = this._store.getState().service.serviceHierarchy[serviceId].vfModules[this.uuidData['modelName']].volumeGroupAllowed; + let vfModuleNotExistsOnModel = this._sharedTreeService.isVfModuleCustomizationIdNotExistsOnModel(this.uuidData['vfModule'], serviceId); + if(volumeGroupAllowed|| vfModuleNotExistsOnModel){ result.push(this.getRetainVolumeGroupsControl()); } result = this._basicControlGenerator.concatSupplementaryFile(result, vfModuleInstance); |