fix: fix cannot undo redo peaks, integrations and multiplicities (#149)

ComPlat · Sep 5, 2023 · ac6b444 · ac6b444
1 parent 551d2f8
commit ac6b444
Show file tree

Hide file tree

Showing 15 changed files with 165 additions and 133 deletions.
diff --git a/dist/reducers/reducer_edit_peak.js b/dist/reducers/reducer_edit_peak.js
@@ -48,9 +48,10 @@ const addToPos = (state, action) => {
     const newSelectedEditPeaks = Object.assign({}, selectedEditPeaks, {
       neg
     });
-    peaks[curveIdx] = newSelectedEditPeaks;
+    const newPeaks = [...peaks];
+    newPeaks[curveIdx] = newSelectedEditPeaks;
     return Object.assign({}, state, {
-      peaks
+      peaks: newPeaks
     });
   }
   const idxP = oriPosState.findIndex(p => (0, _calc.almostEqual)(p.x, dataToAdd.x));
@@ -60,9 +61,10 @@ const addToPos = (state, action) => {
     const newSelectedEditPeaks = Object.assign({}, selectedEditPeaks, {
       pos
     });
-    peaks[curveIdx] = newSelectedEditPeaks;
+    const newPeaks = [...peaks];
+    newPeaks[curveIdx] = newSelectedEditPeaks;
     return Object.assign({}, state, {
-      peaks,
+      peaks: newPeaks,
       selectedIdx: curveIdx
     });
   }
@@ -80,9 +82,10 @@ const rmFromPos = (state, action) => {
   const newSelectedEditPeaks = Object.assign({}, selectedEditPeaks, {
     pos
   });
-  peaks[selectedIdx] = newSelectedEditPeaks;
+  const newPeaks = [...peaks];
+  newPeaks[selectedIdx] = newSelectedEditPeaks;
   return Object.assign({}, state, {
-    peaks
+    peaks: newPeaks
   });
 };
 const addToNeg = (state, action) => {
@@ -108,9 +111,10 @@ const addToNeg = (state, action) => {
     const newSelectedEditPeaks = Object.assign({}, selectedEditPeaks, {
       pos
     });
-    peaks[curveIdx] = newSelectedEditPeaks;
+    const newPeaks = [...peaks];
+    newPeaks[curveIdx] = newSelectedEditPeaks;
     return Object.assign({}, state, {
-      peaks
+      peaks: newPeaks
     });
   }
   const idxN = oriNegState.findIndex(n => n.x === dataToAdd.x);
@@ -119,9 +123,10 @@ const addToNeg = (state, action) => {
     const newSelectedEditPeaks = Object.assign({}, selectedEditPeaks, {
       neg
     });
-    peaks[curveIdx] = newSelectedEditPeaks;
+    const newPeaks = [...peaks];
+    newPeaks[curveIdx] = newSelectedEditPeaks;
     return Object.assign({}, state, {
-      peaks,
+      peaks: newPeaks,
       selectedIdx: curveIdx
     });
   }
@@ -139,9 +144,10 @@ const rmFromNeg = (state, action) => {
   const newSelectedEditPeaks = Object.assign({}, selectedEditPeaks, {
     neg
   });
-  peaks[selectedIdx] = newSelectedEditPeaks;
+  const newPeaks = [...peaks];
+  newPeaks[selectedIdx] = newSelectedEditPeaks;
   return Object.assign({}, state, {
-    peaks
+    peaks: newPeaks
   });
 };
 const processShift = (state, action) => {
@@ -168,9 +174,10 @@ const processShift = (state, action) => {
     neg,
     prevOffset
   });
-  peaks[curveIdx] = newSelectedEditPeaks;
+  const newPeaks = [...peaks];
+  newPeaks[curveIdx] = newSelectedEditPeaks;
   return Object.assign({}, state, {
-    peaks
+    peaks: newPeaks
   });
 };
 const editPeakReducer = function () {

diff --git a/dist/reducers/reducer_integration.js b/dist/reducers/reducer_integration.js
@@ -69,9 +69,10 @@ const addToStack = (state, action) => {
     stack: newStack,
     refArea: defaultRefArea
   });
-  integrations[curveIdx] = newIntegration;
+  const newArrIntegration = [...integrations];
+  newArrIntegration[curveIdx] = newIntegration;
   return Object.assign({}, state, {
-    integrations,
+    integrations: newArrIntegration,
     selectedIdx: curveIdx
   });
 };
