fix: incorrect emhttp state merging in redux store

pujitm · pujitm · commit fc6ae8957e3c · 2025-06-25T13:35:30.000-04:00
omit stale config entries while merging in new config state
diff --git a/api/src/store/modules/emhttp.ts b/api/src/store/modules/emhttp.ts
@@ -2,7 +2,7 @@ import { join } from 'path';
 
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { merge } from 'lodash-es';
+import { mergeWith } from 'lodash-es';
 
 import type { RootState } from '@app/store/index.js';
 import type { StateFileToIniParserMap } from '@app/store/types.js';
@@ -164,6 +164,15 @@ export const loadStateFiles = createAsyncThunk<
     return state;
 });
 
+// Custom merge function that replaces arrays instead of merging them element-wise
+const mergeReplaceArrays = (object: any, source: any, ...rest: any[]) =>
+    mergeWith(object, source, ...rest, (objValue: unknown, srcValue: unknown) => {
+        if (Array.isArray(srcValue)) {
+            return srcValue;
+        }
+        return undefined;
+    });
+
 export const emhttp = createSlice({
     name: 'emhttp',
     initialState,
@@ -176,7 +185,7 @@ export const emhttp = createSlice({
             }>
         ) {
             const { field } = action.payload;
-            return merge(state, { [field]: action.payload.state });
+            return mergeReplaceArrays(state, { [field]: action.payload.state });
         },
     },
     extraReducers(builder) {
@@ -185,18 +194,16 @@ export const emhttp = createSlice({
         });
 
         builder.addCase(loadStateFiles.fulfilled, (state, action) => {
-            merge(state, action.payload, { status: FileLoadStatus.LOADED });
+            mergeReplaceArrays(state, action.payload, { status: FileLoadStatus.LOADED });
         });
 
         builder.addCase(loadStateFiles.rejected, (state, action) => {
-            merge(state, action.payload, { status: FileLoadStatus.FAILED_LOADING });
+            mergeReplaceArrays(state, action.payload, { status: FileLoadStatus.FAILED_LOADING });
         });
 
         builder.addCase(loadSingleStateFile.fulfilled, (state, action) => {
             if (action.payload) {
-                // const changedKey = Object.keys(action.payload)[0]
-                // emhttpLogger.debug('Key', changedKey, 'Difference in changes', getDiff(action.payload, { [changedKey]: state[changedKey] } ))
-                merge(state, action.payload);
+                mergeReplaceArrays(state, action.payload);
             } else {
                 emhttpLogger.warn('Invalid payload returned from loadSingleStateFile()');
             }
