@complat/react-spectra-editor 1.5.4 → 1.7.0

package/dist/__tests__/units/components/cmd_bar/r05_submit_btn.test.js

@@ -0,0 +1,217 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _reduxMockStore = _interopRequireDefault(require("redux-mock-store"));
+var _reactRedux = require("react-redux");
+var _react = require("@testing-library/react");
+require("@testing-library/jest-dom");
+var _r05_submit_btn = _interopRequireDefault(require("../../../../components/cmd_bar/r05_submit_btn"));
+var _jsxRuntime = require("react/jsx-runtime");
+jest.mock('../../../../helpers/extractPeaksEdit', () => ({
+  extractPeaksEdit: jest.fn(() => [{
+    x: 1,
+    y: 2
+  }])
+}));
+const mockStore = (0, _reduxMockStore.default)([]);
+const buildBaseState = (overrides = {}) => ({
+  editPeak: {
+    present: {
+      selectedIdx: 0,
+      peaks: [{
+        pos: [],
+        neg: []
+      }]
+    }
+  },
+  threshold: {
+    list: [{
+      isEdit: true,
+      value: 10,
+      upper: false,
+      lower: false
+    }]
+  },
+  layout: '1H',
+  shift: {
+    shifts: []
+  },
+  scan: {
+    target: 5,
+    isAuto: false
+  },
+  forecast: {
+    predictions: {}
+  },
+  submit: {
+    decimal: 2
+  },
+  integration: {
+    present: {
+      integrations: [{
+        stack: [],
+        refArea: 1,
+        refFactor: 1
+      }]
+    }
+  },
+  multiplicity: {
+    present: {
+      multiplicities: [{
+        stack: [],
+        shift: 0
+      }]
+    }
+  },
+  wavelength: {},
+  cyclicvolta: {
+    useCurrentDensity: false,
+    areaUnit: 'cm²',
+    areaValue: 1.0
+  },
+  curve: {
+    curveIdx: 0,
+    listCurves: []
+  },
+  axesUnits: {
+    axes: [{
+      xUnit: '',
+      yUnit: ''
+    }]
+  },
+  detector: {},
+  meta: {
+    dscMetaData: {}
+  },
+  ...overrides
+});
+const renderBtnSubmit = (state, operationValue) => {
+  const store = mockStore(state);
+  const feature = {
+    xUnit: 'ppm',
+    yUnit: 'intensity',
+    scanAutoTarget: 1,
+    thresRef: 3
+  };
+  const view = (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRedux.Provider, {
+    store: store,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_r05_submit_btn.default, {
+      operation: {
+        name: 'save',
+        value: operationValue
+      },
+      feature: feature,
+      isAscend: true,
+      isIntensity: true
+    })
+  }));
+  const button = view.container.querySelector('.btn-sv-bar-submit');
+  _react.fireEvent.click(button);
+  return view;
+};
+describe('<BtnSubmit payload contract />', () => {
+  it('sends a spectra_list with length 1 in single-spectrum mode', () => {
+    const operationValue = jest.fn();
+    const state = buildBaseState({
+      curve: {
+        curveIdx: 0,
+        listCurves: []
+      }
+    });
+    renderBtnSubmit(state, operationValue);
+    expect(operationValue).toHaveBeenCalledTimes(1);
+    const payload = operationValue.mock.calls[0][0];
+    expect(Array.isArray(payload.spectra_list)).toBe(true);
+    expect(payload.spectra_list).toHaveLength(1);
+    expect(payload).toHaveProperty('curveSt');
+    expect(payload.curveSt).toEqual({
+      curveIdx: 0
+    });
+  });
+  it('sends a spectra_list with length N in multi-spectrum mode', () => {
+    const operationValue = jest.fn();
+    const state = buildBaseState({
+      curve: {
+        curveIdx: 1,
+        listCurves: [{
+          feature: {
+            xUnit: 'ppm',
+            yUnit: 'intensity',
+            scanAutoTarget: 1,
+            thresRef: 3
+          }
+        }, {
+          feature: {
+            xUnit: 'ppm',
+            yUnit: 'intensity',
+            scanAutoTarget: 2,
+            thresRef: 4
+          }
+        }, {
+          feature: {
+            xUnit: 'ppm',
+            yUnit: 'intensity',
+            scanAutoTarget: 3,
+            thresRef: 5
+          }
+        }]
+      },
+      threshold: {
+        list: [{
+          value: 10
+        }, {
+          value: 20
+        }, {
+          value: 30
+        }]
+      },
+      axesUnits: {
+        axes: [{
+          xUnit: '',
+          yUnit: ''
+        }, {
+          xUnit: '',
+          yUnit: ''
+        }, {
+          xUnit: '',
+          yUnit: ''
+        }]
+      }
+    });
+    renderBtnSubmit(state, operationValue);
+    const payload = operationValue.mock.calls[0][0];
+    expect(payload.spectra_list).toHaveLength(3);
+    expect(payload.curveSt).toEqual({
+      curveIdx: 1
+    });
+  });
+  it('controls presence/absence of keepPred and simulatenmr', () => {
+    const withFlagsCb = jest.fn();
+    const noFlagsCb = jest.fn();
+    const withFlagsState = buildBaseState({
+      forecast: {
+        predictions: {
+          keepPred: true,
+          simulatenmr: false
+        }
+      }
+    });
+    renderBtnSubmit(withFlagsState, withFlagsCb);
+    const withFlagsPayload = withFlagsCb.mock.calls[0][0];
+    expect(withFlagsPayload.spectra_list[0]).toMatchObject({
+      keepPred: true,
+      simulatenmr: false
+    });
+    const noFlagsState = buildBaseState({
+      forecast: {
+        predictions: {
+          keepPred: 'yes'
+        }
+      }
+    });
+    renderBtnSubmit(noFlagsState, noFlagsCb);
+    const noFlagsPayload = noFlagsCb.mock.calls[0][0];
+    expect(noFlagsPayload.spectra_list[0]).not.toHaveProperty('keepPred');
+    expect(noFlagsPayload.spectra_list[0]).not.toHaveProperty('simulatenmr');
+  });
+});

