From 0814238f615f3e3b855a53add72730b957f6c790 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Sun, 2 Feb 2020 18:09:40 +0200 Subject: 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 --- .../drawing-board-tree/drawing-board-tree.component.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree') diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts index a195cf019..1a42db403 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts @@ -228,7 +228,13 @@ export class DrawingBoardTreeComponent implements OnInit, AfterViewInit { this.highlightNode.emit(node.data.modelUniqueId); if (FeatureFlagsService.getFlagState(Features.FLAG_1906_COMPONENT_INFO, this.store)) { const serviceHierarchy = this._store.getState().service.serviceHierarchy[this.serviceModelId]; - const model = node.data.getModel(node.data.modelName, node.data, serviceHierarchy); + + const instanceModel = this._sharedTreeService.modelByIdentifiers( + serviceHierarchy, node.data.modelTypeName, + this._sharedTreeService.modelUniqueNameOrId(node.data), node.data.modelName + ); + + const model = node.data.getModel(instanceModel); const modelInfoItems = node.data.getInfo(model, node.data); const componentInfoModel: ComponentInfoModel = this._sharedTreeService.addGeneralInfoItems(modelInfoItems, node.data.componentInfoType, model, node.data); ComponentInfoService.triggerComponentInfoChange.next(componentInfoModel); -- cgit 1.2.3-korg