@@ -106,9 +107,10 @@ const rmFromStack = (state, action) => {
   const newIntegration = Object.assign({}, selectedIntegration, {
     stack: newStack
   });
-  integrations[curveIdx] = newIntegration;
+  const newArrIntegration = [...integrations];
+  newArrIntegration[curveIdx] = newIntegration;
   return Object.assign({}, state, {
-    integrations,
+    integrations: newArrIntegration,
     selectedIdx: curveIdx
   });
 };
@@ -136,9 +138,10 @@ const setRef = (state, action) => {
   const newIntegration = Object.assign({}, selectedIntegration, {
     refArea
   });
-  integrations[curveIdx] = newIntegration;
+  const newArrIntegration = [...integrations];
+  newArrIntegration[curveIdx] = newIntegration;
   return Object.assign({}, state, {
-    integrations,
+    integrations: newArrIntegration,
     selectedIdx: curveIdx
   });
 };
@@ -159,9 +162,10 @@ const setFkr = (state, action) => {
   const newIntegration = Object.assign({}, selectedIntegration, {
     refFactor
   });
-  integrations[curveIdx] = newIntegration;
+  const newArrIntegration = [...integrations];
+  newArrIntegration[curveIdx] = newIntegration;
   return Object.assign({}, state, {
-    integrations
+    integrations: newArrIntegration
   });
 };
 const setShift = (state, action) => {
@@ -174,9 +178,10 @@ const setShift = (state, action) => {
   const newIntegration = Object.assign({}, selectedIntegration, {
     shift
   });
-  integrations[selectedIdx] = newIntegration;
+  const newArrIntegration = [...integrations];
+  newArrIntegration[selectedIdx] = newIntegration;
   return Object.assign({}, state, {
-    integrations
+    integrations: newArrIntegration
   });
 };
 const resetAll = (state, action) => {
@@ -196,9 +201,10 @@ const clearAll = (state, action) => {
   const newIntegration = Object.assign({}, defaultEmptyIntegration, {
     edited: true
   });
-  integrations[curveIdx] = newIntegration;
+  const newArrIntegration = [...integrations];
+  newArrIntegration[curveIdx] = newIntegration;
   return Object.assign({}, state, {
-    integrations,
+    integrations: newArrIntegration,
     selectedIdx: curveIdx
   });
 };

diff --git a/dist/reducers/reducer_multiplicity.js b/dist/reducers/reducer_multiplicity.js
@@ -35,9 +35,10 @@ const setShift = (state, action) => {
   const newSelectedMulti = Object.assign({}, selectedMulti, {
     shift
   });
-  multiplicities[selectedIdx] = newSelectedMulti;
+  const newMultiplicities = [...multiplicities];
+  newMultiplicities[selectedIdx] = newSelectedMulti;
   return Object.assign({}, state, {
-    multiplicities
+    multiplicities: newMultiplicities
   });
 };
 const rmFromStack = (state, action) => {
@@ -76,9 +77,10 @@ const rmFromStack = (state, action) => {
     stack: newStack,
     smExtext: newSmExtext
   });
-  multiplicities[curveIdx] = newSelectedMulti;
+  const newMultiplicities = [...multiplicities];
+  newMultiplicities[curveIdx] = newSelectedMulti;
   return Object.assign({}, state, {
-    multiplicities,
+    multiplicities: newMultiplicities,
     selectedIdx: curveIdx
   });
 };
@@ -115,9 +117,10 @@ const updateMpyJ = (state, action) => {
   const newSelectedMulti = Object.assign({}, selectedMulti, {
     stack: newStack
   });
-  multiplicities[selectedIdx] = newSelectedMulti;
+  const newMultiplicities = [...multiplicities];
+  newMultiplicities[selectedIdx] = newSelectedMulti;
   return Object.assign({}, state, {
-    multiplicities
+    multiplicities: newMultiplicities
   });
 };
 const clickMpyOne = (state, action) => {
@@ -135,9 +138,10 @@ const clickMpyOne = (state, action) => {
   const newSelectedMulti = Object.assign({}, selectedMulti, {
     smExtext: payloadData
   });
-  multiplicities[curveIdx] = newSelectedMulti;
+  const newMultiplicities = [...multiplicities];
+  newMultiplicities[curveIdx] = newSelectedMulti;
   return Object.assign({}, state, {
-    multiplicities,
+    multiplicities: newMultiplicities,
     selectedIdx: curveIdx
   });
 };
@@ -154,9 +158,10 @@ const clearAll = (state, action) => {
   const newSelectedMulti = Object.assign({}, defaultEmptyMultiplicity, {
     edited: true
   });
-  multiplicities[curveIdx] = newSelectedMulti;
+  const newMultiplicities = [...multiplicities];
+  newMultiplicities[curveIdx] = newSelectedMulti;
   return Object.assign({}, state, {
-    multiplicities
+    multiplicities: newMultiplicities
   });
 };
 const multiplicityReducer = function () {

diff --git a/dist/sagas/saga_manager.js b/dist/sagas/saga_manager.js
@@ -47,9 +47,10 @@ function* resetInitNmr(action) {
   const {
     integrations
   } = integationSt;
-  integrations[curveIdx] = integration;
+  const newArrIntegration = [...integrations];
+  newArrIntegration[curveIdx] = integration;
   const payload = Object.assign({}, integationSt, {
-    integrations,
+    integrations: newArrIntegration,
     selectedIdx: curveIdx
   }); // eslint-disable-line
 
@@ -78,9 +79,10 @@ function* resetInitCommonWithIntergation(action) {
   const {
     integrations
   } = integationSt;
-  integrations[curveIdx] = integration;
+  const newArrIntegration = [...integrations];
+  newArrIntegration[curveIdx] = integration;
   const payload = Object.assign({}, integationSt, {
-    integrations,
+    integrations: newArrIntegration,
     selectedIdx: curveIdx
   }); // eslint-disable-line
 

diff --git a/dist/sagas/saga_multi_entities.js b/dist/sagas/saga_multi_entities.js
@@ -72,17 +72,6 @@ function* setCyclicVoltametry(action) {
     }
   }
 }
-
-// function* setInitData(action) {
-//   const layoutSt = yield select(getLayoutSt);
-//   console.log(layoutSt);
-//   const curveSt = yield select(getCurveSt);
-//   const { listCurves } = curveSt;
-//   console.log(listCurves);
-// }
-
-const multiEntitiesSagas = [(0, _effects.takeEvery)(_action_type.CURVE.SET_ALL_CURVES, setCyclicVoltametry)
-// takeEvery(CURVE.SET_ALL_CURVES, setInitData),
-];
+const multiEntitiesSagas = [(0, _effects.takeEvery)(_action_type.CURVE.SET_ALL_CURVES, setCyclicVoltametry)];
 var _default = multiEntitiesSagas;
 exports.default = _default;
diff --git a/dist/sagas/saga_multiplicity.js b/dist/sagas/saga_multiplicity.js
@@ -71,11 +71,12 @@ function* selectMpy(action) {
     stack: newStack,
     smExtext: newXExtemt
   });
-  multiplicities[curveIdx] = newSelectedMulti;
+  const newMultiplicities = [...multiplicities];
+  newMultiplicities[curveIdx] = newSelectedMulti;
   const payload = Object.assign(
   // eslint-disable-line
   {}, mpySt, {
-    multiplicities,
+    multiplicities: newMultiplicities,
     selectedIdx: curveIdx
   });
   yield (0, _effects.put)({
@@ -138,9 +139,10 @@ function* addUiPeakToStack(action) {
   const newSelectedMulti = Object.assign({}, selectedMulti, {
     stack: newStack
   }); // eslint-disable-line
-  multiplicities[curveIdx] = newSelectedMulti;
+  const newMultiplicities = [...multiplicities];
+  newMultiplicities[curveIdx] = newSelectedMulti;
   const payload = Object.assign({}, mpySt, {
-    multiplicities
+    multiplicities: newSelectedMulti
   }); // eslint-disable-line
 
   yield (0, _effects.put)({
@@ -193,9 +195,10 @@ const rmPeakFromStack = function (action, metaSt, mpySt) {
     stack: newStack,
     smExtext: newSmExtext
   }); // eslint-disable-line
-  multiplicities[curveIdx] = newSelectedMulti;
+  const newMultiplicities = [...multiplicities];
+  newMultiplicities[curveIdx] = newSelectedMulti;
   return Object.assign({}, mpySt, {
-    multiplicities
+    multiplicities: newMultiplicities
   }); // eslint-disable-line
 };
 
@@ -250,9 +253,10 @@ function* resetInitNmr(action) {
   const {
     multiplicities
   } = mpySt;
-  multiplicities[curveIdx] = multiplicity;
+  const newMultiplicities = [...multiplicities];
+  newMultiplicities[curveIdx] = multiplicity;
   const payload = Object.assign({}, mpySt, {
-    multiplicities,
+    multiplicities: newMultiplicities,
     selectedIdx: curveIdx
   }); // eslint-disable-line
 
@@ -327,9 +331,10 @@ function* resetOne(action) {
   const newSelectedMulti = Object.assign({}, selectedMulti, {
     stack: newStack
   }); // eslint-disable-line
-  multiplicities[curveIdx] = newSelectedMulti;
+  const newMultiplicities = [...multiplicities];
+  newMultiplicities[curveIdx] = newSelectedMulti;
   const payload = Object.assign({}, mpySt, {
-    multiplicities
+    multiplicities: newMultiplicities
   }); // eslint-disable-line
   yield (0, _effects.put)({
     type: _action_type.MULTIPLICITY.RESET_ONE_RDC,
@@ -362,9 +367,10 @@ function* selectMpyType(action) {
   const newSelectedMulti = Object.assign({}, selectedMulti, {
     stack: newStack
   }); // eslint-disable-line
-  multiplicities[curveIdx] = newSelectedMulti;
+  const newMultiplicities = [...multiplicities];
+  newMultiplicities[curveIdx] = newSelectedMulti;
   const payload = Object.assign({}, mpySt, {
-    multiplicities
+    multiplicities: newMultiplicities
   }); // eslint-disable-line
 
   yield (0, _effects.put)({

diff --git a/dist/setupTests.js b/dist/setupTests.js
@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _enzyme = _interopRequireDefault(require("enzyme"));
-var _enzymeAdapterReact = _interopRequireDefault(require("enzyme-adapter-react-16"));
+var _enzymeAdapterReact = _interopRequireDefault(require("@wojtekmaj/enzyme-adapter-react-17"));
 _enzyme.default.configure({
   adapter: new _enzymeAdapterReact.default()
 });
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@complat/react-spectra-editor",
-  "version": "1.0.0-rc15",
+  "version": "1.0.0-rc16",
   "description": "An editor to View and Edit Chemical Spectra data (NMR, IR and MS, CV, UIVIS, XRD).",
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
     "react-svg-inline": "^2.1.1",
     "redux": "^4.1.1",
     "redux-saga": "^1.1.3",
-    "redux-undo": "^1.0.1",
+    "redux-undo": "^1.1.0",
     "regenerator-transform": "^0.13.3",
     "reselect": "^4.0.0",
     "typescript": "^5.0.4"