package/dist/actions/cyclic_voltammetry.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setWorkWithMaxPeak = exports.setCylicVoltaRefFactor = exports.setCylicVoltaRef = exports.selectRefPeaks = exports.selectPairPeak = exports.removeCylicVoltaPecker = exports.removeCylicVoltaPairPeak = exports.removeCylicVoltaMinPeak = exports.removeCylicVoltaMaxPeak = exports.addNewCylicVoltaPairPeak = exports.addCylicVoltaPecker = exports.addCylicVoltaMinPeak = exports.addCylicVoltaMaxPeak = void 0;
+exports.toggleCyclicVoltaDensity = exports.setWorkWithMaxPeak = exports.setCylicVoltaRefFactor = exports.setCylicVoltaRef = exports.setCyclicVoltaAreaValue = exports.setCyclicVoltaAreaUnit = exports.selectRefPeaks = exports.selectPairPeak = exports.removeCylicVoltaPecker = exports.removeCylicVoltaPairPeak = exports.removeCylicVoltaMinPeak = exports.removeCylicVoltaMaxPeak = exports.addNewCylicVoltaPairPeak = exports.addCylicVoltaPecker = exports.addCylicVoltaMinPeak = exports.addCylicVoltaMaxPeak = void 0;
 var _action_type = require("../constants/action_type");
 const addNewCylicVoltaPairPeak = payload => ({
   type: _action_type.CYCLIC_VOLTA_METRY.ADD_PAIR_PEAKS,
@@ -69,4 +69,23 @@ const setCylicVoltaRef = payload => ({
   type: _action_type.CYCLIC_VOLTA_METRY.SET_REF,
   payload
 });
-exports.setCylicVoltaRef = setCylicVoltaRef;
+exports.setCylicVoltaRef = setCylicVoltaRef;
+const setCyclicVoltaAreaValue = value => ({
+  type: _action_type.CYCLIC_VOLTA_METRY.SET_AREA_VALUE,
+  payload: {
+    value
+  }
+});
+exports.setCyclicVoltaAreaValue = setCyclicVoltaAreaValue;
+const setCyclicVoltaAreaUnit = unit => ({
+  type: _action_type.CYCLIC_VOLTA_METRY.SET_AREA_UNIT,
+  payload: {
+    unit
+  }
+});
+exports.setCyclicVoltaAreaUnit = setCyclicVoltaAreaUnit;
+const toggleCyclicVoltaDensity = payload => ({
+  type: _action_type.CYCLIC_VOLTA_METRY.TOGGLE_DENSITY,
+  payload
+});
+exports.toggleCyclicVoltaDensity = toggleCyclicVoltaDensity;

package/dist/components/cmd_bar/index.js

@@ -24,6 +24,8 @@ var _r07_wavelength_btn = _interopRequireDefault(require("./r07_wavelength_btn")
 var _pecker = _interopRequireDefault(require("./07_pecker"));
 var _r08_change_axes = _interopRequireDefault(require("./r08_change_axes"));
 var _r09_detector = _interopRequireDefault(require("./r09_detector"));
+var _r10_cv_density = _interopRequireDefault(require("./r10_cv_density"));
+var _format = _interopRequireDefault(require("../../helpers/format"));
 var _jsxRuntime = require("react/jsx-runtime");
 /* eslint-disable prefer-object-spread, function-paren-newline,
 react/function-component-definition, react/require-default-props */
@@ -37,34 +39,40 @@ const CmdBar = ({
   operations,
   editorOnly,
   jcampIdx,
-  hideThreshold
-}) => /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-  className: classes.card,
-  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_viewer.default, {
-    editorOnly: editorOnly
-  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_zoom.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_peak.default, {
-    jcampIdx: jcampIdx,
-    feature: feature
-  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_pecker.default, {
-    jcampIdx: jcampIdx
-  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_integration.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_multiplicity.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_undo_redo.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r04_submit.default, {
-    operations: operations,
-    feature: feature,
-    forecast: forecast,
-    editorOnly: editorOnly,
-    hideSwitch: false,
-    disabled: false
-  }), hideThreshold ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_r03_threshold.default, {
-    feature: feature,
-    hasEdit: hasEdit
-  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r01_layout.default, {
-    feature: feature,
-    hasEdit: hasEdit
-  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r07_wavelength_btn.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r08_change_axes.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r09_detector.default, {})]
-});
+  hideThreshold,
+  layoutSt
+}) => {
+  const isCvLayout = _format.default.isCyclicVoltaLayout(layoutSt);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: classes.card,
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_viewer.default, {
+      editorOnly: editorOnly
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_zoom.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_peak.default, {
+      jcampIdx: jcampIdx,
+      feature: feature
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_pecker.default, {
+      jcampIdx: jcampIdx
+    }), isCvLayout ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_integration.default, {}), isCvLayout ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_multiplicity.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_undo_redo.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r04_submit.default, {
+      operations: operations,
+      feature: feature,
+      forecast: forecast,
+      editorOnly: editorOnly,
+      hideSwitch: false,
+      disabled: false
+    }), hideThreshold ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_r03_threshold.default, {
+      feature: feature,
+      hasEdit: hasEdit
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r01_layout.default, {
+      feature: feature,
+      hasEdit: hasEdit
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r07_wavelength_btn.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r10_cv_density.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r08_change_axes.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r09_detector.default, {})]
+  });
+};
 const mapStateToProps = (state, _) => (
 // eslint-disable-line
-{});
+{
+  layoutSt: state.layout
+});
 const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({}, dispatch);
 CmdBar.propTypes = {
   classes: _propTypes.default.object.isRequired,
@@ -73,6 +81,7 @@ CmdBar.propTypes = {
   hasEdit: _propTypes.default.bool.isRequired,
   operations: _propTypes.default.array.isRequired,
   editorOnly: _propTypes.default.bool.isRequired,
+  layoutSt: _propTypes.default.string.isRequired,
   jcampIdx: _propTypes.default.any,
   hideThreshold: _propTypes.default.bool
 };

package/dist/components/cmd_bar/r01_layout.js

@@ -33,6 +33,35 @@ const styles = () => Object.assign({
     width: 100
   }
 }, _common.commonStyle);
