diff options
author | Yoav Schneiderman <yoav.schneiderman@intl.att.com> | 2019-12-18 21:04:38 +0200 |
---|---|---|
committer | Yoav Schneiderman <yoav.schneiderman@intl.att.com> | 2019-12-22 14:01:45 +0200 |
commit | 4c87ecaa8cce40f078f8540a15928e7e805e4ef7 (patch) | |
tree | f31c55200451d13f108c8583b8d275ae7a7c8bab /vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule | |
parent | 54af5cdca044c7b486f02f4163d16c39e990f701 (diff) |
Refactor Generic Generators
Issue-ID: VID-731
Signed-off-by: Yoav Schneiderman <yoav.schneiderman@intl.att.com>
Change-Id: Ib851ff4056d64e12eaf415c5d689c832196ec8b0
Signed-off-by: Yoav Schneiderman <yoav.schneiderman@intl.att.com>
Diffstat (limited to 'vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule')
2 files changed, 11 insertions, 6 deletions
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.spec.ts index 935454752..b16c5bdc0 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.spec.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.spec.ts @@ -1,6 +1,6 @@ import {LogService} from "../../../../utils/log/log.service"; import {NgRedux} from "@angular-redux/store"; -import {BasicControlGenerator} from "../../../genericForm/formControlsServices/basic.control.generator"; +import {ControlGeneratorUtil} from "../../../genericForm/formControlsServices/control.generator.util.service"; import {AaiService} from "../../../../services/aaiService/aai.service"; import {HttpClient} from "@angular/common/http"; import {GenericFormService} from "../../../genericForm/generic-form.service"; @@ -13,6 +13,7 @@ import {VfModuleControlGenerator} from "../../../genericForm/formControlsService import {SdcUiServices} from "onap-ui-angular"; import {FeatureFlagsService} from "../../../../services/featureFlag/feature-flags.service"; import {getTestBed, TestBed} from "@angular/core/testing"; +import {SharedControllersService} from "../../../genericForm/formControlsServices/sharedControlles/shared.controllers.service"; class MockModalService<T> {} @@ -1982,7 +1983,8 @@ describe('VFModule popup service', () => { TestBed.configureTestingModule({ providers : [ VfModulePopupService, - BasicControlGenerator, + ControlGeneratorUtil, + SharedControllersService, VfModuleControlGenerator, DefaultDataGeneratorService, GenericFormService, diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts index 6a31bb7ee..18dc65590 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts @@ -1,6 +1,6 @@ import {Injectable} from "@angular/core"; import {FormPopupDetails, PopupType} from "../../../../models/formControlModels/formPopupDetails.model"; -import {BasicControlGenerator} from "../../../genericForm/formControlsServices/basic.control.generator"; +import {ControlGeneratorUtil} from "../../../genericForm/formControlsServices/control.generator.util.service"; import {AppState} from "../../../../store/reducers"; import {NgRedux} from "@angular-redux/store"; import {ITreeNode} from "angular-tree-component/dist/defs/api"; @@ -20,6 +20,7 @@ import {VfModuleControlGenerator} from "../../../genericForm/formControlsService import {FormControlModel} from "../../../../models/formControlModels/formControl.model"; import * as _ from 'lodash'; import {createVFModuleInstance, updateVFModuleInstance} from "../../../../storeUtil/utils/vfModule/vfModule.actions"; +import {SharedControllersService} from "../../../genericForm/formControlsServices/sharedControlles/shared.controllers.service"; export abstract class VfModulePopupServiceBase { dynamicInputs: any; @@ -43,7 +44,8 @@ export abstract class VfModulePopupServiceBase { }; protected constructor( - protected _basicControlGenerator: BasicControlGenerator, + protected _basicControlGenerator: ControlGeneratorUtil, + protected _sharedControllersService : SharedControllersService, protected _vfModuleControlGenerator: VfModuleControlGenerator, protected _iframeService: IframeService, protected _defaultDataGeneratorService: DefaultDataGeneratorService, @@ -156,14 +158,15 @@ export abstract class VfModulePopupServiceBase { export class VfModulePopupService extends VfModulePopupServiceBase implements GenericPopupInterface { - constructor(_basicControlGenerator: BasicControlGenerator, + constructor(_basicControlGenerator: ControlGeneratorUtil, + _sharedControllersService : SharedControllersService, _vfModuleControlGenerator: VfModuleControlGenerator, _iframeService: IframeService, _defaultDataGeneratorService: DefaultDataGeneratorService, _aaiService: AaiService, _basicPopupService : BasicPopupService, _store: NgRedux<AppState>) { - super(_basicControlGenerator, _vfModuleControlGenerator, _iframeService, _defaultDataGeneratorService, _aaiService, _basicPopupService, _store); + super(_basicControlGenerator, _sharedControllersService, _vfModuleControlGenerator, _iframeService, _defaultDataGeneratorService, _aaiService, _basicPopupService, _store); } |