@complat/react-spectra-editor 0.10.13-beta.3 → 0.10.13

package/dist/actions/integration.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.loadObservedIntegration = exports.clearIntegrationAll = exports.setIntegrationFkr = exports.sweepIntegration = undefined;
+exports.clearIntegrationAll = exports.setIntegrationFkr = exports.sweepIntegration = undefined;
 
 var _action_type = require('../constants/action_type');
 
@@ -28,14 +28,6 @@ var clearIntegrationAll = function clearIntegrationAll(payload) {
   };
 };
 
-var loadObservedIntegration = function loadObservedIntegration(payload) {
-  return {
-    type: _action_type.INTEGRATION.LOAD_OBSERVED_INTEGRALS,
-    payload: payload
-  };
-};
-
 exports.sweepIntegration = sweepIntegration;
 exports.setIntegrationFkr = setIntegrationFkr;
-exports.clearIntegrationAll = clearIntegrationAll;
-exports.loadObservedIntegration = loadObservedIntegration; // eslint-disable-line
+exports.clearIntegrationAll = clearIntegrationAll; // eslint-disable-line

package/dist/actions/manager.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resetInitMs = exports.resetInitNmr = exports.resetInitCommon = exports.resetAll = undefined;
+exports.resetInitCommonWithIntergation = exports.resetInitMs = exports.resetInitNmr = exports.resetInitCommon = exports.resetAll = undefined;
 
 var _action_type = require('../constants/action_type');
 
@@ -35,7 +35,15 @@ var resetInitMs = function resetInitMs(payload) {
   };
 };
 
+var resetInitCommonWithIntergation = function resetInitCommonWithIntergation(payload) {
+  return {
+    type: _action_type.MANAGER.RESET_INIT_COMMON_WITH_INTERGATION,
+    payload: payload
+  };
+};
+
 exports.resetAll = resetAll;
 exports.resetInitCommon = resetInitCommon;
 exports.resetInitNmr = resetInitNmr;
-exports.resetInitMs = resetInitMs; // eslint-disable-line
+exports.resetInitMs = resetInitMs;
+exports.resetInitCommonWithIntergation = resetInitCommonWithIntergation; // eslint-disable-line

package/dist/actions/wavelength.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.updateWaveLength = undefined;
+
+var _action_type = require("../constants/action_type");
+
+var updateWaveLength = function updateWaveLength(payload) {
+  return {
+    type: _action_type.XRD.UPDATE_WAVE_LENGTH,
+    payload: payload
+  };
+};
+
+exports.updateWaveLength = updateWaveLength; // eslint-disable-line

package/dist/components/cmd_bar/04_integration.js

@@ -52,6 +52,10 @@ var _tri_btn2 = _interopRequireDefault(_tri_btn);
 
 var _common = require('./common');
 
+var _format = require('../../helpers/format');
+
+var _format2 = _interopRequireDefault(_format);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var styles = function styles() {
@@ -107,6 +111,7 @@ var iconColor = function iconColor(criteria) {
 var Integration = function Integration(_ref) {
   var classes = _ref.classes,
       refFactorSt = _ref.refFactorSt,
+      ignoreRef = _ref.ignoreRef,
       isDisableSt = _ref.isDisableSt,
       isFocusAddIntgSt = _ref.isFocusAddIntgSt,
       isFocusRmIntgSt = _ref.isFocusRmIntgSt,
@@ -216,7 +221,7 @@ var Integration = function Integration(_ref) {
         )
       )
     ),
-    setFactor(classes, isDisableSt, refFactorSt, setIntegrationFkrAct),
+    !ignoreRef ? setFactor(classes, isDisableSt, refFactorSt, setIntegrationFkrAct) : null,
     _react2.default.createElement(
       _tri_btn2.default,
       {
@@ -245,7 +250,8 @@ var mapStateToProps = function mapStateToProps(state, props) {
       isFocusAddIntgSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_ADD,
       isFocusRmIntgSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_RM,
       isFocusSetRefSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_SET_REF,
-      refFactorSt: state.integration.present.refFactor
+      refFactorSt: state.integration.present.refFactor,
+      ignoreRef: _format2.default.isHplcUvVisLayout(state.layout)
     }
   );
 };
@@ -265,6 +271,7 @@ Integration.propTypes = {
   isFocusRmIntgSt: _propTypes2.default.bool.isRequired,
   isFocusSetRefSt: _propTypes2.default.bool.isRequired,
   refFactorSt: _propTypes2.default.number.isRequired,
+  ignoreRef: _propTypes2.default.bool.isRequired,
   setUiSweepTypeAct: _propTypes2.default.func.isRequired,
   setIntegrationFkrAct: _propTypes2.default.func.isRequired,
   clearIntegrationAllAct: _propTypes2.default.func.isRequired

package/dist/components/cmd_bar/05_multiplicity.js

@@ -176,7 +176,7 @@ var Multiplicity = function Multiplicity(_ref) {
         )
       )
     ),
