Merge pull request #1727 from RodriSanchez1/fix/defaultBoardsIncluded

Fix / Unexpected behaviour on change default boards included
cboard-org · Jul 4, 2024 · 8f11447 · 8f11447
2 parents 92aac1a + 04bac9a
commit 8f11447
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/src/api/communicators.json b/src/api/communicators.json
@@ -7,6 +7,10 @@
     "email": "support@cboard.io",
     "rootBoard": "root",
     "boards": ["root"],
-    "defaultBoardBlackList": []
+    "defaultBoardBlackList": [],
+    "defaultBoardsIncluded": [
+      { "nameOnJSON": "advanced", "homeBoard": "root" },
+      { "nameOnJSON": "picSeePal", "homeBoard": "jjmlUcQs19" }
+    ]
   }
 ]
diff --git a/src/components/Board/Board.actions.js b/src/components/Board/Board.actions.js
@@ -123,9 +123,12 @@ export function changeDefaultBoard(selectedBoardNameOnJson) {
       return initialDefaultBoardsIncluded;
     };
 
-    const defaultBoardsIncluded =
-      activeCommunicator.defaultBoardsIncluded ||
-      fallbackInitialDefaultBoardsIncluded(activeCommunicator);
+    const hasValidDefaultBoardsIncluded = !!activeCommunicator
+      .defaultBoardsIncluded?.length;
+
+    const defaultBoardsIncluded = hasValidDefaultBoardsIncluded
+      ? activeCommunicator.defaultBoardsIncluded
+      : fallbackInitialDefaultBoardsIncluded(activeCommunicator);
 
     const defaultBoardsNamesIncluded = defaultBoardsIncluded?.map(
       includedBoardObject => includedBoardObject.nameOnJSON

diff --git a/src/components/Communicator/Communicator.actions.js b/src/components/Communicator/Communicator.actions.js
@@ -214,7 +214,10 @@ export function verifyAndUpsertCommunicator(
       updatedCommunicatorData.id = shortid.generate();
       updatedCommunicatorData.boards = [...communicator.boards];
 
-      if (!!communicator.defaultBoardsIncluded) {
+      const hasValidDefaultBoardsIncluded = !!communicator.defaultBoardsIncluded
+        ?.length;
+
+      if (hasValidDefaultBoardsIncluded) {
         updatedCommunicatorData.defaultBoardsIncluded = communicator.defaultBoardsIncluded.map(
           item => ({ ...item })
         );

diff --git a/src/components/Communicator/Communicator.reducer.js b/src/components/Communicator/Communicator.reducer.js
@@ -165,7 +165,11 @@ function communicatorReducer(state = initialState, action) {
             nameOnJSON: 'advanced',
             homeBoard: 'root'
           };
-          const defaultBoardsIncluded = activeCommunicator.defaultBoardsIncluded
+
+          const hasValidDefaultBoardsIncluded = !!activeCommunicator
+            .defaultBoardsIncluded?.length;
+
+          const defaultBoardsIncluded = hasValidDefaultBoardsIncluded
             ? [
                 ...activeCommunicator.defaultBoardsIncluded,
                 action.defaultBoardData