diff --git a/packages/client/hmi-client/src/model-representation/mira/mira.ts b/packages/client/hmi-client/src/model-representation/mira/mira.ts index afd91b21a1..9cad662f0f 100644 --- a/packages/client/hmi-client/src/model-representation/mira/mira.ts +++ b/packages/client/hmi-client/src/model-representation/mira/mira.ts @@ -230,6 +230,12 @@ export const rawTemplatesSummary = (miraModel: MiraModel) => { return allTemplates; }; +const generateKey = (t: TemplateSummary) => { + if (t.name.split('_').length > 1) { + return `${t.name.split('_')[0]}:${t.subject}:${t.outcome}:${t.controllers.join('-')}`; + } + return `${t.subject}:${t.outcome}:${t.controllers.join('-')}`; +}; export const collapseTemplates = (miraModel: MiraModel) => { const allTemplates: TemplateSummary[] = []; const uniqueTemplates: TemplateSummary[] = []; @@ -279,7 +285,7 @@ export const collapseTemplates = (miraModel: MiraModel) => { const matrixMap = new Map(); allTemplates.forEach((t) => { - const key = `${t.subject}:${t.outcome}:${t.controllers.join('-')}`; + const key = generateKey(t); if (!tempMatrixMap.has(key)) { tempMatrixMap.set(key, []); } @@ -295,7 +301,7 @@ export const collapseTemplates = (miraModel: MiraModel) => { // 3 Rename and sanitize everything uniqueTemplates.forEach((t) => { - const key = `${t.subject}:${t.outcome}:${t.controllers.join('-')}`; + const key = generateKey(t); t.name = `template-${check.get(key)}`; }); tempMatrixMap.forEach((value, key) => { @@ -425,7 +431,6 @@ export const createParameterMatrix = (miraModel: MiraModel, miraTemplateParams: }; }; -// const genKey = (t: TemplateSummary) => `${t.subject}:${t.outcome}:${t.controllers.join('-')}`; export const convertToIGraph = ( miraModel: MiraModel, initObservableSummary: ObservableSummary,