From 310f5c389ec6e49e9ba32cc2cb5f9f654128a384 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Fri, 1 Apr 2022 13:41:53 -0500 Subject: [PATCH] Fix import/export of default values --- relog-web/src/export.js | 8 +++++++- relog-web/src/export.test.js | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/relog-web/src/export.js b/relog-web/src/export.js index 1bde973..ff4c118 100644 --- a/relog-web/src/export.js +++ b/relog-web/src/export.js @@ -62,7 +62,7 @@ const computeTotalInitialAmount = (prod) => { }; export const importList = (args, R = 1) => { - if (!args) return ""; + if (args === undefined) return ""; if (Array.isArray(args) && args.length > 0) { let isConstant = true; for (let i = 1; i < args.length; i++) { @@ -180,6 +180,9 @@ export const exportPlant = (original, parameters) => { // Copy time series values ["energy (GJ/tonne)"].forEach((key) => { result[key] = exportValue(original[key], T); + if (result[key] === undefined) { + delete result[key]; + } }); // Copy scalar dicts @@ -379,6 +382,9 @@ export const importPlant = (original) => { // Import timeseries values ["energy (GJ/tonne)"].forEach((key) => { plant[key] = importList(original[key]); + if (plant[key] === "") { + delete plant[key]; + } }); // Import dicts diff --git a/relog-web/src/export.test.js b/relog-web/src/export.test.js index 797da94..5536058 100644 --- a/relog-web/src/export.test.js +++ b/relog-web/src/export.test.js @@ -184,9 +184,8 @@ const samplePlantsOriginal = [ "outputs (tonne/tonne)": { "Hydrogen gas": 0.095, "Carbon dioxide": 1.164, - Tar: 0.06, + Tar: 0, }, - "energy (GJ/tonne)": "50", locations: { "Washakie County": { "latitude (deg)": 43.8356, @@ -331,9 +330,8 @@ const samplePlantsExported = [ "outputs (tonne/tonne)": { "Hydrogen gas": 0.095, "Carbon dioxide": 1.164, - Tar: 0.06, + Tar: 0, }, - "energy (GJ/tonne)": [50, 50, 50], locations: { "Washakie County": { "latitude (deg)": 43.8356,