feat: WIP avoid cannot reappear deleted peaks

Author: Lan Le

dist/actions/edit_peak.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.rmFromPosList = exports.rmFromNegList = void 0;
+exports.rmFromPosList = exports.rmFromNegList = exports.clearAllPeaks = void 0;
 var _action_type = require("../constants/action_type");
 const rmFromPosList = payload => ({
   type: _action_type.EDITPEAK.RM_POSITIVE,
@@ -14,4 +14,9 @@ const rmFromNegList = payload => ({
   type: _action_type.EDITPEAK.RM_NEGATIVE,
   payload
 });
-exports.rmFromNegList = rmFromNegList;
+exports.rmFromNegList = rmFromNegList;
+const clearAllPeaks = payload => ({
+  type: _action_type.EDITPEAK.CLEAR_ALL,
+  payload
+});
+exports.clearAllPeaks = clearAllPeaks;

dist/components/cmd_bar/03_peak.js

@@ -17,7 +17,10 @@ var _ui = require("../../actions/ui");
 var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
 var _common = require("./common");
 var _list_ui = require("../../constants/list_ui");
-/* eslint-disable prefer-object-spread, function-paren-newline,
+var _tri_btn = _interopRequireDefault(require("./tri_btn"));
+var _edit_peak = require("../../actions/edit_peak");
+var _extractPeaksEdit = require("../../helpers/extractPeaksEdit");
+/* eslint-disable prefer-object-spread, function-paren-newline, no-unused-vars,
 react/function-component-definition, react/require-default-props, max-len,
 react/no-unused-prop-types */
 
@@ -34,15 +37,28 @@ const Peak = _ref => {
     disableSetRefSt,
     isHandleMaxAndMinPeaksSt,
     cyclicVotaSt,
-    curveSt
+    curveSt,
+    clearAllPeaksAct,
+    feature,
+    editPeakSt,
+    thresSt,
+    shiftSt,
+    layoutSt
   } = _ref;
   let onSweepPeakAdd = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.PEAK_ADD);
   let onSweepPeakDELETE = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.PEAK_DELETE);
   let onSweepAnchorShift = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT);
+  const {
+    curveIdx
+  } = curveSt;
+  const onClearAll = () => {
+    const dataPeaks = (0, _extractPeaksEdit.extractAutoPeaks)(feature, thresSt, shiftSt, layoutSt);
+    clearAllPeaksAct({
+      curveIdx,
+      dataPeaks
+    });
+  };
   if (isHandleMaxAndMinPeaksSt) {
-    const {
-      curveIdx
-    } = curveSt;
     const {
       spectraList
     } = cyclicVotaSt;
@@ -84,7 +100,16 @@ const Peak = _ref => {
     onClick: onSweepPeakDELETE
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmpeak')
-  }, "P-")))), !disableSetRefSt ? /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
+  }, "P-")))), /*#__PURE__*/_react.default.createElement(_tri_btn.default, {
+    content: {
+      tp: 'Clear All Peaks'
+    },
+    cb: onClearAll
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmallpeaks')
+  }, "P"), /*#__PURE__*/_react.default.createElement("span", {
+    className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmallpeaks')
+  }, "x")), !disableSetRefSt ? /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
     title: /*#__PURE__*/_react.default.createElement("span", {
       className: "txt-sv-tp"
     }, "Set Reference")
@@ -96,7 +121,7 @@ const Peak = _ref => {
     className: classes.icon
   })))) : null);
 };
-const mapStateToProps = (state, _) => (
+const mapStateToProps = (state, props) => (
 // eslint-disable-line
 {
   isFocusAddPeakSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.PEAK_ADD || state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MAX_PEAK || state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MIN_PEAK,
@@ -107,10 +132,15 @@ const mapStateToProps = (state, _) => (
   disableSetRefSt: _cfg.default.btnCmdSetRef(state.layout),
   isHandleMaxAndMinPeaksSt: !_cfg.default.hidePanelCyclicVolta(state.layout),
   cyclicVotaSt: state.cyclicvolta,
-  curveSt: state.curve
+  curveSt: state.curve,
+  editPeakSt: state.editPeak.present,
+  thresSt: state.threshold,
+  layoutSt: state.layout,
+  shiftSt: state.shift
 });
 const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
-  setUiSweepTypeAct: _ui.setUiSweepType
+  setUiSweepTypeAct: _ui.setUiSweepType,
+  clearAllPeaksAct: _edit_peak.clearAllPeaks
 }, dispatch);
 Peak.propTypes = {
   classes: _propTypes.default.object.isRequired,
@@ -123,6 +153,12 @@ Peak.propTypes = {
   setUiSweepTypeAct: _propTypes.default.func.isRequired,
   isHandleMaxAndMinPeaksSt: _propTypes.default.bool.isRequired,
   cyclicVotaSt: _propTypes.default.object.isRequired,
-  curveSt: _propTypes.default.object.isRequired
+  curveSt: _propTypes.default.object.isRequired,
+  clearAllPeaksAct: _propTypes.default.func.isRequired,
+  feature: _propTypes.default.object.isRequired,
+  editPeakSt: _propTypes.default.object.isRequired,
+  thresSt: _propTypes.default.object.isRequired,
+  layoutSt: _propTypes.default.string.isRequired,
+  shiftSt: _propTypes.default.object.isRequired
 };
 var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Peak);