+const chemSubStyle = {
+  fontSize: '0.85em',
+  position: 'relative',
+  top: '0.24em',
+  lineHeight: 1
+};
+const renderReadableSubscript = (txt = '') => {
+  if (typeof txt !== 'string') return txt;
+  const regex = /([A-Za-z])(\d+)/g;
+  if (!regex.test(txt)) return txt;
+  regex.lastIndex = 0;
+  const parts = [];
+  let cursor = 0;
+  let match = regex.exec(txt);
+  while (match) {
+    const [raw, prefix, digits] = match;
+    const at = match.index;
+    if (at > cursor) parts.push(txt.slice(cursor, at));
+    parts.push(prefix);
+    parts.push(/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      style: chemSubStyle,
+      children: digits
+    }, `${at}-${digits}`));
+    cursor = at + raw.length;
+    match = regex.exec(txt);
+  }
+  if (cursor < txt.length) parts.push(txt.slice(cursor));
+  return parts;
+};
 const shiftSelect = (classes, layoutSt, setShiftRefAct, shiftSt, curveSt) => {
   if (_cfg.default.hideSolvent(layoutSt)) {
     return null;
@@ -73,9 +102,9 @@ const shiftSelect = (classes, layoutSt, setShiftRefAct, shiftSt, curveSt) => {
       className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-shift'),
       children: listShift.map(ref => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
         value: ref.name,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
           className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-shift'),
-          children: `${ref.name}: ${_format.default.strNumberFixedDecimal(ref.value, 2)} ppm`
+          children: [renderReadableSubscript(ref.name), `: ${_format.default.strNumberFixedDecimal(ref.value, 2)} ppm`]
         })
       }, ref.name))
     })]

