fix after merge

Author: Adrian Herrmann

dist/actions/curve.js

@@ -10,9 +10,12 @@ const selectCurve = payload => ({
   payload
 });
 exports.selectCurve = selectCurve;
-const setAllCurves = payload => ({
+const setAllCurves = (payload, meta) => ({
   type: _action_type.CURVE.SET_ALL_CURVES,
-  payload
+  payload,
+  ...(meta && typeof meta === 'object' ? {
+    meta
+  } : {})
 });
 exports.setAllCurves = setAllCurves;
 const toggleShowAllCurves = payload => ({

dist/actions/integration.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sweepIntegration = exports.setIntegrationFkr = exports.clearIntegrationAll = void 0;
+exports.sweepIntegration = exports.splitIntegration = exports.setIntegrationFkr = exports.removeVisualSplitLine = exports.clearIntegrationAll = exports.addVisualSplitLine = void 0;
 var _action_type = require("../constants/action_type");
 const sweepIntegration = payload => ({
   type: _action_type.INTEGRATION.SWEEP,
@@ -19,6 +19,21 @@ const clearIntegrationAll = payload => ({
   type: _action_type.INTEGRATION.CLEAR_ALL,
   payload
 });
+exports.clearIntegrationAll = clearIntegrationAll;
+const splitIntegration = payload => ({
+  type: _action_type.INTEGRATION.SPLIT,
+  payload
+});
+exports.splitIntegration = splitIntegration;
+const addVisualSplitLine = payload => ({
+  type: _action_type.INTEGRATION.ADD_VISUAL_SPLIT,
+  payload
+});
+exports.addVisualSplitLine = addVisualSplitLine;
+const removeVisualSplitLine = payload => ({
+  type: _action_type.INTEGRATION.RM_VISUAL_SPLIT,
+  payload
+});
 
 // eslint-disable-line
-exports.clearIntegrationAll = clearIntegrationAll;
+exports.removeVisualSplitLine = removeVisualSplitLine;

dist/actions/ui.js

@@ -3,18 +3,37 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setUiViewerType = exports.setUiSweepType = exports.selectUiSweep = exports.scrollUiWheel = exports.restoreSweepExtent = exports.clickUiTarget = void 0;
+exports.setUiViewerType = exports.setUiSweepType = exports.selectUiSweep = exports.scrollUiWheel = exports.restoreSweepExtent = exports.displaySubViewerAt = exports.clickUiTarget = void 0;
 var _action_type = require("../constants/action_type");
-const setUiViewerType = payload => ({
-  type: _action_type.UI.VIEWER.SET_TYPE,
-  payload
-});
-exports.setUiViewerType = setUiViewerType;
-const setUiSweepType = (payload, jcampIdx = 0) => ({
+var _list_ui = require("../constants/list_ui");
+var _integration_draft = require("../helpers/integration_draft.js");
+// eslint-disable-line import/extensions
+
+const keepIntegrationMode = (jcampIdx = 0) => ({
   type: _action_type.UI.SWEEP.SET_TYPE,
-  payload,
+  payload: _list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_ADD,
   jcampIdx
 });
+const setUiViewerType = payload => {
+  if (!(0, _integration_draft.confirmCancelPendingIntegration)()) {
+    return keepIntegrationMode();
+  }
+  return {
+    type: _action_type.UI.VIEWER.SET_TYPE,
+    payload
+  };
+};
+exports.setUiViewerType = setUiViewerType;
+const setUiSweepType = (payload, jcampIdx = 0) => {
+  if (payload !== _list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_ADD && !(0, _integration_draft.confirmCancelPendingIntegration)()) {
+    return keepIntegrationMode(jcampIdx);
+  }
+  return {
+    type: _action_type.UI.SWEEP.SET_TYPE,
+    payload,
+    jcampIdx
+  };
+};
 exports.setUiSweepType = setUiSweepType;
 const selectUiSweep = payload => ({
   type: _action_type.UI.SWEEP.SELECT,
@@ -31,17 +50,26 @@ const restoreSweepExtent = payload => ({
   payload
 });
 exports.restoreSweepExtent = restoreSweepExtent;
-const clickUiTarget = (payload, onPeak, voltammetryPeakIdx, jcampIdx, onPecker) => {
+const clickUiTarget = (payload, onPeak, voltammetryPeakIdx, jcampIdx, onPecker, sourceHint) => {
   const action = {
     type: _action_type.UI.CLICK_TARGET,
     payload,
     onPeak,
     voltammetryPeakIdx: voltammetryPeakIdx ?? 0,
-    onPecker: onPecker ?? false
+    onPecker: onPecker ?? false,
+    sourceHint: sourceHint ?? null
   };
   if (Number.isFinite(jcampIdx)) {
     action.jcampIdx = jcampIdx;
   }
   return action;
 };
-exports.clickUiTarget = clickUiTarget;
+exports.clickUiTarget = clickUiTarget;
+const displaySubViewerAt = payload => ({
+  type: _action_type.UI.SUB_VIEWER.DISPLAY_VIEWER_AT,
+  payload: payload == null ? {
+    x: null,
+    y: null
+  } : payload
+});
+exports.displaySubViewerAt = displaySubViewerAt;

dist/app.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "FN", {
     return _fn.default;
   }
 });
-exports.SpectraEditor = void 0;
+exports.store = exports.SpectraEditor = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactRedux = require("react-redux");
 var _redux = require("redux");
@@ -33,8 +33,13 @@ var _jsxRuntime = require("react/jsx-runtime");
 const sagaMiddleware = (0, _reduxSaga.default)();
 const middlewares = [sagaMiddleware]; // logger
 
-const store = (0, _redux.compose)((0, _redux.applyMiddleware)(...middlewares))(_redux.createStore)(_index.default);
-sagaMiddleware.run(_index2.default);
+const store = exports.store = (0, _redux.compose)((0, _redux.applyMiddleware)(...middlewares))(_redux.createStore)(_index.default);
+try {
+  sagaMiddleware.run(_index2.default);
+} catch (error) {
+  // Keep startup failure visible without crashing silently.
+  console.error('[SpectraEditor] Failed to start sagas', error); // eslint-disable-line no-console
+}
 
 // - - - helper - - -
 const ensureQuillDelta = descs => {
@@ -45,6 +50,10 @@ const ensureQuillDelta = descs => {
 };
 
 // - - - React - - -
+// LC/MS: when `onLcmsPageRequest` is set, the host (e.g. ELN) must reload `multiEntities`
+// with MS data for the requested RT/polarity. Triggers include `user_click`, `initial`,
+// and `tic_polarity` (TIC polarity dropdown). The standalone demo in `src/index.js`
+// implements a local mock via `buildLcmsStandaloneMultiEntities`.
 const SpectraEditor = ({
   entity,
   others,
@@ -64,7 +73,8 @@ const SpectraEditor = ({
   entityFileNames,
   userManualLink,
   curveIdx,
-  sweepExtent
+  sweepExtent,
+  onLcmsPageRequest
 }) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRedux.Provider, {
   store: store,
   children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.StyledEngineProvider, {
@@ -88,7 +98,8 @@ const SpectraEditor = ({
       editorOnly: editorOnly,
       exactMass: exactMass,
       canChangeDescription: canChangeDescription,
-      onDescriptionChanged: onDescriptionChanged
+      onDescriptionChanged: onDescriptionChanged,
+      onLcmsPageRequest: onLcmsPageRequest
     })
   })
 });
@@ -111,6 +122,7 @@ SpectraEditor.propTypes = {
   editorOnly: _propTypes.default.bool,
   canChangeDescription: _propTypes.default.bool,
   onDescriptionChanged: _propTypes.default.func,
+  onLcmsPageRequest: _propTypes.default.func,
   userManualLink: _propTypes.default.object,
   exactMass: _propTypes.default.string
 };
@@ -119,8 +131,8 @@ SpectraEditor.defaultProps = {
     others: [],
     addOthersCb: false
   },
-  multiEntities: false,
-  entityFileNames: false,
+  multiEntities: [],
+  entityFileNames: [],
   cLabel: '',
   xLabel: '',
   yLabel: '',
@@ -132,5 +144,6 @@ SpectraEditor.defaultProps = {
   multiMolSvgs: [],
   editorOnly: false,
   canChangeDescription: false,
-  userManualLink: {}
+  userManualLink: {},
+  onLcmsPageRequest: null
 };

dist/components/cmd_bar/01_viewer.js

@@ -40,11 +40,13 @@ const Viewer = ({
         className: "txt-sv-tp",
         children: "Spectrum Viewer"
       }),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
-        className: (0, _classnames.default)((0, _common.focusStyle)(isfocusSpectrumSt, classes), 'btn-sv-bar-spctrum'),
-        onClick: onViewSpectrum,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TimelineOutlined.default, {
-          className: classes.icon
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+          className: (0, _classnames.default)((0, _common.focusStyle)(isfocusSpectrumSt, classes), 'btn-sv-bar-spctrum'),
+          onClick: onViewSpectrum,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TimelineOutlined.default, {
+            className: classes.icon
+          })
         })
       })
     }), hideCmdAnaViewerSt || disableCmdAnaViewerSt ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {

dist/components/cmd_bar/03_peak.js

@@ -20,6 +20,8 @@ var _list_ui = require("../../constants/list_ui");
 var _tri_btn = _interopRequireDefault(require("./tri_btn"));
 var _edit_peak = require("../../actions/edit_peak");
 var _extractPeaksEdit = require("../../helpers/extractPeaksEdit");
+var _hplc_ms = require("../../actions/hplc_ms");
+var _list_layout = require("../../constants/list_layout");
 var _jsxRuntime = require("react/jsx-runtime");
 /* eslint-disable prefer-object-spread, function-paren-newline, no-unused-vars,
 react/function-component-definition, react/require-default-props, max-len,
@@ -36,27 +38,32 @@ const Peak = ({
   isFocusSetRefSt,
   disableSetRefSt,
   isHandleMaxAndMinPeaksSt,
-  cyclicVotaSt,
+  cyclicVoltaState,
   curveSt,
   clearAllPeaksAct,
   feature,
   editPeakSt,
   thresSt,
   shiftSt,
-  layoutSt
+  layoutSt,
+  clearAllPeaksHplcMsAct
 }) => {
   let onSweepPeakAdd = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.PEAK_ADD);
-  let onSweepPeakDELETE = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.PEAK_DELETE);
+  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 (layoutSt === _list_layout.LIST_LAYOUT.LC_MS) {
+      clearAllPeaksHplcMsAct();
+    } else {
+      const dataPeaks = (0, _extractPeaksEdit.extractAutoPeaks)(feature, thresSt, shiftSt, layoutSt);
+      clearAllPeaksAct({
+        curveIdx,
+        dataPeaks
+      });
+    }
   };
   const showAddPeak = !disableAddPeakSt;
   const showRmPeak = !disableRmPeakSt;
@@ -68,18 +75,18 @@ const Peak = ({
   if (isHandleMaxAndMinPeaksSt) {
     const {
       spectraList
-    } = cyclicVotaSt;
+    } = cyclicVoltaState;
     const spectra = spectraList[curveIdx];
     if (spectra) {
       const {
         isWorkMaxPeak
       } = spectra;
       if (isWorkMaxPeak) {
         onSweepPeakAdd = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MAX_PEAK, curveIdx);
-        onSweepPeakDELETE = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MAX_PEAK, curveIdx);
+        onSweepPeakDelete = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MAX_PEAK, curveIdx);
       } else {
         onSweepPeakAdd = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MIN_PEAK, curveIdx);
-        onSweepPeakDELETE = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MIN_PEAK, curveIdx);
+        onSweepPeakDelete = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MIN_PEAK, curveIdx);
       }
       onSweepAnchorShift = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_SET_REF, curveIdx);
     }
@@ -157,7 +164,7 @@ const mapStateToProps = (state, props) => (
   isFocusSetRefSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT || state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_SET_REF,
   disableSetRefSt: _cfg.default.btnCmdSetRef(state.layout),
   isHandleMaxAndMinPeaksSt: !_cfg.default.hidePanelCyclicVolta(state.layout),
-  cyclicVotaSt: state.cyclicvolta,
+  cyclicVoltaState: state.cyclicvolta,
   curveSt: state.curve,
   editPeakSt: state.editPeak.present,
   thresSt: state.threshold.list[state.curve.curveIdx],
@@ -166,7 +173,8 @@ const mapStateToProps = (state, props) => (
 });
 const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
   setUiSweepTypeAct: _ui.setUiSweepType,
-  clearAllPeaksAct: _edit_peak.clearAllPeaks
+  clearAllPeaksAct: _edit_peak.clearAllPeaks,
+  clearAllPeaksHplcMsAct: _hplc_ms.clearAllPeaksHplcMs
 }, dispatch);
 Peak.propTypes = {
   classes: _propTypes.default.object.isRequired,
@@ -178,13 +186,14 @@ Peak.propTypes = {
   disableSetRefSt: _propTypes.default.bool.isRequired,
   setUiSweepTypeAct: _propTypes.default.func.isRequired,
   isHandleMaxAndMinPeaksSt: _propTypes.default.bool.isRequired,
-  cyclicVotaSt: _propTypes.default.object.isRequired,
+  cyclicVoltaState: _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
+  shiftSt: _propTypes.default.object.isRequired,
+  clearAllPeaksHplcMsAct: _propTypes.default.func.isRequired
 };
 var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Peak);