From 4e32415b9d34fcd8b18cf278b92c441e5044feab Mon Sep 17 00:00:00 2001 From: Alexey Sandler Date: Sat, 29 Feb 2020 22:11:26 +0200 Subject: Component-info: show version and customization id from instance Issue-ID: Issue-ID: VID-771 Change-Id: If172a0aa6555087edabff3c112c565a768169b5c Signed-off-by: Alexey Sandler --- .../objectsToTree/shared.tree.service.ts | 31 +++++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts') diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts index 864472505..d543991b5 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts @@ -477,17 +477,34 @@ export class SharedTreeService { }); } + getModelVersionEitherFromInstanceOrFromHierarchy(selectedNodeData, model): string | undefined { + if (selectedNodeData && selectedNodeData.instanceModelInfo && selectedNodeData.instanceModelInfo.modelVersion) { + return selectedNodeData.instanceModelInfo.modelVersion; + } else if (model && model.version) { + return model.version; + } + return undefined; + } + + getModelCustomizationIdEitherFromInstanceOrFromHierarchy(selectedNodeData, model): string | undefined { + if (selectedNodeData && selectedNodeData.instanceModelInfo && selectedNodeData.instanceModelInfo.modelCustomizationId) { + return selectedNodeData.instanceModelInfo.modelCustomizationId; + } else if (model && model.customizationUuid) { + return model.customizationUuid; + } + return undefined; + } - addGeneralInfoItems(modelInfoSpecificItems: ModelInformationItem[], type: ComponentInfoType, model, instance):ComponentInfoModel { + addGeneralInfoItems(modelInfoSpecificItems: ModelInformationItem[], type: ComponentInfoType, model, selectedNodeData):ComponentInfoModel { let modelInfoItems: ModelInformationItem[] = [ - ModelInformationItem.createInstance("Model version", model ? model.version : null), - ModelInformationItem.createInstance("Model customization ID", model ? model.customizationUuid : null), - ModelInformationItem.createInstance("Instance ID", instance ? instance.instanceId : null), - ModelInformationItem.createInstance("Instance type", instance ? instance.instanceType : null), - ModelInformationItem.createInstance("In maintenance", instance? instance.inMaint : null), + ModelInformationItem.createInstance("Model version", this.getModelVersionEitherFromInstanceOrFromHierarchy(selectedNodeData, model)), + ModelInformationItem.createInstance("Model customization ID", this.getModelCustomizationIdEitherFromInstanceOrFromHierarchy(selectedNodeData, model)), + ModelInformationItem.createInstance("Instance ID", selectedNodeData ? selectedNodeData.instanceId : null), + ModelInformationItem.createInstance("Instance type", selectedNodeData ? selectedNodeData.instanceType : null), + ModelInformationItem.createInstance("In maintenance", selectedNodeData? selectedNodeData.inMaint : null), ]; modelInfoItems = modelInfoItems.concat(modelInfoSpecificItems); - return this.getComponentInfoModelByModelInformationItems(modelInfoItems, type, instance); + return this.getComponentInfoModelByModelInformationItems(modelInfoItems, type, selectedNodeData); } getComponentInfoModelByModelInformationItems(modelInfoItems: ModelInformationItem[], type: ComponentInfoType, instance){ -- cgit 1.2.3-korg