package/dist/components/cmd_bar/r05_submit_btn.js

@@ -16,34 +16,186 @@ var _styles = require("@mui/styles");
 var _chem = require("../../helpers/chem");
 var _common = require("./common");
 var _extractPeaksEdit = require("../../helpers/extractPeaksEdit");
+var _format = _interopRequireDefault(require("../../helpers/format"));
 var _jsxRuntime = require("react/jsx-runtime");
 /* eslint-disable prefer-object-spread, function-paren-newline,
 react/function-component-definition, function-call-argument-newline,
 react/require-default-props */
 
 const styles = () => Object.assign({}, _common.commonStyle);
-const onClickCb = (operation, peaksEdit, isAscend, isIntensity, scan, thres, layoutSt, shiftSt, analysis, decimalSt, integrationSt, multiplicitySt, allIntegrationSt, aucValues, waveLengthSt, cyclicvoltaSt, curveSt, axesUnitsSt, detectorSt, dscMetaData) => () => {
-  operation({
+const getAxesSelection = (axesUnitsSt, curveIdx) => {
+  const axes = axesUnitsSt?.axes;
+  if (!Array.isArray(axes) || axes.length === 0) return {
+    xUnit: '',
+    yUnit: ''
+  };
+  const idx = Number.isFinite(curveIdx) ? curveIdx : 0;
+  return axes[idx] || axes[0] || {
+    xUnit: '',
+    yUnit: ''
+  };
+};
+const resolveAxisLabels = (xLabel, yLabel, axesUnitsSt, curveIdx) => {
+  const {
+    xUnit,
+    yUnit
+  } = getAxesSelection(axesUnitsSt, curveIdx);
+  return {
+    xLabel: xUnit === '' ? xLabel : xUnit,
+    yLabel: yUnit === '' ? yLabel : yUnit
+  };
+};
+const getBaseCurrentUnit = label => /mA/i.test(String(label)) ? 'mA' : 'A';
+const buildCvAxisYLabel = (yLabel, cyclicvoltaSt) => {
+  const baseUnit = getBaseCurrentUnit(yLabel);
+  const areaUnit = cyclicvoltaSt?.areaUnit || 'cm²';
+  if (cyclicvoltaSt?.useCurrentDensity) {
+    return `Current density in ${baseUnit}/${areaUnit}`;
+  }
+  return `Current in ${baseUnit}`;
+};
+const computeCvYScaleFactor = (feature, cyclicvoltaSt) => {
+  if (!cyclicvoltaSt?.useCurrentDensity) return 1.0;
+  const rawArea = (cyclicvoltaSt.areaValue === '' ? 1.0 : cyclicvoltaSt.areaValue) || 1.0;
+  const areaUnit = cyclicvoltaSt.areaUnit || 'cm²';
+  const safeArea = rawArea > 0 ? rawArea : 1.0;
+  const areaInCm2 = areaUnit === 'mm²' ? safeArea / 100.0 : safeArea;
+  let factor = 1.0 / areaInCm2;
+  const baseY = feature && feature.yUnit ? String(feature.yUnit) : 'A';
+  if (/mA/i.test(baseY)) {
+    factor *= 1000.0;
+  }
+  if (areaUnit === 'mm²') {
+    factor /= 100.0;
+  }
+  return factor;
+};
+const defaultThreshold = {
+  isEdit: true,
+  value: false,
+  upper: false,
+  lower: false
+};
+const pickFromList = (list, index, fallback = null) => Array.isArray(list) && list[index] !== undefined ? list[index] : fallback;
+const hasBoolean = value => typeof value === 'boolean';
+const resolveOptionalBooleanFlags = analysis => {
+  const flags = {};
+  if (hasBoolean(analysis?.keepPred)) flags.keepPred = analysis.keepPred;
+  if (hasBoolean(analysis?.simulatenmr)) flags.simulatenmr = analysis.simulatenmr;
+  return flags;
+};
+const buildSpectrumPayload = ({
+  feature,
+  curveIdx,
+  editPeakSt,
+  thresList,
+  shiftSt,
+  layoutSt,
+  scanSt,
+  integrationSt,
+  multiplicitySt,
+  waveLengthSt,
+  cyclicvoltaSt,
+  axesUnitsSt,
+  detectorSt,
+  dscMetaData,
+  isAscend,
+  isIntensity,
+  analysis,
+  decimalSt
+}) => {
+  const threshold = thresList?.[curveIdx] || thresList?.[0] || defaultThreshold;
+  const editPeakAtIndex = Object.assign({}, editPeakSt, {
+    selectedIdx: curveIdx
+  });
+  const peaksEdit = (0, _extractPeaksEdit.extractPeaksEdit)(feature, editPeakAtIndex, threshold, shiftSt, layoutSt, curveIdx);
+  const scan = (0, _chem.Convert2Scan)(feature, scanSt);
+  const thres = (0, _chem.Convert2Thres)(feature, threshold);
+  const shift = pickFromList(shiftSt?.shifts, curveIdx, shiftSt);
+  const integration = pickFromList(integrationSt?.integrations, curveIdx, integrationSt);
+  const multiplicity = pickFromList(multiplicitySt?.multiplicities, curveIdx, multiplicitySt);
+  const {
+    xLabel,
+    yLabel
+  } = resolveAxisLabels(feature?.xUnit, feature?.yUnit, axesUnitsSt, curveIdx);
+  const axisYLabel = _format.default.isCyclicVoltaLayout(layoutSt) ? buildCvAxisYLabel(yLabel, cyclicvoltaSt) : yLabel;
+  const axisDisplay = {
+    xLabel,
+    yLabel: axisYLabel
+  };
+  const cvDisplay = _format.default.isCyclicVoltaLayout(layoutSt) ? {
+    mode: cyclicvoltaSt?.useCurrentDensity ? 'density' : 'current',
+    yScaleFactor: computeCvYScaleFactor(feature, cyclicvoltaSt)
+  } : null;
+  const cyclicvoltaPayload = {
+    ...cyclicvoltaSt,
+    axisDisplay,
+    cvDisplay
+  };
+  const optionalBooleanFlags = resolveOptionalBooleanFlags(analysis);
+  return {
     peaks: peaksEdit,
     layout: layoutSt,
-    shift: shiftSt,
+    shift,
     scan,
     thres,
     isAscend,
     isIntensity,
     analysis,
     decimal: decimalSt,
-    integration: integrationSt,
-    multiplicity: multiplicitySt,
-    allIntegration: allIntegrationSt,
-    aucValues,
+    integration,
+    multiplicity,
     waveLength: waveLengthSt,
-    cyclicvoltaSt,
-    curveSt,
+    cyclicvoltaSt: cyclicvoltaPayload,
+    curveSt: {
+      curveIdx
+    },
     axesUnitsSt,
     detectorSt,
-    dscMetaData
+    dscMetaData,
+    ...optionalBooleanFlags
+  };
+};
+const onClickCb = (operationValue, isAscend, isIntensity, layoutSt, shiftSt, analysis, decimalSt, integrationSt, multiplicitySt, waveLengthSt, cyclicvoltaSt, curveSt, axesUnitsSt, detectorSt, dscMetaData, curveList, editPeakSt, thresList, scanSt, feature) => () => {
+  const defaultCurves = feature ? [{
+    feature
+  }] : [];
+  const curves = Array.isArray(curveList) && curveList.length > 0 ? curveList : defaultCurves;
+  const fallbackIdx = Number.isFinite(curveSt?.curveIdx) ? curveSt.curveIdx : 0;
+  const indicesToSend = curves.length > 0 ? curves.map((_, index) => index) : [fallbackIdx];
+  const spectraList = indicesToSend.map(curveIdx => {
+    const curve = curves[curveIdx] || {};
+    const curveFeature = curve.feature || feature;
+    return buildSpectrumPayload({
+      feature: curveFeature,
+      curveIdx,
+      editPeakSt,
+      thresList,
+      shiftSt,
+      layoutSt,
+      scanSt,
+      integrationSt,
+      multiplicitySt,
+      waveLengthSt,
+      cyclicvoltaSt,
+      axesUnitsSt,
+      detectorSt,
+      dscMetaData,
+      isAscend,
+      isIntensity,
+      analysis,
+      decimalSt
+    });
   });
+  const payload = {
+    spectra_list: spectraList
+  };
+  if (Number.isFinite(curveSt?.curveIdx)) {
+    payload.curveSt = {
+      curveIdx: curveSt.curveIdx
+    };
+  }
+  operationValue(payload);
 };
 const BtnSubmit = ({
   classes,
@@ -52,7 +204,7 @@ const BtnSubmit = ({
   isAscend,
   isIntensity,
   editPeakSt,
-  thresSt,
+  thresList,
   layoutSt,
   shiftSt,
   scanSt,
@@ -60,22 +212,37 @@ const BtnSubmit = ({
   decimalSt,
   integrationSt,
   multiplicitySt,
-  allIntegrationSt,
   waveLengthSt,
   cyclicvoltaSt,
   curveSt,
+  curveList,
   axesUnitsSt,
   detectorSt,
   metaSt
 }) => {
-  const peaksEdit = (0, _extractPeaksEdit.extractPeaksEdit)(feature, editPeakSt, thresSt, shiftSt, layoutSt);
   // const disBtn = peaksEdit.length === 0 || statusSt.btnSubmit || disabled;
-  const scan = (0, _chem.Convert2Scan)(feature, scanSt);
-  const thres = (0, _chem.Convert2Thres)(feature, thresSt);
-  const aucValues = (0, _extractPeaksEdit.extractAreaUnderCurve)(allIntegrationSt, integrationSt, layoutSt);
   const {
     dscMetaData
   } = metaSt;
+  const isCvLayout = _format.default.isCyclicVoltaLayout(layoutSt);
+  const {
+    xLabel,
+    yLabel
+  } = resolveAxisLabels(feature?.xUnit, feature?.yUnit, axesUnitsSt, curveSt?.curveIdx);
+  const axisYLabel = isCvLayout ? buildCvAxisYLabel(yLabel, cyclicvoltaSt) : yLabel;
+  const axisDisplay = {
+    xLabel,
+    yLabel: axisYLabel
+  };
+  const cvDisplay = isCvLayout ? {
+    mode: cyclicvoltaSt?.useCurrentDensity ? 'density' : 'current',
+    yScaleFactor: computeCvYScaleFactor(feature, cyclicvoltaSt)
+  } : null;
+  const cyclicvoltaPayload = {
+    ...cyclicvoltaSt,
+    axisDisplay,
+    cvDisplay
+  };
   if (!operation) return null;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
@@ -85,7 +252,7 @@ const BtnSubmit = ({
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
       className: (0, _classnames.default)('btn-sv-bar-submit'),
       color: "primary",
-      onClick: onClickCb(operation.value, peaksEdit, isAscend, isIntensity, scan, thres, layoutSt, shiftSt, forecastSt.predictions, decimalSt, integrationSt, multiplicitySt, allIntegrationSt, aucValues, waveLengthSt, cyclicvoltaSt, curveSt, axesUnitsSt, detectorSt, dscMetaData),
+      onClick: onClickCb(operation.value, isAscend, isIntensity, layoutSt, shiftSt, forecastSt.predictions, decimalSt, integrationSt, multiplicitySt, waveLengthSt, cyclicvoltaPayload, curveSt, axesUnitsSt, detectorSt, dscMetaData, curveList, editPeakSt, thresList, scanSt, feature),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_PlayCircleOutline.default, {
         className: classes.icon
       })
@@ -96,7 +263,7 @@ const mapStateToProps = (state, props) => (
 // eslint-disable-line
 {
   editPeakSt: state.editPeak.present,
-  thresSt: state.threshold.list[state.curve.curveIdx],
+  thresList: state.threshold.list,
   layoutSt: state.layout,
   shiftSt: state.shift,
   scanSt: state.scan,
@@ -104,10 +271,10 @@ const mapStateToProps = (state, props) => (
   decimalSt: state.submit.decimal,
   integrationSt: state.integration.present,
   multiplicitySt: state.multiplicity.present,
-  allIntegrationSt: state.integration.past.concat(state.integration.present),
   waveLengthSt: state.wavelength,
   cyclicvoltaSt: state.cyclicvolta,
   curveSt: state.curve,
+  curveList: state.curve.listCurves,
   axesUnitsSt: state.axesUnits,
   detectorSt: state.detector,
   metaSt: state.meta
@@ -120,7 +287,7 @@ BtnSubmit.propTypes = {
   isIntensity: _propTypes.default.bool.isRequired,
   operation: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.bool]).isRequired,
   editPeakSt: _propTypes.default.object.isRequired,
-  thresSt: _propTypes.default.object.isRequired,
+  thresList: _propTypes.default.array.isRequired,
   layoutSt: _propTypes.default.string.isRequired,
   shiftSt: _propTypes.default.object.isRequired,
   scanSt: _propTypes.default.object.isRequired,
@@ -128,10 +295,10 @@ BtnSubmit.propTypes = {
   decimalSt: _propTypes.default.number.isRequired,
   integrationSt: _propTypes.default.object.isRequired,
   multiplicitySt: _propTypes.default.object.isRequired,
-  allIntegrationSt: _propTypes.default.object.isRequired,
   waveLengthSt: _propTypes.default.object.isRequired,
   cyclicvoltaSt: _propTypes.default.object.isRequired,
   curveSt: _propTypes.default.object,
+  curveList: _propTypes.default.array.isRequired,
   axesUnitsSt: _propTypes.default.object.isRequired,
   detectorSt: _propTypes.default.object.isRequired,
   metaSt: _propTypes.default.object.isRequired