-    _react2.default.createElement(
+    disableAddMpySt ? null : _react2.default.createElement(
       _tri_btn2.default,
       {
         content: { tp: 'Clear All Multiplicity' },

package/dist/components/cmd_bar/index.js

@@ -56,6 +56,10 @@ var _r04_submit = require('./r04_submit');
 
 var _r04_submit2 = _interopRequireDefault(_r04_submit);
 
+var _r07_wavelength_btn = require('./r07_wavelength_btn');
+
+var _r07_wavelength_btn2 = _interopRequireDefault(_r07_wavelength_btn);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var styles = function styles() {
@@ -87,7 +91,8 @@ var CmdBar = function CmdBar(_ref) {
       disabled: false
     }),
     _react2.default.createElement(_r03_threshold2.default, { feature: feature, hasEdit: hasEdit }),
-    _react2.default.createElement(_r01_layout2.default, { feature: feature, hasEdit: hasEdit })
+    _react2.default.createElement(_r01_layout2.default, { feature: feature, hasEdit: hasEdit }),
+    _react2.default.createElement(_r07_wavelength_btn2.default, null)
   );
 };
 

package/dist/components/cmd_bar/r01_layout.js

@@ -181,6 +181,15 @@ var layoutSelect = function layoutSelect(classes, layoutSt, updateLayoutAct) {
           'UV/VIS'
         )
       ),
