refactor: changeAll reducer

discretize · Oct 7, 2024 · 748302d · 748302d
1 parent 2154110
commit 748302d
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 37 deletions.
diff --git a/src/state/slices/boss.ts b/src/state/slices/boss.ts
@@ -22,7 +22,9 @@ export const bossSlice = createSlice({
 
   extraReducers: (builder) => {
     builder.addCase(changeAll, (state, action) => {
-      return { ...state, ...action.payload?.form?.boss };
+      if (action.payload?.form?.boss) {
+        return { ...state, ...action.payload?.form?.boss };
+      }
     });
   },
 });

diff --git a/src/state/slices/buffs.ts b/src/state/slices/buffs.ts
@@ -63,16 +63,15 @@ export const buffsSlice = createSlice({
 
   extraReducers: (builder) => {
     builder.addCase(changeAll, (state, action) => {
-      const removeOldBuffs = (data: Buffs | BuffAmounts) => {
-        if (!data) return data;
+      const removeOldBuffs = (data?: Buffs | BuffAmounts) => {
+        if (!data) return {};
         const validEntries = Object.entries(data).filter(([key]) => buffModifiersById[key]);
         return Object.fromEntries(validEntries);
       };
 
       const { buffs, amounts } = action.payload?.form?.buffs ?? {};
       const validData = { buffs: removeOldBuffs(buffs), amounts: removeOldBuffs(amounts) };
 
-      console.log({ buffs, amounts, validData });
       return { ...state, ...validData };
     });
 

diff --git a/src/state/slices/controlsSlice.ts b/src/state/slices/controlsSlice.ts
@@ -138,7 +138,9 @@ export const controlSlice = createSlice({
   initialState,
   reducers: {
     changeAll: (state, action) => {
-      return { ...state, ...action.payload?.control };
+      if (action.payload?.control) {
+        return { ...state, ...action.payload.control };
+      }
     },
     changeProfession: (state, action: PayloadAction<ProfessionName>) => {
       if (state.profession !== action.payload) {

diff --git a/src/state/slices/distribution.ts b/src/state/slices/distribution.ts
@@ -105,11 +105,13 @@ export const distributionSlice = createSlice({
 
   extraReducers: (builder) => {
     builder.addCase(changeAll, (state, action) => {
-      const newState = clone(action.payload?.form?.distribution);
-      newState.values2.Power2 ??= 0;
-      newState.textBoxes.Power2 ??= '0';
+      if (action.payload?.form?.distribution) {
+        const newState = clone(action.payload.form.distribution);
+        newState.values2.Power2 ??= 0;
+        newState.textBoxes.Power2 ??= '0';
 
-      return { ...state, ...newState };
+        return { ...state, ...newState };
+      }
     });
 
     builder.addCase(setBuildTemplate, (state, action) => {

diff --git a/src/state/slices/extraModifiers.ts b/src/state/slices/extraModifiers.ts
@@ -31,7 +31,9 @@ export const extraModifiersSlice = createSlice({
 
   extraReducers: (builder) => {
     builder.addCase(changeAll, (state, action) => {
-      return { ...state, ...action.payload?.form?.extraModifiers };
+      if (action.payload?.form?.extraModifiers) {
+        return { ...state, ...action.payload.form.extraModifiers };
+      }
     });
   },
 });

diff --git a/src/state/slices/extras.ts b/src/state/slices/extras.ts
@@ -99,25 +99,27 @@ export const extrasSlice = createSlice({
 
   extraReducers: (builder) => {
     builder.addCase(changeAll, (state, action) => {
-      // best effort conversion of old data from before multiple selection
-      if (action.payload?.form?.extras?.Runes) {
-        const convertedExtras = mapValues(action.payload.form.extras, (data) => {
-          if (data === '') {
-            return {};
-          }
-          if (typeof data === 'string') {
-            return { [data]: {} };
-          }
-          if (Array.isArray(data)) {
-            return Object.fromEntries(data.map((key) => [key, {}]));
-          }
-          return data;
-        });
-
-        return { ...state, extras: convertedExtras };
+      if (action.payload?.form?.extras) {
+        // best effort conversion of old data from before multiple selection
+        if (action.payload.form.extras.Runes) {
+          const convertedExtras = mapValues(action.payload.form.extras, (data) => {
+            if (data === '') {
+              return {};
+            }
+            if (typeof data === 'string') {
+              return { [data]: {} };
+            }
+            if (Array.isArray(data)) {
+              return Object.fromEntries(data.map((key) => [key, {}]));
+            }
+            return data;
+          });
+
+          return { ...state, extras: convertedExtras };
+        }
+
+        return { ...state, ...action.payload.form.extras };
       }
-
-      return { ...state, ...action.payload?.form?.extras };
     });
 
     builder.addCase(setBuildTemplate, (state, action) => {

diff --git a/src/state/slices/forcedSlots.ts b/src/state/slices/forcedSlots.ts
@@ -29,7 +29,9 @@ export const forcedSlotsSlice = createSlice({
 
   extraReducers: (builder) => {
     builder.addCase(changeAll, (state, action) => {
-      return { ...state, ...action.payload?.form?.forcedSlots };
+      if (action.payload?.form?.forcedSlots) {
+        return { ...state, ...action.payload.form.forcedSlots };
+      }
     });
   },
 });

diff --git a/src/state/slices/infusions.ts b/src/state/slices/infusions.ts
@@ -110,7 +110,9 @@ export const infusionsSlice = createSlice({
 
   extraReducers: (builder) => {
     builder.addCase(changeAll, (state, action) => {
-      return { ...state, ...action.payload?.form?.infusions };
+      if (action.payload?.form?.infusions) {
+        return { ...state, ...action.payload.form.infusions };
+      }
     });
 
     builder.addCase(changeGameMode, (state, action) => {

diff --git a/src/state/slices/priorities.ts b/src/state/slices/priorities.ts
@@ -151,7 +151,9 @@ export const prioritiesSlice = createSlice({
 
   extraReducers: (builder) => {
     builder.addCase(changeAll, (state, action) => {
-      return { ...state, ...action.payload?.form?.priorities };
+      if (action.payload?.form?.priorities) {
+        return { ...state, ...action.payload?.form?.priorities };
+      }
     });
 
     builder.addCase(setBuildTemplate, (state, action) => {

diff --git a/src/state/slices/skills.ts b/src/state/slices/skills.ts
@@ -46,7 +46,9 @@ export const skillsSlice = createSlice({
 
   extraReducers: (builder) => {
     builder.addCase(changeAll, (state, action) => {
-      return { ...state, ...action.payload?.form?.skills };
+      if (action.payload?.form?.skills) {
+        return { ...state, ...action.payload.form.skills };
+      }
     });
 
     builder.addCase(changeProfession, (state, _action) => ({

diff --git a/src/state/slices/traits.ts b/src/state/slices/traits.ts
@@ -102,7 +102,9 @@ export const traitsSlice = createSlice({
 
   extraReducers: (builder) => {
     builder.addCase(changeAll, (state, action) => {
-      return { ...state, ...action.payload?.form?.traits };
+      if (action.payload?.form?.traits) {
+        return { ...state, ...action.payload.form.traits };
+      }
     });
 
     builder.addCase(changeProfession, (state, _action) => ({

diff --git a/src/state/slices/userSettings.ts b/src/state/slices/userSettings.ts
@@ -60,11 +60,13 @@ export const userSettingsSlice = createSlice({
 
   extraReducers: (builder) => {
     builder.addCase(changeAll, (state, action) => {
-      if (action.payload?.userSettings?.gameMode) {
-        setQueryParm({ key: PARAMS.GAMEMODE, value: action.payload.userSettings.gameMode });
-      }
+      if (action.payload?.userSettings) {
+        if (action.payload.userSettings.gameMode) {
+          setQueryParm({ key: PARAMS.GAMEMODE, value: action.payload.userSettings.gameMode });
+        }
 
-      return { ...state, ...action.payload?.userSettings };
+        return { ...state, ...action.payload.userSettings };
+      }
     });
   },
 });