Skip to content

Prevent results tab crash for pre-v5.6 models #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
utsinboots wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent results tab crash for pre-v5.6 models #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion WebAPP/AppResults/Model/Pivot.Model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions WebAPP/Classes/DataModelResult.Class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};

Expand All @@ -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"];
Expand Down