+      _react2.default.createElement(
+        _MenuItem2.default,
+        { value: _list_layout.LIST_LAYOUT.HPLC_UVVIS },
+        _react2.default.createElement(
+          'span',
+          { className: (0, _classnames2.default)(classes.txtOpt, 'option-sv-bar-layout') },
+          'HPLC UV/VIS'
+        )
+      ),
       _react2.default.createElement(
         _MenuItem2.default,
         { value: _list_layout.LIST_LAYOUT.TGA },

package/dist/components/cmd_bar/r05_submit_btn.js

@@ -42,7 +42,7 @@ var styles = function styles() {
   return Object.assign({}, _common.commonStyle);
 };
 
-var onClickCb = function onClickCb(operation, peaksEdit, isAscend, isIntensity, scan, thres, layoutSt, shiftSt, analysis, decimalSt, integrationSt, multiplicitySt, aucValues) {
+var onClickCb = function onClickCb(operation, peaksEdit, isAscend, isIntensity, scan, thres, layoutSt, shiftSt, analysis, decimalSt, integrationSt, multiplicitySt, allIntegrationSt, aucValues, waveLengthSt) {
   return function () {
     operation({
       peaks: peaksEdit,
@@ -56,7 +56,9 @@ var onClickCb = function onClickCb(operation, peaksEdit, isAscend, isIntensity,
       decimal: decimalSt,
       integration: integrationSt,
       multiplicity: multiplicitySt,
-      aucValues: aucValues
+      allIntegration: allIntegrationSt,
+      aucValues: aucValues,
+      waveLength: waveLengthSt
     });
   };
 };
@@ -76,7 +78,8 @@ var BtnSubmit = function BtnSubmit(_ref) {
       decimalSt = _ref.decimalSt,
       integrationSt = _ref.integrationSt,
       multiplicitySt = _ref.multiplicitySt,
-      allIntegrationSt = _ref.allIntegrationSt;
+      allIntegrationSt = _ref.allIntegrationSt,
+      waveLengthSt = _ref.waveLengthSt;
 
   var peaksEdit = (0, _extractPeaksEdit.extractPeaksEdit)(feature, editPeakSt, thresSt, shiftSt, layoutSt);
   // const disBtn = peaksEdit.length === 0 || statusSt.btnSubmit || disabled;
@@ -98,7 +101,7 @@ var BtnSubmit = function BtnSubmit(_ref) {
       {
         className: (0, _classnames2.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)
+        onClick: onClickCb(operation.value, peaksEdit, isAscend, isIntensity, scan, thres, layoutSt, shiftSt, forecastSt.predictions, decimalSt, integrationSt, multiplicitySt, allIntegrationSt, aucValues, waveLengthSt)
       },
       _react2.default.createElement(_PlayCircleOutline2.default, { className: classes.icon })
     )
@@ -117,7 +120,8 @@ var mapStateToProps = function mapStateToProps(state, props) {
       decimalSt: state.submit.decimal,
       integrationSt: state.integration.present,
       multiplicitySt: state.multiplicity.present,
-      allIntegrationSt: state.integration.past.concat(state.integration.present)
+      allIntegrationSt: state.integration.past.concat(state.integration.present),
+      waveLengthSt: state.wavelength
     }
   );
 };
@@ -141,7 +145,8 @@ BtnSubmit.propTypes = {
   decimalSt: _propTypes2.default.number.isRequired,
   integrationSt: _propTypes2.default.object.isRequired,
   multiplicitySt: _propTypes2.default.object.isRequired,
-  allIntegrationSt: _propTypes2.default.object.isRequired
+  allIntegrationSt: _propTypes2.default.object.isRequired,
+  waveLengthSt: _propTypes2.default.object.isRequired
 };
 
 exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(BtnSubmit);

package/dist/components/cmd_bar/r07_wavelength_btn.js

@@ -0,0 +1,135 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+var _reactRedux = require('react-redux');
+
+var _classnames = require('classnames');
+
+var _classnames2 = _interopRequireDefault(_classnames);
+
+var _redux = require('redux');
+
+var _core = require('@material-ui/core');
+
+var _styles = require('@material-ui/core/styles');
+
+var _wavelength = require('../../actions/wavelength');
+
+var _format = require('../../helpers/format');
+
+var _format2 = _interopRequireDefault(_format);
+
+var _common = require('./common');
+
+var _list_wavelength = require('../../constants/list_wavelength');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var styles = function styles() {
+  return Object.assign({
+    fieldShift: {
+      width: 160
+    },
+    fieldLayout: {
+      width: 100
+    }
+  }, _common.commonStyle);
+};
+
+var wavelengthSelect = function wavelengthSelect(classes, waveLengthSt, layoutSt, updateWaveLengthAct) {
+
+  if (!_format2.default.isXRDLayout(layoutSt)) {
+    return _react2.default.createElement('i', null);
+  }
+
+  var onChange = function onChange(e) {
+    return updateWaveLengthAct(e.target.value);
+  };
+
+  return _react2.default.createElement(
+    _core.FormControl,
+    {
+      className: (0, _classnames2.default)(classes.fieldLayout),
+      variant: 'outlined'
+    },
+    _react2.default.createElement(
+      _core.InputLabel,
+      { className: (0, _classnames2.default)(classes.selectLabel, 'select-sv-bar-label') },
+      'Wavelength'
+    ),
+    _react2.default.createElement(
+      _core.Select,
+      {
+        value: waveLengthSt,
+        onChange: onChange,
+        input: _react2.default.createElement(_core.OutlinedInput, {
+          className: (0, _classnames2.default)(classes.selectInput, 'input-sv-bar-layout'),
+          labelWidth: 60
+        })
+      },
+      _list_wavelength.LIST_WAVE_LENGTH.map(function (item) {
+        return _react2.default.createElement(
+          _core.MenuItem,
+          { value: item },
+          _react2.default.createElement(
+            'span',
+            { className: (0, _classnames2.default)(classes.txtOpt, 'option-sv-bar-layout') },
+            item.label,
+            ' (',
+            item.value,
+            ' ',
+            item.unit,
+            ')'
+          )
+        );
+      })
+    )
+  );
+};
+
+var Wavelength = function Wavelength(_ref) {
+  var classes = _ref.classes,
+      waveLengthSt = _ref.waveLengthSt,
+      layoutSt = _ref.layoutSt,
+      updateWaveLengthAct = _ref.updateWaveLengthAct;
+  return _react2.default.createElement(
+    'span',
+    { className: classes.groupRight },
+    wavelengthSelect(classes, waveLengthSt, layoutSt, updateWaveLengthAct)
+  );
+};
+
+var mapStateToProps = function mapStateToProps(state, props) {
+  return (// eslint-disable-line
+    {
+      waveLengthSt: state.wavelength,
+      layoutSt: state.layout
+    }
+  );
+};
+
+var mapDispatchToProps = function mapDispatchToProps(dispatch) {
+  return (0, _redux.bindActionCreators)({
+    updateWaveLengthAct: _wavelength.updateWaveLength
+  }, dispatch);
+};
+
+Wavelength.propTypes = {
+  classes: _propTypes2.default.object.isRequired,
+  layoutSt: _propTypes2.default.string.isRequired,
+  waveLengthSt: _propTypes2.default.object.isRequired,
+  updateWaveLengthAct: _propTypes2.default.func.isRequired
+};
+
+exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Wavelength));

