diff options
author | Ittay Stern <ittay.stern@att.com> | 2020-02-02 18:09:40 +0200 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2020-02-03 19:32:49 +0200 |
commit | 0814238f615f3e3b855a53add72730b957f6c790 (patch) | |
tree | a9170ece7827b039de56534459bcfa0c76ebb7e5 /vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/network/network.model.info.ts | |
parent | 52670a9e0b450074dfbe0d151925d0133bc8442a (diff) |
NodeInfo::getModel expects the instance-model
Now callers (objectToInstanceTree, objectToModelTree, etc.) pass the hierarchy
itself, instead of providing only the service hierarchy and keys.
Issue-ID: VID-724
Change-Id: I80cde29887d86b2cc986d96b220ff769562f38b8
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/network/network.model.info.ts')
-rw-r--r-- | vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/network/network.model.info.ts | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/network/network.model.info.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/network/network.model.info.ts index ae28fc2d9..ce1af451c 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/network/network.model.info.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/network/network.model.info.ts @@ -1,6 +1,5 @@ import {DynamicInputsService} from "../../dynamicInputs.service"; import {ILevelNodeInfo} from "../basic.model.info"; -import {NetworkInstance} from "../../../../../shared/models/networkInstance"; import {NetworkModel} from "../../../../../shared/models/networkModel"; import {NetworkTreeNode} from "../../../../../shared/models/networkTreeNode"; import {SharedTreeService} from "../../shared.tree.service"; @@ -65,15 +64,12 @@ export class NetworkModelInfo implements ILevelNodeInfo { }; /*********************************************************** - * return network model - * @param networkModelId - current Model id - * @param instance - * @param serviceHierarchy - serviceHierarchy + * return a NodeModel object instance + * @param instanceModel - The model of the instance (usually extracted from serviceHierarchy store) ************************************************************/ - getModel = (networkModelId: string, instance: NetworkInstance, serviceHierarchy): NetworkModel => { - const uniqueIdOrName = this._sharedTreeService.modelUniqueNameOrId(instance); + getModel = (instanceModel: any): NetworkModel => { return new NetworkModel( - this._sharedTreeService.modelByIdentifiers(serviceHierarchy, this.name, uniqueIdOrName, networkModelId), + instanceModel, this._featureFlagsService.getAllFlags()); }; |