Fix crash and undo redo function (#150)

* fix: fixed crash when select multiplicity on panel (#146) * fix: fix cannot undo redo peaks, integrations and multiplicities (#149)
ComPlat · Sep 5, 2023 · e996036 · e996036
1 parent 506c2f9
commit e996036
Show file tree

Hide file tree

Showing 28 changed files with 269 additions and 253 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -0,0 +1,14 @@
+name: Testing
+
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 16.10.0
+      - run: yarn install
+      - run: yarn test
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 An editor to View and Edit Chemical Spectra data (NMR, IR and MS).
 
+![Testing](https://github.com/ComPlat/react-spectra-editor/actions/workflows/testing.yml/badge.svg)
+
 ### Usage
 
 #### Installing from npm

diff --git a/dist/components/cmd_bar/r01_layout.js b/dist/components/cmd_bar/r01_layout.js
@@ -160,7 +160,7 @@ const layoutSelect = (classes, layoutSt, updateLayoutAct) => {
     value: _list_layout.LIST_LAYOUT.AIF
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
-  }, "AIF")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
+  }, "SOPTION-DESORPTION")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
     value: _list_layout.LIST_LAYOUT.EMISSIONS
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')

diff --git a/dist/components/cmd_bar/r06_predict_btn.js b/dist/components/cmd_bar/r06_predict_btn.js
@@ -169,10 +169,12 @@ const BtnPredict = _ref => {
     realCount = (0, _carbonFeatures.carbonFeatures)(peaksEdit, multiplicitySt).length;
   } else {
     const {
-      selectedIdx,
+      curveIdx
+    } = curveSt;
+    const {
       multiplicities
     } = multiplicitySt;
-    const selectedMultiplicity = multiplicities[selectedIdx];
+    const selectedMultiplicity = multiplicities[curveIdx];
     const {
       stack
     } = selectedMultiplicity;

diff --git a/dist/components/panel/info.js b/dist/components/panel/info.js
@@ -199,15 +199,15 @@ const InfoPanel = _ref => {
     className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt')
   }, "Area under curve (AUC):"), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _classnames.default)(classes.tTxt, classes.tTxtSim, 'txt-sv-panel-txt')
-  }, aucValue(integration))) : null), /*#__PURE__*/_react.default.createElement(_reactQuill.default, {
+  }, aucValue(integration))) : null), !_format.default.isCyclicVoltaLayout(layoutSt) ? /*#__PURE__*/_react.default.createElement(_reactQuill.default, {
     className: (0, _classnames.default)(classes.quill, 'card-sv-quill'),
     value: descriptions,
     modules: {
       toolbar: false
     },
     onChange: onDescriptionChanged,
     readOnly: canChangeDescription !== undefined ? !canChangeDescription : true
-  }), /*#__PURE__*/_react.default.createElement("div", null, !editorOnly && _format.default.isNmrLayout(layoutSt) ? /*#__PURE__*/_react.default.createElement("div", {
+  }) : null, /*#__PURE__*/_react.default.createElement("div", null, !editorOnly && _format.default.isNmrLayout(layoutSt) ? /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(classes.rowRoot, classes.rowOddSim)
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt')

diff --git a/dist/components/panel/multiplicity.js b/dist/components/panel/multiplicity.js
@@ -205,7 +205,11 @@ const mpyList = (classes, digits, multiplicitySt, curveSt, clickMpyOneAct, rmMpy
     const onClick = e => {
       e.stopPropagation();
       e.preventDefault();
-      clickMpyOneAct(xExtent);
+      const payload = {
+        curveIdx,
+        payloadData: xExtent
+      };
+      clickMpyOneAct(payload);
     };
     return createData(idx, xExtent, peaks, shift, smExtext, mpyType, js, onClick, onRefresh);
   });

diff --git a/dist/index.js b/dist/index.js
@@ -640,7 +640,7 @@ class DemoWriteIr extends _react.default.Component {
         margin: '0 10px 0 10px'
       },
       onClick: this.onClick('aif')
-    }, "AIF"), /*#__PURE__*/_react.default.createElement(_Button.default, {
+    }, "SOPTION-DESORPTION"), /*#__PURE__*/_react.default.createElement(_Button.default, {
       variant: "contained",
       style: {
         margin: '0 10px 0 10px'

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;