From 72f53f5ce0ab65c4c3d10a479af47ac870e0f2e2 Mon Sep 17 00:00:00 2001 From: SeaCelo Date: Tue, 9 Jun 2026 16:21:29 -0400 Subject: [PATCH] fix: guard pre-v5.6 cases with no osy-indicators in Pivot results (#474) (cherry picked from commit 4f2d87d5c11a4132b75beb7334c57740ca2d5e71) --- WebAPP/AppResults/Model/Pivot.Model.js | 3 ++- WebAPP/Classes/DataModelResult.Class.js | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WebAPP/AppResults/Model/Pivot.Model.js b/WebAPP/AppResults/Model/Pivot.Model.js index 86804ca9..f9c67089 100644 --- a/WebAPP/AppResults/Model/Pivot.Model.js +++ b/WebAPP/AppResults/Model/Pivot.Model.js @@ -7,7 +7,8 @@ export class Model { let group = 'RYT'; let param = 'ANC'; - let CUSTOM_INDICATORS = DataModelResult.mergeAllIndicatorsGrouped(INDICATORS, genData['osy-indicators']); + // `|| []` guards pre-v5.6 cases that have no osy-indicators + let CUSTOM_INDICATORS = DataModelResult.mergeAllIndicatorsGrouped(INDICATORS, genData['osy-indicators'] || []); console.log('VARIABLES original ', VARIABLES) console.log('CUSTOM_INDICATORS ', CUSTOM_INDICATORS) diff --git a/WebAPP/Classes/DataModelResult.Class.js b/WebAPP/Classes/DataModelResult.Class.js index a6b7f858..faaeae39 100644 --- a/WebAPP/Classes/DataModelResult.Class.js +++ b/WebAPP/Classes/DataModelResult.Class.js @@ -387,7 +387,8 @@ export class DataModelResult{ static mergeAllIndicatorsGrouped(indicatorTypesJson, customIndicators) { - console.log('customIndicators ', customIndicators) + // guard pre-v5.6 cases whose genData has no osy-indicators array + const customList = Array.isArray(customIndicators) ? customIndicators : []; // 1) Sakupi sve tipove indikatora + group info const typeById = {}; @@ -405,7 +406,7 @@ export class DataModelResult{ const result = {}; // 3) obrada custom indikatora - for (const item of customIndicators) { + for (const item of customList) { if (!item || typeof item !== "object") continue; const indicatorName = item["Indicator"];