prepare use of latest arena-core

openforis · Nov 20, 2024 · 9882643 · 9882643
1 parent b6be3e1
commit 9882643
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 19 deletions.
diff --git a/core/survey/_survey/surveyNodeDefsIndex.js b/core/survey/_survey/surveyNodeDefsIndex.js
@@ -21,6 +21,11 @@ export const addNodeDefToIndex = ({ nodeDefsIndex, nodeDef }) => {
   return getNodeDefsIndex(surveyUpdated)
 }
 
+export const updateNodeDefUuidByNameIndex = ({ nodeDefsIndex, nodeDef, nodeDefPrevious }) => {
+  const surveyUpdated = Surveys.updateNodeDefUuidByNameIndex(nodeDef, nodeDefPrevious)({ nodeDefsIndex })
+  return getNodeDefsIndex(surveyUpdated)
+}
+
 // ==== DELETE
 
 export const deleteNodeDefIndex = ({ nodeDefsIndex, nodeDef }) => {

diff --git a/core/survey/survey.js b/core/survey/survey.js
@@ -249,8 +249,13 @@ export const { assocDependencyGraph } = SurveyDependencies
 export const buildDependencyGraph = SurveyDependencies.buildGraph
 export const { buildAndAssocDependencyGraph } = SurveyDependencies
 
-export const { addNodeDefToIndex, deleteNodeDefIndex, initNodeDefsIndex, initAndAssocNodeDefsIndex } =
-  SurveyNodeDefsIndex
+export const {
+  addNodeDefToIndex,
+  updateNodeDefUuidByNameIndex,
+  deleteNodeDefIndex,
+  initNodeDefsIndex,
+  initAndAssocNodeDefsIndex,
+} = SurveyNodeDefsIndex
 
 // ====== NodeDefsValidation
 export const { getNodeDefsValidation, assocNodeDefsValidation, getNodeDefValidation } = SurveyNodeDefsValidation

diff --git a/webapp/store/survey/nodeDefsIndex/reducer.js b/webapp/store/survey/nodeDefsIndex/reducer.js
@@ -23,23 +23,22 @@ const actionHandlers = {
 
   [NodeDefsActions.nodeDefCreate]: (state, { nodeDef }) => Survey.addNodeDefToIndex({ nodeDefsIndex: state, nodeDef }),
   [NodeDefsActions.nodeDefDelete]: (state, { nodeDef }) => Survey.deleteNodeDefIndex({ nodeDefsIndex: state, nodeDef }),
-  [NodeDefsActions.nodeDefUpdate]: (state, { nodeDef, prevNodeDef = null }) => {
-    let stateUpdated = state
-    if (prevNodeDef) {
-      stateUpdated = Survey.deleteNodeDefIndex({ nodeDefsIndex: stateUpdated, nodeDef: prevNodeDef })
-    }
-    stateUpdated = Survey.addNodeDefToIndex({ nodeDefsIndex: stateUpdated, nodeDef })
-    return stateUpdated
-  },
-
-  [NodeDefsActions.nodeDefPropsUpdateCancel]: (state, { nodeDef, nodeDefOriginal, isNodeDefNew }) => {
-    let stateUpdated = Survey.deleteNodeDefIndex({ nodeDefsIndex: state, nodeDef })
-    if (isNodeDefNew) {
-      return stateUpdated
-    }
-    stateUpdated = Survey.addNodeDefToIndex({ nodeDefsIndex: stateUpdated, nodeDef: nodeDefOriginal })
-    return stateUpdated
-  },
+  [NodeDefsActions.nodeDefUpdate]: (state, { nodeDef, prevNodeDef = null }) =>
+    Survey.updateNodeDefUuidByNameIndex({
+      nodeDefsIndex: state,
+      nodeDef,
+      nodeDefPrevious: prevNodeDef,
+    }),
+
+  [NodeDefsActions.nodeDefPropsUpdateCancel]: (state, { nodeDef, nodeDefOriginal, isNodeDefNew }) =>
+    isNodeDefNew
+      ? Survey.deleteNodeDefIndex({ nodeDefsIndex: state, nodeDef })
+      : // restore node defs index using the original node def name
+        Survey.updateNodeDefUuidByNameIndex({
+          nodeDefsIndex: state,
+          nodeDef: nodeDefOriginal,
+          nodeDefPrevious: nodeDef,
+        }),
 }
 
 export default exportReducer(actionHandlers)