update default config (#1660)

* update default config * test * test * test * fix logic for processing default config * fix default config * fix typo
uc-cdis · Dec 19, 2024 · 17ac050 · 17ac050
1 parent 6052088
commit 17ac050
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/data/config/default.json b/data/config/default.json
@@ -187,7 +187,7 @@
     "explorer": true,
     "analysis": false
   },
-  "dataExplorerConfig": {
+  "explorerConfig": [{
     "charts": {
       "project": {
         "chartType": "count",
@@ -277,7 +277,7 @@
         "file_format"
       ]
     }
-  },
+  }],
   "useArboristUI": false,
   "showArboristAuthzOnProfile": false,
   "showFenceAuthzOnProfile": true,

diff --git a/data/getTexts.js b/data/getTexts.js
@@ -65,6 +65,7 @@ function doStringify(value, variables, indent = 0, spaces = 0) {
     const objs = value.map(
       (item) => `${insertSpace(indent + spaces)}${doStringify(item, variables, indent + spaces, spaces)}`,
     ).join(`,${ending}`);
+    // console.log(doWrapping(objs, '[', ']', indent, spaces));
     return doWrapping(objs, '[', ']', indent, spaces);
   }
   if (typeof value === 'string') {
@@ -102,15 +103,23 @@ function buildConfig(appIn, data) {
   const app = appIn || process.env.APP || 'default';
   const appConfig = data[app] || {};
   const defaultConfig = data.default || {};
+  // don't copy 'explorerConfig' over from default config since that is a non-working example
+  delete defaultConfig.explorerConfig;
   const result = { ...defaultConfig, ...appConfig };
   delete result.components;
   Object.keys(result).forEach(
     (k) => {
       if (typeof result[k] === 'object') {
         const defaultVal = defaultConfig[k];
         const appVal = appConfig[k];
-        if (defaultVal && appVal && typeof defaultVal === 'object' && typeof appVal === 'object') {
-          result[k] = { ...defaultVal, ...appVal };
+        if (defaultVal && appVal) {
+          if (typeof defaultVal === 'object' && typeof appVal === 'object') {
+            if (Array.isArray(defaultVal) && Array.isArray(appVal)) {
+              result[k] = defaultVal.concat(appVal);
+            } else if (!Array.isArray(defaultVal) && !Array.isArray(appVal)) {
+              result[k] = { ...defaultVal, ...appVal };
+            }
+          }
         }
       }
     },

diff --git a/src/localconf.js b/src/localconf.js
@@ -233,6 +233,8 @@ function buildConfig(opts) {
     explorerConfig = config.explorerConfig;
   }
 
+  console.log(explorerConfig);
+
   // Two tiered-access options: site-wide and index-scoped.
   // Tiered access is index-scoped if all guppyConfigs in the portal config
   // contain a tierAccessLevel.