From 5c249d4675c6f8f293d676c28de436cfe615e630 Mon Sep 17 00:00:00 2001 From: Alexey Sandler Date: Mon, 9 Mar 2020 11:04:52 +0200 Subject: Upgrade vfModule popup: show modelVersionId and invariantiD from instance or model. Issue-ID: Issue-ID: VID-771 Signed-off-by: Alexey Sandler Change-Id: I2132df5557d346537a9283c5f7147f47f1da36af Signed-off-by: Alexey Sandler --- .../objectsToTree/shared.tree.service.ts | 30 ++++++++++++++-------- 1 file changed, 20 insertions(+), 10 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 d543991b5..1e8512784 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 @@ -478,19 +478,29 @@ 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; + return this.getNamedFieldFromInstanceOrFromHierarchy(selectedNodeData, "modelVersion", model, "version"); } 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 this.getNamedFieldFromInstanceOrFromHierarchy(selectedNodeData, "modelCustomizationId", model, "customizationUuid"); + } + + getModelInvariantIdEitherFromInstanceOrFromHierarchy(selectedNodeData, model): string | undefined { + return this.getNamedFieldFromInstanceOrFromHierarchy(selectedNodeData, "modelInvariantId", model, "invariantUuid"); + } + + getModelVersionIdEitherFromInstanceOrFromHierarchy(selectedNodeData, model): string | undefined { + return this.getNamedFieldFromInstanceOrFromHierarchy (selectedNodeData, "modelVersionId", model, "uuid"); + } + + + + getNamedFieldFromInstanceOrFromHierarchy(selectedNodeData, instanceModelInfoFieldName, model, modelFieldName): string | undefined { + if (instanceModelInfoFieldName && selectedNodeData && selectedNodeData.instanceModelInfo + && selectedNodeData.instanceModelInfo[instanceModelInfoFieldName]) { + return selectedNodeData.instanceModelInfo[instanceModelInfoFieldName]; + } else if (modelFieldName && model && model[modelFieldName]) { + return model[modelFieldName]; } return undefined; } -- cgit 1.2.3-korg