package/dist/components/cmd_bar/tri_btn.js

@@ -109,7 +109,7 @@ var TriBtn = function (_React$Component) {
             _common.MuButton,
             {
               className: (0, _classnames2.default)('btn-sv-bar-one'),
-              disabled: _cfg2.default.btnCmdMpy(layoutSt),
+              disabled: _cfg2.default.btnCmdMpy(layoutSt) && _cfg2.default.btnCmdIntg(layoutSt),
               onClick: this.onToggle
             },
             children
@@ -134,7 +134,7 @@ var TriBtn = function (_React$Component) {
 
       return _react2.default.createElement(
         'span',
-        { disabled: _cfg2.default.btnCmdMpy(layoutSt) },
+        { disabled: _cfg2.default.btnCmdMpy(layoutSt) && _cfg2.default.btnCmdIntg(layoutSt) },
         _react2.default.createElement(
           'span',
           { className: (0, _classnames2.default)(classes.txtLabel, 'txt-sv-bar-desc') },

package/dist/components/d3_line/index.js

@@ -86,6 +86,7 @@ var ViewerLine = function (_React$Component) {
           isUiAddIntgSt = _props.isUiAddIntgSt,
           isUiNoBrushSt = _props.isUiNoBrushSt,
           isHidden = _props.isHidden,
+          wavelength = _props.wavelength,
           resetAllAct = _props.resetAllAct;
 
       (0, _draw.drawDestroy)(this.rootKlass);
@@ -108,7 +109,8 @@ var ViewerLine = function (_React$Component) {
         mtplySt: mtplySt,
         sweepExtentSt: sweepExtentSt,
         isUiAddIntgSt: isUiAddIntgSt,
-        isUiNoBrushSt: isUiNoBrushSt
+        isUiNoBrushSt: isUiNoBrushSt,
+        wavelength: wavelength
       });
       (0, _draw.drawLabel)(this.rootKlass, cLabel, xLabel, yLabel);
       (0, _draw.drawDisplay)(this.rootKlass, isHidden);
@@ -119,6 +121,9 @@ var ViewerLine = function (_React$Component) {
       var _props2 = this.props,
           seed = _props2.seed,
           peak = _props2.peak,
+          cLabel = _props2.cLabel,
+          xLabel = _props2.xLabel,
+          yLabel = _props2.yLabel,
           freq = _props2.freq,
           comparisons = _props2.comparisons,
           tTrEndPts = _props2.tTrEndPts,
@@ -130,7 +135,8 @@ var ViewerLine = function (_React$Component) {
           sweepExtentSt = _props2.sweepExtentSt,
           isUiAddIntgSt = _props2.isUiAddIntgSt,
           isUiNoBrushSt = _props2.isUiNoBrushSt,
-          isHidden = _props2.isHidden;
+          isHidden = _props2.isHidden,
+          wavelength = _props2.wavelength;
 
       this.normChange(prevProps);
 
@@ -150,8 +156,10 @@ var ViewerLine = function (_React$Component) {
         mtplySt: mtplySt,
         sweepExtentSt: sweepExtentSt,
         isUiAddIntgSt: isUiAddIntgSt,
-        isUiNoBrushSt: isUiNoBrushSt
+        isUiNoBrushSt: isUiNoBrushSt,
+        wavelength: wavelength
       });
+      (0, _draw.drawLabel)(this.rootKlass, cLabel, xLabel, yLabel);
       (0, _draw.drawDisplay)(this.rootKlass, isHidden);
     }
   }, {
@@ -195,7 +203,8 @@ var mapStateToProps = function mapStateToProps(state, props) {
     mtplySt: state.multiplicity.present,
     sweepExtentSt: state.ui.sweepExtent,
     isUiAddIntgSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_ADD,
-    isUiNoBrushSt: _list_ui.LIST_NON_BRUSH_TYPES.indexOf(state.ui.sweepType) < 0
+    isUiNoBrushSt: _list_ui.LIST_NON_BRUSH_TYPES.indexOf(state.ui.sweepType) < 0,
+    wavelength: state.wavelength
   };
 };
 
@@ -230,7 +239,8 @@ ViewerLine.propTypes = {
   clickUiTargetAct: _propTypes2.default.func.isRequired,
   selectUiSweepAct: _propTypes2.default.func.isRequired,
   scrollUiWheelAct: _propTypes2.default.func.isRequired,
-  isHidden: _propTypes2.default.bool.isRequired
+  isHidden: _propTypes2.default.bool.isRequired,
+  wavelength: _propTypes2.default.object.isRequired
 };
 
 exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerLine);