fix: fix merge project config

package.json

@@ -147,6 +147,7 @@
     "strip-ansi": "6.0.1",
     "styled-components": "5.3.5",
     "tar": "6.1.11",
+    "tiny-invariant": "1.2.0",
     "type-fest": "2.12.2",
     "uuid": "8.3.2",
     "vm2": "3.9.9",

src/redux/services/projectConfig.ts

@@ -1,9 +1,9 @@
-import flatten from 'flat';
 import {readFileSync, writeFileSync} from 'fs';
-import _ from 'lodash';
+import _, {isArray, mergeWith} from 'lodash';
 import log from 'loglevel';
 import {sep} from 'path';
 import {AnyAction} from 'redux';
+import invariant from 'tiny-invariant';
 
 import {K8S_VERSIONS, PREDEFINED_K8S_VERSION} from '@constants/constants';
 
@@ -158,32 +158,8 @@ export const updateProjectSettings = (dispatch: (action: AnyAction) => void, pro
 };
 
 export const mergeConfigs = (baseConfig: ProjectConfig, config?: ProjectConfig | null): ProjectConfig => {
-  if (!(baseConfig && baseConfig.settings && baseConfig.kubeConfig)) {
-    throw Error('Base config must be set');
-  }
-
-  if (!config) {
-    return baseConfig;
-  }
-
-  const serializedBaseConfig: SerializableObject = flatten<any, any>(baseConfig);
-  const serializedConfig: SerializableObject = flatten<any, any>(config);
-
-  // override base properties
-  Object.keys(serializedBaseConfig).forEach((key: string) => {
-    if (!_.isUndefined(serializedConfig[key])) {
-      serializedBaseConfig[key] = serializedConfig[key];
-    }
-  });
-
-  // add missing base properties
-  Object.keys(serializedConfig).forEach((key: string) => {
-    if (_.isUndefined(serializedBaseConfig[key])) {
-      serializedBaseConfig[key] = serializedConfig[key];
-    }
-  });
-
-  return flatten.unflatten(serializedBaseConfig);
+  invariant(baseConfig && baseConfig.settings && baseConfig.kubeConfig, 'base config expected');
+  return mergeWith(baseConfig, config, (_a, b) => (isArray(b) ? b : undefined));
 };
 
 export const keysToUpdateStateBulk = (