dist/components/cmd_bar/index.js

@@ -44,7 +44,8 @@ const CmdBar = _ref => {
   }, /*#__PURE__*/_react.default.createElement(_viewer.default, {
     editorOnly: editorOnly
   }), /*#__PURE__*/_react.default.createElement(_zoom.default, null), /*#__PURE__*/_react.default.createElement(_peak.default, {
-    jcampIdx: jcampIdx
+    jcampIdx: jcampIdx,
+    feature: feature
   }), /*#__PURE__*/_react.default.createElement(_pecker.default, {
     jcampIdx: jcampIdx
   }), /*#__PURE__*/_react.default.createElement(_integration.default, null), /*#__PURE__*/_react.default.createElement(_multiplicity.default, null), /*#__PURE__*/_react.default.createElement(_undo_redo.default, null), /*#__PURE__*/_react.default.createElement(_r04_submit.default, {

dist/constants/action_type.js

@@ -16,7 +16,8 @@ const EDITPEAK = exports.EDITPEAK = {
   ADD_NEGATIVE: 'ADD_TO_NEGATIVE_EDITPEAK_LIST',
   RM_NEGATIVE: 'RM_FROM_NEGATIVE_EDITPEAK_LIST',
   RM_POSITIVE: 'RM_FROM_POSITIVE_EDITPEAK_LIST',
-  SHIFT: 'EDITPEAK_SHIFT'
+  SHIFT: 'EDITPEAK_SHIFT',
+  CLEAR_ALL: 'EDITPEAK_CLEAR_ALL'
 };
 const STATUS = exports.STATUS = {
   TOGGLEBTNSUBMIT: 'TOGGLE_BTN_SUBMIT',

dist/helpers/extractPeaksEdit.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.extractPeaksEdit = exports.extractAreaUnderCurve = void 0;
+exports.extractPeaksEdit = exports.extractAutoPeaks = exports.extractAreaUnderCurve = void 0;
 var _converter = require("./converter");
 var _chem = require("./chem");
 var _shift = require("./shift");
@@ -35,6 +35,13 @@ const extractPeaksEdit = function (feature, editPeakSt, thresSt, shiftSt, layout
   return peaksEdit;
 };
 exports.extractPeaksEdit = extractPeaksEdit;
+const extractAutoPeaks = function (feature, thresSt, shiftSt, layoutSt) {
+  let atIndex = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+  const offset = _format.default.isMsLayout(layoutSt) ? msOffset() : niOffset(shiftSt, atIndex);
+  const peaks = (0, _chem.Convert2Peak)(feature, thresSt.value, offset);
+  return peaks;
+};
+exports.extractAutoPeaks = extractAutoPeaks;
 const getAUCValue = (integrationSt, layoutSt) => {
   const {
     refArea,

dist/reducers/reducer_edit_peak.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.editPeakReducer = exports.default = void 0;
 var _reduxUndo = _interopRequireDefault(require("redux-undo"));
 var _action_type = require("../constants/action_type");
 var _undo_redo_config = require("./undo_redo_config");
@@ -180,6 +180,28 @@ const processShift = (state, action) => {
     peaks: newPeaks
   });
 };
+const clearAllPeaks = (state, action) => {
+  const {
+    curveIdx,
+    dataPeaks
+  } = action.payload;
+  const {
+    peaks
+  } = state;
+  const selectedEditPeaks = peaks[curveIdx];
+  const {
+    pos
+  } = selectedEditPeaks;
+  const newSelectedEditPeaks = Object.assign({}, selectedEditPeaks, {
+    pos: [],
+    neg: [...pos, ...dataPeaks]
+  });
+  const newPeaks = [...peaks];
+  newPeaks[curveIdx] = newSelectedEditPeaks;
+  return Object.assign({}, state, {
+    peaks: newPeaks
+  });
+};
 const editPeakReducer = function () {
   let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
   let action = arguments.length > 1 ? arguments[1] : undefined;
@@ -194,6 +216,8 @@ const editPeakReducer = function () {
       return rmFromNeg(state, action);
     case _action_type.EDITPEAK.SHIFT:
       return processShift(state, action);
+    case _action_type.EDITPEAK.CLEAR_ALL:
+      return clearAllPeaks(state, action);
     case _action_type.MANAGER.RESETALL:
       return {
         selectedIdx: 0,
@@ -207,5 +231,6 @@ const editPeakReducer = function () {
       return _undo_redo_config.undoRedoActions.indexOf(action.type) >= 0 ? Object.assign({}, state) : state;
   }
 };
+exports.editPeakReducer = editPeakReducer;
 const undoableEditPeakReducer = (0, _reduxUndo.default)(editPeakReducer, _undo_redo_config.undoRedoConfig);
 var _default = exports.default = undoableEditPeakReducer;

dist/reducers/undo_redo_config.js

@@ -1,4 +1,4 @@
-import { extractPeaksEdit, extractAreaUnderCurve } from "../../../helpers/extractPeaksEdit";
+import { extractPeaksEdit, extractAreaUnderCurve, extractAutoPeaks } from "../../../helpers/extractPeaksEdit";
 import { LIST_LAYOUT } from "../../../constants/list_layout";
 import { LIST_SHIFT_1H } from "../../../constants/list_shift";
 
@@ -29,6 +29,28 @@ describe('Test extract edited peaks and area under curve', () => {
     })
   })
 
+  describe('Test extract auto peaks from feature', () => {
+    const feature = { data: [{ x: [1, 2, 3], y: [1, 2, 3] }],  operation: { layout: '1H'}, maxY: 2, peakUp: true }
+    const threshold = { value: 55 }
+    const shiftSt = {
+      shifts: [
+        { ref: LIST_SHIFT_1H[1], peak: { x: 2, y: 2 } }
+      ]
+    }
+
+    it('Extract with MS layout', () => {
+      const peaks = extractAutoPeaks(feature, threshold, shiftSt, LIST_LAYOUT.MS)
+      const expectedPeaks = [{x: 2, y: 2}, {x: 3, y: 3}]
+      expect(peaks).toEqual(expectedPeaks)
+    })
+
+    it('Extract with non-MS layout', () => {
+      const peaks = extractAutoPeaks(feature, threshold, shiftSt, LIST_LAYOUT.H1)
+      const expectedPeaks = [{x: 2.04, y: 2}, {x: 3.04, y: 3}]
+      expect(peaks).toEqual(expectedPeaks)
+    })
+  })
+
   describe('Test extract AUC', () => {
     type Integration = { area: number }
     type IntegrationState = { refArea: number, refFactor: number, stack: Array<Integration>}

src/__tests__/units/helpers/extractPeaksEdit.test.tsx

@@ -1,4 +1,4 @@
-/* eslint-disable prefer-object-spread, function-paren-newline,
+/* eslint-disable prefer-object-spread, function-paren-newline, no-unused-vars,
 react/function-component-definition, react/require-default-props, max-len,
 react/no-unused-prop-types */
 import React from 'react';
@@ -17,7 +17,7 @@ import { MuButton, commonStyle, focusStyle } from './common';
 import { LIST_UI_SWEEP_TYPE } from '../../constants/list_ui';
 import TriBtn from './tri_btn';
 import { clearAllPeaks } from '../../actions/edit_peak';
-import { extractPeaksEdit } from '../../helpers/extractPeaksEdit';
+import { extractAutoPeaks } from '../../helpers/extractPeaksEdit';
 
 const styles = () => (
   Object.assign(
@@ -40,8 +40,10 @@ const Peak = ({
   let onSweepPeakDELETE = () => setUiSweepTypeAct(LIST_UI_SWEEP_TYPE.PEAK_DELETE);
   let onSweepAnchorShift = () => setUiSweepTypeAct(LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT);
   const { curveIdx } = curveSt;
-  const dataPeaks = extractPeaksEdit(feature, editPeakSt, thresSt, shiftSt, layoutSt);
-  const onClearAll = () => clearAllPeaksAct({ curveIdx, dataPeaks });
+  const onClearAll = () => {
+    const dataPeaks = extractAutoPeaks(feature, thresSt, shiftSt, layoutSt);
+    clearAllPeaksAct({ curveIdx, dataPeaks });
+  };
   if (isHandleMaxAndMinPeaksSt) {
     const { spectraList } = cyclicVotaSt;
     const spectra = spectraList[curveIdx];

src/components/cmd_bar/03_peak.js

@@ -24,6 +24,12 @@ const extractPeaksEdit = (feature, editPeakSt, thresSt, shiftSt, layoutSt, atInd
   return peaksEdit;
 };
 
+const extractAutoPeaks = (feature, thresSt, shiftSt, layoutSt, atIndex = 0) => {
+  const offset = Format.isMsLayout(layoutSt) ? msOffset() : niOffset(shiftSt, atIndex);
+  const peaks = Convert2Peak(feature, thresSt.value, offset);
+  return peaks;
+};
+
 const getAUCValue = (integrationSt, layoutSt) => {
   const { refArea, refFactor, stack } = integrationSt;
   if (Array.isArray(stack) && stack.length > 0) {
@@ -47,4 +53,4 @@ const extractAreaUnderCurve = (allIntegrationSt, presentIntegrationSt, layoutSt)
   return null;
 };
 
-export { extractPeaksEdit, extractAreaUnderCurve }; // eslint-disable-line
+export { extractPeaksEdit, extractAreaUnderCurve, extractAutoPeaks }; // eslint-disable-line