From 766742cb0291d95828454ae7e5f94780b43c54db Mon Sep 17 00:00:00 2001 From: Lan Le Date: Mon, 25 Sep 2023 15:02:38 +0200 Subject: [PATCH 1/2] feat: update UI to material v5 (#157) --- .github/workflows/testing.yml | 2 +- dist/components/cmd_bar/01_viewer.js | 14 +- dist/components/cmd_bar/02_zoom.js | 14 +- dist/components/cmd_bar/03_peak.js | 9 +- dist/components/cmd_bar/04_integration.js | 9 +- dist/components/cmd_bar/05_multiplicity.js | 7 +- dist/components/cmd_bar/06_undo_redo.js | 11 +- dist/components/cmd_bar/07_pecker.js | 7 +- dist/components/cmd_bar/common.js | 13 +- dist/components/cmd_bar/index.js | 5 +- dist/components/cmd_bar/r01_layout.js | 86 +- dist/components/cmd_bar/r02_scan.js | 38 +- dist/components/cmd_bar/r03_threshold.js | 28 +- dist/components/cmd_bar/r04_submit.js | 103 +- dist/components/cmd_bar/r05_submit_btn.js | 9 +- dist/components/cmd_bar/r06_predict_btn.js | 18 +- dist/components/cmd_bar/r07_wavelength_btn.js | 23 +- dist/components/cmd_bar/tri_btn.js | 7 +- dist/components/common/chem.js | 3 +- dist/components/d3_line/index.js | 3 +- dist/components/d3_line/line_focus.js | 3 +- dist/components/d3_multi/index.js | 3 +- dist/components/d3_multi/multi_focus.js | 3 +- dist/components/d3_rect/index.js | 3 +- dist/components/d3_rect/rect_focus.js | 3 +- dist/components/forecast/comps.js | 35 +- dist/components/forecast/ir_comps.js | 39 +- dist/components/forecast/ir_viewer.js | 24 +- dist/components/forecast/nmr_comps.js | 43 +- dist/components/forecast/nmr_viewer.js | 24 +- dist/components/forecast/section_loading.js | 7 +- dist/components/forecast_viewer.js | 5 +- dist/components/multi_jcamps_viewer.js | 7 +- dist/components/panel/compare.js | 44 +- .../components/panel/cyclic_voltamery_data.js | 60 +- dist/components/panel/graph_selection.js | 29 +- dist/components/panel/index.js | 18 +- dist/components/panel/info.js | 23 +- dist/components/panel/multiplicity.js | 48 +- .../components/panel/multiplicity_coupling.js | 14 +- dist/components/panel/multiplicity_select.js | 12 +- dist/components/panel/peaks.js | 52 +- dist/constants/action_type.js | 56 +- dist/constants/list_layout.js | 5 +- dist/constants/list_shift.js | 18 +- dist/constants/list_ui.js | 9 +- dist/constants/list_wavelength.js | 3 +- dist/fn.js | 3 +- dist/helpers/brush.js | 5 +- dist/helpers/cfg.js | 3 +- dist/helpers/chem.js | 21 +- dist/helpers/format.js | 3 +- dist/helpers/multiplicity.js | 3 +- dist/helpers/zoom.js | 3 +- dist/index.js | 60 +- dist/layer_content.js | 3 +- dist/layer_init.js | 7 +- dist/layer_prism.js | 9 +- dist/reducers/index.js | 3 +- dist/reducers/reducer_curve.js | 3 +- dist/reducers/reducer_edit_peak.js | 3 +- dist/reducers/reducer_forecast.js | 3 +- dist/reducers/reducer_integration.js | 3 +- dist/reducers/reducer_jcamp.js | 3 +- dist/reducers/reducer_layout.js | 3 +- dist/reducers/reducer_manager.js | 3 +- dist/reducers/reducer_meta.js | 3 +- dist/reducers/reducer_multiplicity.js | 3 +- dist/reducers/reducer_scan.js | 3 +- dist/reducers/reducer_shift.js | 3 +- dist/reducers/reducer_simulation.js | 3 +- dist/reducers/reducer_status.js | 3 +- dist/reducers/reducer_submit.js | 3 +- dist/reducers/reducer_threshold.js | 3 +- dist/reducers/reducer_ui.js | 3 +- dist/reducers/reducer_voltammetry.js | 3 +- dist/reducers/reducer_wavelength.js | 3 +- dist/reducers/undo_redo_config.js | 8 +- dist/sagas/saga_edit_peak.js | 5 +- dist/sagas/saga_manager.js | 3 +- dist/sagas/saga_meta.js | 3 +- dist/sagas/saga_multi_entities.js | 3 +- dist/sagas/saga_multiplicity.js | 3 +- dist/sagas/saga_ui.js | 3 +- dist/third_party/jAnalyzer.js | 3 +- package.json | 22 +- .../components/cmd_bar/01_viewer.test.js | 49 + .../units/components/cmd_bar/02_zoom.test.js | 35 + .../units/components/common/draw.test.jsx | 24 + .../units/components/panel/peaks.test.js | 15 +- src/components/cmd_bar/01_viewer.js | 10 +- src/components/cmd_bar/02_zoom.js | 10 +- src/components/cmd_bar/03_peak.js | 6 +- src/components/cmd_bar/04_integration.js | 6 +- src/components/cmd_bar/05_multiplicity.js | 4 +- src/components/cmd_bar/06_undo_redo.js | 8 +- src/components/cmd_bar/07_pecker.js | 4 +- src/components/cmd_bar/common.js | 5 +- src/components/cmd_bar/index.js | 2 +- src/components/cmd_bar/r01_layout.js | 37 +- src/components/cmd_bar/r02_scan.js | 30 +- src/components/cmd_bar/r03_threshold.js | 15 +- src/components/cmd_bar/r04_submit.js | 86 +- src/components/cmd_bar/r05_submit_btn.js | 6 +- src/components/cmd_bar/r06_predict_btn.js | 11 +- src/components/cmd_bar/r07_wavelength_btn.js | 19 +- src/components/cmd_bar/tri_btn.js | 4 +- src/components/forecast/comps.js | 19 +- src/components/forecast/ir_comps.js | 14 +- src/components/forecast/ir_viewer.js | 9 +- src/components/forecast/nmr_comps.js | 14 +- src/components/forecast/nmr_viewer.js | 9 +- src/components/forecast/section_loading.js | 4 +- src/components/forecast_viewer.js | 2 +- src/components/multi_jcamps_viewer.js | 4 +- src/components/panel/compare.js | 24 +- src/components/panel/cyclic_voltamery_data.js | 18 +- src/components/panel/graph_selection.js | 9 +- src/components/panel/index.js | 52 +- src/components/panel/info.js | 12 +- src/components/panel/multiplicity.js | 25 +- src/components/panel/multiplicity_coupling.js | 7 +- src/components/panel/multiplicity_select.js | 7 +- src/components/panel/peaks.js | 20 +- src/index.js | 6 +- src/layer_init.js | 2 +- src/layer_prism.js | 4 +- yarn.lock | 1007 +++++++++-------- 128 files changed, 1450 insertions(+), 1433 deletions(-) create mode 100644 src/__tests__/units/components/cmd_bar/01_viewer.test.js create mode 100644 src/__tests__/units/components/cmd_bar/02_zoom.test.js create mode 100644 src/__tests__/units/components/common/draw.test.jsx diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index d99745fb..546084e6 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -3,7 +3,7 @@ name: Testing on: push jobs: - build: + testing: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/dist/components/cmd_bar/01_viewer.js b/dist/components/cmd_bar/01_viewer.js index 20b543d5..ed017099 100644 --- a/dist/components/cmd_bar/01_viewer.js +++ b/dist/components/cmd_bar/01_viewer.js @@ -10,10 +10,10 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _SpellcheckOutlined = _interopRequireDefault(require("@material-ui/icons/SpellcheckOutlined")); -var _TimelineOutlined = _interopRequireDefault(require("@material-ui/icons/TimelineOutlined")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _SpellcheckOutlined = _interopRequireDefault(require("@mui/icons-material/SpellcheckOutlined")); +var _TimelineOutlined = _interopRequireDefault(require("@mui/icons-material/TimelineOutlined")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); var _ui = require("../../actions/ui"); var _cfg = _interopRequireDefault(require("../../helpers/cfg")); var _common = require("./common"); @@ -33,7 +33,8 @@ const Viewer = _ref => { const onViewSpectrum = () => setUiViewerTypeAct(_list_ui.LIST_UI_VIEWER_TYPE.SPECTRUM); const onViewAnalysis = () => setUiViewerTypeAct(_list_ui.LIST_UI_VIEWER_TYPE.ANALYSIS); return /*#__PURE__*/_react.default.createElement("span", { - className: classes.group + className: classes.group, + "data-testid": "Viewer" }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" @@ -74,5 +75,4 @@ Viewer.propTypes = { disableCmdAnaViewerSt: _propTypes.default.bool.isRequired, setUiViewerTypeAct: _propTypes.default.func.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Viewer); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Viewer); \ No newline at end of file diff --git a/dist/components/cmd_bar/02_zoom.js b/dist/components/cmd_bar/02_zoom.js index b6dbf491..f615d3b3 100644 --- a/dist/components/cmd_bar/02_zoom.js +++ b/dist/components/cmd_bar/02_zoom.js @@ -10,10 +10,10 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _ZoomInOutlined = _interopRequireDefault(require("@material-ui/icons/ZoomInOutlined")); -var _FindReplaceOutlined = _interopRequireDefault(require("@material-ui/icons/FindReplaceOutlined")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _ZoomInOutlined = _interopRequireDefault(require("@mui/icons-material/ZoomInOutlined")); +var _FindReplaceOutlined = _interopRequireDefault(require("@mui/icons-material/FindReplaceOutlined")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); var _ui = require("../../actions/ui"); var _common = require("./common"); var _list_ui = require("../../constants/list_ui"); @@ -29,7 +29,8 @@ const Zoom = _ref => { const onSweepZoomIn = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ZOOMIN); const onSweepZoomReset = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ZOOMRESET); return /*#__PURE__*/_react.default.createElement("span", { - className: classes.group + className: classes.group, + "data-testid": "Zoom" }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" @@ -63,5 +64,4 @@ Zoom.propTypes = { isfocusZoomSt: _propTypes.default.bool.isRequired, setUiSweepTypeAct: _propTypes.default.func.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Zoom); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Zoom); \ No newline at end of file diff --git a/dist/components/cmd_bar/03_peak.js b/dist/components/cmd_bar/03_peak.js index 34b31860..82282e13 100644 --- a/dist/components/cmd_bar/03_peak.js +++ b/dist/components/cmd_bar/03_peak.js @@ -10,9 +10,9 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _AddLocationOutlined = _interopRequireDefault(require("@material-ui/icons/AddLocationOutlined")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); +var _AddLocationOutlined = _interopRequireDefault(require("@mui/icons-material/AddLocationOutlined")); var _ui = require("../../actions/ui"); var _cfg = _interopRequireDefault(require("../../helpers/cfg")); var _common = require("./common"); @@ -124,5 +124,4 @@ Peak.propTypes = { cyclicVotaSt: _propTypes.default.object.isRequired, curveSt: _propTypes.default.object.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Peak); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Peak); \ No newline at end of file diff --git a/dist/components/cmd_bar/04_integration.js b/dist/components/cmd_bar/04_integration.js index 29c709ac..cffbb7cd 100644 --- a/dist/components/cmd_bar/04_integration.js +++ b/dist/components/cmd_bar/04_integration.js @@ -10,9 +10,9 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _TextField = _interopRequireDefault(require("@material-ui/core/TextField")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); +var _TextField = _interopRequireDefault(require("@mui/material/TextField")); var _react2 = _interopRequireDefault(require("@mdi/react")); var _js = require("@mdi/js"); var _integration = require("../../actions/integration"); @@ -185,5 +185,4 @@ Integration.propTypes = { curveSt: _propTypes.default.object.isRequired, integrationSt: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Integration)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Integration)); \ No newline at end of file diff --git a/dist/components/cmd_bar/05_multiplicity.js b/dist/components/cmd_bar/05_multiplicity.js index e83723db..db7d92e7 100644 --- a/dist/components/cmd_bar/05_multiplicity.js +++ b/dist/components/cmd_bar/05_multiplicity.js @@ -10,8 +10,8 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); var _ui = require("../../actions/ui"); var _multiplicity = require("../../actions/multiplicity"); var _list_ui = require("../../constants/list_ui"); @@ -130,5 +130,4 @@ Multiplicity.propTypes = { clearMpyAllAct: _propTypes.default.func.isRequired, curveSt: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Multiplicity)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Multiplicity)); \ No newline at end of file diff --git a/dist/components/cmd_bar/06_undo_redo.js b/dist/components/cmd_bar/06_undo_redo.js index 617e4d59..34bf0720 100644 --- a/dist/components/cmd_bar/06_undo_redo.js +++ b/dist/components/cmd_bar/06_undo_redo.js @@ -11,10 +11,10 @@ var _redux = require("redux"); var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reduxUndo = require("redux-undo"); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _RedoOutlined = _interopRequireDefault(require("@material-ui/icons/RedoOutlined")); -var _UndoOutlined = _interopRequireDefault(require("@material-ui/icons/UndoOutlined")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); +var _RedoOutlined = _interopRequireDefault(require("@mui/icons-material/RedoOutlined")); +var _UndoOutlined = _interopRequireDefault(require("@mui/icons-material/UndoOutlined")); var _common = require("./common"); /* eslint-disable prefer-object-spread, function-paren-newline, react/function-component-definition, react/require-default-props, max-len, @@ -72,5 +72,4 @@ UndoRedo.propTypes = { onUndoAct: _propTypes.default.func.isRequired, onRedoAct: _propTypes.default.func.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(UndoRedo); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(UndoRedo); \ No newline at end of file diff --git a/dist/components/cmd_bar/07_pecker.js b/dist/components/cmd_bar/07_pecker.js index 13539272..b2d3618a 100644 --- a/dist/components/cmd_bar/07_pecker.js +++ b/dist/components/cmd_bar/07_pecker.js @@ -10,8 +10,8 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); var _ui = require("../../actions/ui"); var _common = require("./common"); var _list_ui = require("../../constants/list_ui"); @@ -72,5 +72,4 @@ Pecker.propTypes = { cyclicVotaSt: _propTypes.default.object.isRequired, jcampIdx: _propTypes.default.any }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Pecker); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Pecker); \ No newline at end of file diff --git a/dist/components/cmd_bar/common.js b/dist/components/cmd_bar/common.js index 0ffb1a2f..eef469a3 100644 --- a/dist/components/cmd_bar/common.js +++ b/dist/components/cmd_bar/common.js @@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.focusStyle = exports.commonStyle = exports.MuButton = void 0; -var _styles = require("@material-ui/core/styles"); -var _Button = _interopRequireDefault(require("@material-ui/core/Button")); -const MuButton = (0, _styles.withStyles)({ +var _styles = require("@mui/styles"); +var _Button = _interopRequireDefault(require("@mui/material/Button")); +const MuButton = exports.MuButton = (0, _styles.withStyles)({ root: { border: '1px solid #ccc', borderRadius: 4, @@ -17,11 +17,11 @@ const MuButton = (0, _styles.withStyles)({ lineHeight: '20px', minWidth: 30, padding: 0, - width: 30 + width: 30, + color: 'black' } })(_Button.default); -exports.MuButton = MuButton; -const commonStyle = { +const commonStyle = exports.commonStyle = { card: { margin: '0 0 5px 52px', border: '1px solid white', @@ -96,7 +96,6 @@ const commonStyle = { transform: 'scale(0.75)' } }; -exports.commonStyle = commonStyle; const focusStyle = (criteria, cls) => criteria ? [cls.btnHt] : []; // eslint-disable-line diff --git a/dist/components/cmd_bar/index.js b/dist/components/cmd_bar/index.js index de7c16cf..04c0deb8 100644 --- a/dist/components/cmd_bar/index.js +++ b/dist/components/cmd_bar/index.js @@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react")); var _reactRedux = require("react-redux"); var _redux = require("redux"); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); var _common = require("./common"); var _viewer = _interopRequireDefault(require("./01_viewer")); var _zoom = _interopRequireDefault(require("./02_zoom")); @@ -74,5 +74,4 @@ CmdBar.propTypes = { jcampIdx: _propTypes.default.any, hideThreshold: _propTypes.default.bool }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(CmdBar); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(CmdBar); \ No newline at end of file diff --git a/dist/components/cmd_bar/r01_layout.js b/dist/components/cmd_bar/r01_layout.js index 21e59d38..d403b549 100644 --- a/dist/components/cmd_bar/r01_layout.js +++ b/dist/components/cmd_bar/r01_layout.js @@ -10,12 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Select = _interopRequireDefault(require("@material-ui/core/Select")); -var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem")); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _OutlinedInput = _interopRequireDefault(require("@material-ui/core/OutlinedInput")); -var _InputLabel = _interopRequireDefault(require("@material-ui/core/InputLabel")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); var _r02_scan = _interopRequireDefault(require("./r02_scan")); var _layout = require("../../actions/layout"); var _shift = require("../../actions/shift"); @@ -54,121 +50,120 @@ const shiftSelect = (classes, layoutSt, setShiftRefAct, shiftSt, curveSt) => { setShiftRefAct(payload); }; const listShift = (0, _list_shift.getListShift)(layoutSt); - const content = listShift.map(ref => /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + const content = listShift.map(ref => /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: ref, key: ref.name }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-shift') }, `${ref.name}: ${_format.default.strNumberFixedDecimal(ref.value, 2)} ppm`))); - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldShift), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, { + id: "select-solvent-label", className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label') - }, "Solvent"), /*#__PURE__*/_react.default.createElement(_Select.default, { + }, "Solvent"), /*#__PURE__*/_react.default.createElement(_material.Select, { value: shiftRef, + labelId: "select-solvent-label", + label: "Solvent", onChange: onChange, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-shift'), - labelWidth: 60 - }) + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-shift') }, content)); }; const layoutSelect = (classes, layoutSt, updateLayoutAct) => { const onChange = e => updateLayoutAct(e.target.value); - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { - className: (0, _classnames.default)(classes.fieldLayout), - variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { + className: (0, _classnames.default)(classes.fieldLayout) + }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, { + id: "select-layout-label", className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label') - }, "Layout"), /*#__PURE__*/_react.default.createElement(_Select.default, { + }, "Layout"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-layout-label", + label: "Layout", value: layoutSt, onChange: onChange, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout'), - labelWidth: 60 - }) - }, /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout') + }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.PLAIN }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "plain")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "plain")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.IR }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "IR")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "IR")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.RAMAN }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "RAMAN")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "RAMAN")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.UVVIS }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "UV/VIS")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "UV/VIS")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.HPLC_UVVIS }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "HPLC UV/VIS")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "HPLC UV/VIS")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.TGA }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "TGA (THERMOGRAVIMETRIC ANALYSIS)")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "TGA (THERMOGRAVIMETRIC ANALYSIS)")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.XRD }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "XRD (X-RAY DIFFRACTION)")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "XRD (X-RAY DIFFRACTION)")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.H1 }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, /*#__PURE__*/_react.default.createElement("sup", null, "1"), "H")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, /*#__PURE__*/_react.default.createElement("sup", null, "1"), "H")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.C13 }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, /*#__PURE__*/_react.default.createElement("sup", null, "13"), "C")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, /*#__PURE__*/_react.default.createElement("sup", null, "13"), "C")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.F19 }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, /*#__PURE__*/_react.default.createElement("sup", null, "19"), "F")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, /*#__PURE__*/_react.default.createElement("sup", null, "19"), "F")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.P31 }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, /*#__PURE__*/_react.default.createElement("sup", null, "31"), "P")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, /*#__PURE__*/_react.default.createElement("sup", null, "31"), "P")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.N15 }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, /*#__PURE__*/_react.default.createElement("sup", null, "15"), "N")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, /*#__PURE__*/_react.default.createElement("sup", null, "15"), "N")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.Si29 }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, /*#__PURE__*/_react.default.createElement("sup", null, "29"), "Si")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, /*#__PURE__*/_react.default.createElement("sup", null, "29"), "Si")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.MS }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "MS")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "MS")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "CV (CYCLIC VOLTAMMETRY)")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "CV (CYCLIC VOLTAMMETRY)")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.CDS }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "CDS (CIRCULAR DICHROISM SPECTROSCOPY)")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "CDS (CIRCULAR DICHROISM SPECTROSCOPY)")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.SEC }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "SEC")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "SEC")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.AIF }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "SOPTION-DESORPTION")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "SOPTION-DESORPTION")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.EMISSIONS }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "EMISSIONS")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "EMISSIONS")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.DLS_ACF }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') - }, "DLS ACF")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "DLS ACF")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: _list_layout.LIST_LAYOUT.DLS_INTENSITY }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') @@ -213,5 +208,4 @@ Layout.propTypes = { curveSt: _propTypes.default.object.isRequired, shiftSt: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Layout)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Layout)); \ No newline at end of file diff --git a/dist/components/cmd_bar/r02_scan.js b/dist/components/cmd_bar/r02_scan.js index 3f37f996..d30ce659 100644 --- a/dist/components/cmd_bar/r02_scan.js +++ b/dist/components/cmd_bar/r02_scan.js @@ -10,16 +10,11 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Select = _interopRequireDefault(require("@material-ui/core/Select")); -var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem")); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _OutlinedInput = _interopRequireDefault(require("@material-ui/core/OutlinedInput")); -var _InputLabel = _interopRequireDefault(require("@material-ui/core/InputLabel")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _CloudDoneOutlined = _interopRequireDefault(require("@material-ui/icons/CloudDoneOutlined")); -var _HowToRegOutlined = _interopRequireDefault(require("@material-ui/icons/HowToRegOutlined")); -var _RefreshOutlined = _interopRequireDefault(require("@material-ui/icons/RefreshOutlined")); +var _material = require("@mui/material"); +var _styles = require("@mui/styles"); +var _CloudDoneOutlined = _interopRequireDefault(require("@mui/icons-material/CloudDoneOutlined")); +var _HowToRegOutlined = _interopRequireDefault(require("@mui/icons-material/HowToRegOutlined")); +var _RefreshOutlined = _interopRequireDefault(require("@mui/icons-material/RefreshOutlined")); var _scan = require("../../actions/scan"); var _common = require("./common"); /* eslint-disable prefer-object-spread, function-paren-newline, @@ -36,7 +31,7 @@ const restoreIcon = (classes, hasEdit, isEdit) => hasEdit && isEdit ? /*#__PURE_ className: classes.icon }); const restoreTp = (hasEdit, isEdit) => hasEdit && isEdit ? 'User Defined Scan' : 'Auto Picked Scan'; -const btnRestore = (classes, hasEdit, isEdit, toggleEditAct) => /*#__PURE__*/_react.default.createElement(_Tooltip.default, { +const btnRestore = (classes, hasEdit, isEdit, toggleEditAct) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, restoreTp(hasEdit, isEdit)) @@ -45,7 +40,7 @@ const btnRestore = (classes, hasEdit, isEdit, toggleEditAct) => /*#__PURE__*/_re disabled: !hasEdit, onClick: toggleEditAct }, restoreIcon(classes, hasEdit, isEdit))); -const btnRrfresh = (classes, disabled, refreshAct) => /*#__PURE__*/_react.default.createElement(_Tooltip.default, { +const btnRrfresh = (classes, disabled, refreshAct) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Refresh Scan") @@ -63,7 +58,7 @@ const scanSelect = (classes, feature, layoutSt, scanSt, onChange) => { } = scanSt; if (!count) return null; const range = [...Array(count + 1).keys()].slice(1); - const content = range.map(num => /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + const content = range.map(num => /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: num, key: num }, /*#__PURE__*/_react.default.createElement("span", { @@ -71,18 +66,18 @@ const scanSelect = (classes, feature, layoutSt, scanSt, onChange) => { }, `scan ${num}`))); const defaultValue = scanSt.isAuto || !feature.scanEditTarget ? feature.scanAutoTarget : feature.scanEditTarget; const selValue = target || defaultValue || 1; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldScan), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, { + id: "select-scan-label", className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label') - }, "Current Scan"), /*#__PURE__*/_react.default.createElement(_Select.default, { + }, "Current Scan"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-scan-label", + label: "Current Scan", value: selValue, onChange: onChange, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-scan'), - labelWidth: 90 - }) + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-scan') }, content)); }; const Scan = _ref => { @@ -122,5 +117,4 @@ Scan.propTypes = { resetScanTargetAct: _propTypes.default.func.isRequired, toggleScanIsAutoAct: _propTypes.default.func.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Scan); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Scan); \ No newline at end of file diff --git a/dist/components/cmd_bar/r03_threshold.js b/dist/components/cmd_bar/r03_threshold.js index 1ad24f2d..cc5f6835 100644 --- a/dist/components/cmd_bar/r03_threshold.js +++ b/dist/components/cmd_bar/r03_threshold.js @@ -10,14 +10,11 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _TextField = _interopRequireDefault(require("@material-ui/core/TextField")); -var _InputAdornment = _interopRequireDefault(require("@material-ui/core/InputAdornment")); -var _core = require("@material-ui/core"); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _CloudDoneOutlined = _interopRequireDefault(require("@material-ui/icons/CloudDoneOutlined")); -var _HowToRegOutlined = _interopRequireDefault(require("@material-ui/icons/HowToRegOutlined")); -var _RefreshOutlined = _interopRequireDefault(require("@material-ui/icons/RefreshOutlined")); +var _material = require("@mui/material"); +var _styles = require("@mui/styles"); +var _CloudDoneOutlined = _interopRequireDefault(require("@mui/icons-material/CloudDoneOutlined")); +var _HowToRegOutlined = _interopRequireDefault(require("@mui/icons-material/HowToRegOutlined")); +var _RefreshOutlined = _interopRequireDefault(require("@mui/icons-material/RefreshOutlined")); var _cfg = _interopRequireDefault(require("../../helpers/cfg")); var _threshold = require("../../actions/threshold"); var _common = require("./common"); @@ -30,7 +27,7 @@ const styles = () => Object.assign({ }, txtIcon: {} }, _common.commonStyle); -const txtPercent = () => /*#__PURE__*/_react.default.createElement(_InputAdornment.default, { +const txtPercent = () => /*#__PURE__*/_react.default.createElement(_material.InputAdornment, { position: "end" }, /*#__PURE__*/_react.default.createElement("span", { className: "txt-percent" @@ -43,9 +40,9 @@ const setThreshold = (classes, thresVal, updateThresholdValueAct) => { updateThresholdValueAct(e.target.value); } }; - return /*#__PURE__*/_react.default.createElement(_core.FormControl, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_TextField.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TextField, { className: classes.field, id: "outlined-name", placeholder: "N.A.", @@ -63,7 +60,7 @@ const setThreshold = (classes, thresVal, updateThresholdValueAct) => { onBlur: onBlur, onKeyPress: onEnterPress, variant: "outlined" - }), /*#__PURE__*/_react.default.createElement(_core.InputLabel, { + }), /*#__PURE__*/_react.default.createElement(_material.InputLabel, { className: (0, _classnames.default)(classes.txtLabelBottomInput) }, "Threshold")); }; @@ -88,7 +85,7 @@ const Threshold = _ref => { const thresVal = thresValSt || feature.thresRef; return /*#__PURE__*/_react.default.createElement("span", { className: classes.groupRight - }, setThreshold(classes, thresVal, updateThresholdValueAct), /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + }, setThreshold(classes, thresVal, updateThresholdValueAct), /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Restore Threshold") @@ -98,7 +95,7 @@ const Threshold = _ref => { onClick: resetThresholdValueAct }, /*#__PURE__*/_react.default.createElement(_RefreshOutlined.default, { className: classes.icon - }))), hideThresSt ? null : /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + }))), hideThresSt ? null : /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, restoreTp(hasEdit, isEditSt)) @@ -131,5 +128,4 @@ Threshold.propTypes = { resetThresholdValueAct: _propTypes.default.func.isRequired, toggleThresholdIsEditAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Threshold)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Threshold)); \ No newline at end of file diff --git a/dist/components/cmd_bar/r04_submit.js b/dist/components/cmd_bar/r04_submit.js index 26b8353d..9c5f3702 100644 --- a/dist/components/cmd_bar/r04_submit.js +++ b/dist/components/cmd_bar/r04_submit.js @@ -10,12 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Select = _interopRequireDefault(require("@material-ui/core/Select")); -var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem")); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _OutlinedInput = _interopRequireDefault(require("@material-ui/core/OutlinedInput")); -var _InputLabel = _interopRequireDefault(require("@material-ui/core/InputLabel")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _styles = require("@mui/styles"); var _submit = require("../../actions/submit"); var _r05_submit_btn = _interopRequireDefault(require("./r05_submit_btn")); var _r06_predict_btn = _interopRequireDefault(require("./r06_predict_btn")); @@ -40,24 +36,24 @@ const styles = () => Object.assign({ }, _common.commonStyle); const ascendSelect = (classes, hideSwitch, isAscendSt, toggleIsAscendAct) => { if (hideSwitch) return null; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldOrder), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, { + id: "select-sort-peaks-label", className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label') - }, "Write Peaks"), /*#__PURE__*/_react.default.createElement(_Select.default, { + }, "Write Peaks"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-sort-peaks-label", + label: "Write Peaks", value: isAscendSt, onChange: toggleIsAscendAct, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-order'), - labelWidth: 90 - }) - }, /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-order') + }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: true, key: "ascend" }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-ascend') - }, "Ascend")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "Ascend")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: false, key: "descend" }, /*#__PURE__*/_react.default.createElement("span", { @@ -66,24 +62,32 @@ const ascendSelect = (classes, hideSwitch, isAscendSt, toggleIsAscendAct) => { }; const intensitySelect = (classes, hideSwitch, isIntensitySt, toggleIsIntensityAct) => { if (hideSwitch) return null; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldIntensity), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, { + id: "select-intensity-label", className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label') - }, "Write Intensity"), /*#__PURE__*/_react.default.createElement(_Select.default, { + }, "Write Intensity"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-intensity-label", + label: "Write Intensity", value: isIntensitySt, onChange: toggleIsIntensityAct, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-intensity'), - labelWidth: 100 - }) - }, /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-intensity') + // input={ + // ( + // + // ) + // } + }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: true, key: "ascend" }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-show') - }, "Show")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "Show")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: false, key: "descend" }, /*#__PURE__*/_react.default.createElement("span", { @@ -93,46 +97,62 @@ const intensitySelect = (classes, hideSwitch, isIntensitySt, toggleIsIntensityAc const decimalSelect = (classes, hideSwitch, decimalSt, updateDecimalAct) => { if (hideSwitch) return null; const decimals = [0, 1, 2, 3, 4]; - const options = decimals.map(d => /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + const options = decimals.map(d => /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: d, key: d }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-decimal') }, d))); - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldDecimal), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, { + id: "select-decimal-label", className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label') - }, "Decimal"), /*#__PURE__*/_react.default.createElement(_Select.default, { + }, "Decimal"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-decimal-label", + label: "Decimal", value: decimalSt, onChange: updateDecimalAct, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-decimal'), - labelWidth: 60 - }) + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-decimal') + // input={ + // ( + // + // ) + // } }, options)); }; const operationSelect = (classes, operations, operation, onChangeSelect) => { - const options = operations.map(o => /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + const options = operations.map(o => /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: o.name, key: o.name }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-operation') }, o.name))); const selectedValue = operation.name || operations[0].name; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldOpertaion), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, { + id: "select-submit-label", className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label') - }, "Submit"), /*#__PURE__*/_react.default.createElement(_Select.default, { + }, "Submit"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-submit-label", + label: "Submit", value: selectedValue, onChange: onChangeSelect, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-operation'), - labelWidth: 50 - }) + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-operation') + // input={ + // ( + // + // ) + // } }, options)); }; const selectOperation = (name, operations, updateOperationAct) => { @@ -211,5 +231,4 @@ Submit.propTypes = { updateOperationAct: _propTypes.default.func.isRequired, updateDecimalAct: _propTypes.default.func.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Submit); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Submit); \ No newline at end of file diff --git a/dist/components/cmd_bar/r05_submit_btn.js b/dist/components/cmd_bar/r05_submit_btn.js index 5254355a..cd02c6ff 100644 --- a/dist/components/cmd_bar/r05_submit_btn.js +++ b/dist/components/cmd_bar/r05_submit_btn.js @@ -10,9 +10,9 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _classnames = _interopRequireDefault(require("classnames")); var _redux = require("redux"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _PlayCircleOutline = _interopRequireDefault(require("@material-ui/icons/PlayCircleOutline")); -var _styles = require("@material-ui/core/styles"); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); +var _PlayCircleOutline = _interopRequireDefault(require("@mui/icons-material/PlayCircleOutline")); +var _styles = require("@mui/styles"); var _chem = require("../../helpers/chem"); var _common = require("./common"); var _extractPeaksEdit = require("../../helpers/extractPeaksEdit"); @@ -118,5 +118,4 @@ BtnSubmit.propTypes = { cyclicvoltaSt: _propTypes.default.object.isRequired, curveSt: _propTypes.default.object }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(BtnSubmit); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(BtnSubmit); \ No newline at end of file diff --git a/dist/components/cmd_bar/r06_predict_btn.js b/dist/components/cmd_bar/r06_predict_btn.js index d2e129d7..9452dac3 100644 --- a/dist/components/cmd_bar/r06_predict_btn.js +++ b/dist/components/cmd_bar/r06_predict_btn.js @@ -10,11 +10,10 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _classnames = _interopRequireDefault(require("classnames")); var _redux = require("redux"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _GpsFixedOutlined = _interopRequireDefault(require("@material-ui/icons/GpsFixedOutlined")); -var _HelpOutlineOutlined = _interopRequireDefault(require("@material-ui/icons/HelpOutlineOutlined")); -var _Button = _interopRequireDefault(require("@material-ui/core/Button")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _GpsFixedOutlined = _interopRequireDefault(require("@mui/icons-material/GpsFixedOutlined")); +var _HelpOutlineOutlined = _interopRequireDefault(require("@mui/icons-material/HelpOutlineOutlined")); +var _styles = require("@mui/styles"); var _common = require("./common"); var _format = _interopRequireDefault(require("../../helpers/format")); var _carbonFeatures = require("../../helpers/carbonFeatures"); @@ -55,7 +54,7 @@ const MuPredictButton = (0, _styles.withStyles)({ lineHeight: '20px', padding: 0 } -})(_Button.default); +})(_material.Button); const onClickFail = (layoutSt, simuCount, realCount) => { const feature = _format.default.is13CLayout(layoutSt) ? 'peak' : 'multiplet'; return () => alert(`Selected ${feature} count (${realCount}) must be larger than 0, and must be eqal or less than simulated count (${simuCount}).`); // eslint-disable-line @@ -107,7 +106,7 @@ const onClicUnknown = (feature, forecast, peaksEdit, layoutSt, scan, shiftSt, th const counterText = (classes, isIr, realCount, uniqCount, simuCount) => isIr ? null : /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt') }, `${realCount}/${uniqCount}/${simuCount}`); -const renderBtnPredict = (classes, isIr, realCount, uniqCount, simuCount, color, btnWidthCls, onClick) => /*#__PURE__*/_react.default.createElement(_Tooltip.default, { +const renderBtnPredict = (classes, isIr, realCount, uniqCount, simuCount, color, btnWidthCls, onClick) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Predict"), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("span", { @@ -122,7 +121,7 @@ const renderBtnPredict = (classes, isIr, realCount, uniqCount, simuCount, color, }, counterText(classes, isIr, realCount, uniqCount, simuCount), /*#__PURE__*/_react.default.createElement(_GpsFixedOutlined.default, { className: classes.icon }))); -const renderBtnUnknown = (classes, onClick) => /*#__PURE__*/_react.default.createElement(_Tooltip.default, { +const renderBtnUnknown = (classes, onClick) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Refresh Simulation"), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("span", { @@ -221,5 +220,4 @@ BtnPredict.propTypes = { setUiViewerTypeAct: _propTypes.default.func.isRequired, curveSt: _propTypes.default.object }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(BtnPredict); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(BtnPredict); \ No newline at end of file diff --git a/dist/components/cmd_bar/r07_wavelength_btn.js b/dist/components/cmd_bar/r07_wavelength_btn.js index 9c1be6c4..07c69af3 100644 --- a/dist/components/cmd_bar/r07_wavelength_btn.js +++ b/dist/components/cmd_bar/r07_wavelength_btn.js @@ -10,8 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _classnames = _interopRequireDefault(require("classnames")); var _redux = require("redux"); -var _core = require("@material-ui/core"); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); var _wavelength = require("../../actions/wavelength"); var _format = _interopRequireDefault(require("../../helpers/format")); var _common = require("./common"); @@ -32,21 +32,21 @@ const wavelengthSelect = (classes, waveLengthSt, layoutSt, updateWaveLengthAct) return /*#__PURE__*/_react.default.createElement("i", null); } const onChange = e => updateWaveLengthAct(e.target.value); - return /*#__PURE__*/_react.default.createElement(_core.FormControl, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldLayout), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_core.InputLabel, { + }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, { + id: "select-wavelength-label", className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label') - }, "Wavelength"), /*#__PURE__*/_react.default.createElement(_core.Select, { + }, "Wavelength"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-wavelength-label", + label: "Wavelength", value: waveLengthSt, onChange: onChange, - input: /*#__PURE__*/_react.default.createElement(_core.OutlinedInput, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout'), - labelWidth: 60 - }) + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout') }, _list_wavelength.LIST_WAVE_LENGTH.map(item => { // eslint-disable-line - return /*#__PURE__*/_react.default.createElement(_core.MenuItem, { + return /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: item }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') @@ -79,5 +79,4 @@ Wavelength.propTypes = { waveLengthSt: _propTypes.default.object.isRequired, updateWaveLengthAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Wavelength)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Wavelength)); \ No newline at end of file diff --git a/dist/components/cmd_bar/tri_btn.js b/dist/components/cmd_bar/tri_btn.js index a7f4df00..de0424ac 100644 --- a/dist/components/cmd_bar/tri_btn.js +++ b/dist/components/cmd_bar/tri_btn.js @@ -10,8 +10,8 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); +var _styles = require("@mui/styles"); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); var _cfg = _interopRequireDefault(require("../../helpers/cfg")); var _common = require("./common"); /* eslint-disable prefer-object-spread */ @@ -114,5 +114,4 @@ TriBtn.propTypes = { cb: _propTypes.default.func.isRequired, children: _propTypes.default.node.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(TriBtn)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(TriBtn)); \ No newline at end of file diff --git a/dist/components/common/chem.js b/dist/components/common/chem.js index 3e9eaea5..7a15e0be 100644 --- a/dist/components/common/chem.js +++ b/dist/components/common/chem.js @@ -112,5 +112,4 @@ const SmaToSvg = sma => { }; /* eslint-enable */ -var _default = SmaToSvg; -exports.default = _default; \ No newline at end of file +var _default = exports.default = SmaToSvg; \ No newline at end of file diff --git a/dist/components/d3_line/index.js b/dist/components/d3_line/index.js index 00f5f8e4..f199a8a7 100644 --- a/dist/components/d3_line/index.js +++ b/dist/components/d3_line/index.js @@ -198,5 +198,4 @@ ViewerLine.propTypes = { isHidden: _propTypes.default.bool.isRequired, wavelength: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerLine); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerLine); \ No newline at end of file diff --git a/dist/components/d3_line/line_focus.js b/dist/components/d3_line/line_focus.js index 90950214..503c3796 100644 --- a/dist/components/d3_line/line_focus.js +++ b/dist/components/d3_line/line_focus.js @@ -685,5 +685,4 @@ class LineFocus { this.resetShouldUpdate(editPeakSt, integationSt, mtplySt); } } -var _default = LineFocus; -exports.default = _default; \ No newline at end of file +var _default = exports.default = LineFocus; \ No newline at end of file diff --git a/dist/components/d3_multi/index.js b/dist/components/d3_multi/index.js index 6e75d0da..cd92a756 100644 --- a/dist/components/d3_multi/index.js +++ b/dist/components/d3_multi/index.js @@ -200,5 +200,4 @@ ViewerMulti.propTypes = { addCylicVoltaMinPeakAct: _propTypes.default.func.isRequired, cLabel: _propTypes.default.string }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerMulti); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerMulti); \ No newline at end of file diff --git a/dist/components/d3_multi/multi_focus.js b/dist/components/d3_multi/multi_focus.js index e10c66c7..689058aa 100644 --- a/dist/components/d3_multi/multi_focus.js +++ b/dist/components/d3_multi/multi_focus.js @@ -835,5 +835,4 @@ class MultiFocus { this.resetShouldUpdate(editPeakSt); } } -var _default = MultiFocus; -exports.default = _default; \ No newline at end of file +var _default = exports.default = MultiFocus; \ No newline at end of file diff --git a/dist/components/d3_rect/index.js b/dist/components/d3_rect/index.js index 0bf8bc40..1cb94605 100644 --- a/dist/components/d3_rect/index.js +++ b/dist/components/d3_rect/index.js @@ -148,5 +148,4 @@ ViewerRect.propTypes = { scrollUiWheelAct: _propTypes.default.func.isRequired, isHidden: _propTypes.default.bool.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerRect); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerRect); \ No newline at end of file diff --git a/dist/components/d3_rect/rect_focus.js b/dist/components/d3_rect/rect_focus.js index 91e0d64c..a0f74dab 100644 --- a/dist/components/d3_rect/rect_focus.js +++ b/dist/components/d3_rect/rect_focus.js @@ -224,5 +224,4 @@ class RectFocus { (0, _brush.default)(this, isUiAddIntgSt, isUiNoBrushSt); } } -var _default = RectFocus; -exports.default = _default; \ No newline at end of file +var _default = exports.default = RectFocus; \ No newline at end of file diff --git a/dist/components/forecast/comps.js b/dist/components/forecast/comps.js index 2870c56c..eb711478 100644 --- a/dist/components/forecast/comps.js +++ b/dist/components/forecast/comps.js @@ -8,16 +8,13 @@ exports.sectionSvg = exports.sectionInput = exports.notToRenderAnalysis = export var _react = _interopRequireDefault(require("react")); var _classnames = _interopRequireDefault(require("classnames")); var _reactSvgFileZoomPan = _interopRequireDefault(require("@complat/react-svg-file-zoom-pan")); -var _CheckCircleOutline = _interopRequireDefault(require("@material-ui/icons/CheckCircleOutline")); -var _ErrorOutline = _interopRequireDefault(require("@material-ui/icons/ErrorOutline")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _HelpOutline = _interopRequireDefault(require("@material-ui/icons/HelpOutline")); -var _Help = _interopRequireDefault(require("@material-ui/icons/Help")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); -var _TextField = _interopRequireDefault(require("@material-ui/core/TextField")); -var _CloudOff = _interopRequireDefault(require("@material-ui/icons/CloudOff")); -var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress")); +var _CheckCircleOutline = _interopRequireDefault(require("@mui/icons-material/CheckCircleOutline")); +var _ErrorOutline = _interopRequireDefault(require("@mui/icons-material/ErrorOutline")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); +var _HelpOutline = _interopRequireDefault(require("@mui/icons-material/HelpOutline")); +var _Help = _interopRequireDefault(require("@mui/icons-material/Help")); +var _material = require("@mui/material"); +var _CloudOff = _interopRequireDefault(require("@mui/icons-material/CloudOff")); var _section_loading = _interopRequireDefault(require("./section_loading")); /* eslint-disable react/function-component-definition, react/destructuring-assignment, max-len */ @@ -46,7 +43,7 @@ exports.TxtLabel = TxtLabel; const StatusIcon = status => { switch (status) { case 'accept': - return /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + return /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Accept"), @@ -57,7 +54,7 @@ const StatusIcon = status => { } })); case 'warning': - return /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + return /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Warning"), @@ -68,7 +65,7 @@ const StatusIcon = status => { } })); case 'reject': - return /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + return /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Reject"), @@ -79,7 +76,7 @@ const StatusIcon = status => { } })); case 'missing': - return /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + return /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Missing"), @@ -90,7 +87,7 @@ const StatusIcon = status => { } })); case 'unknown': - return /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + return /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Not Support"), @@ -118,12 +115,12 @@ const sectionInput = (classes, molecule, inputFuncCb) => { if (!inputFuncCb) return null; return /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.inputRoot) - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { container: true - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { item: true, xs: 6 - }, /*#__PURE__*/_react.default.createElement(_TextField.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TextField, { fullWidth: true, label: TxtLabel(classes, 'Molfile', 'txt-mol-label'), margin: "normal", @@ -139,7 +136,7 @@ const SectionRunning = () => /*#__PURE__*/_react.default.createElement("div", { style: titleStyle }, /*#__PURE__*/_react.default.createElement("h2", { style: txtStyle -}, /*#__PURE__*/_react.default.createElement(_CircularProgress.default, { +}, /*#__PURE__*/_react.default.createElement(_material.CircularProgress, { style: { color: 'blue', fontSize: 50 diff --git a/dist/components/forecast/ir_comps.js b/dist/components/forecast/ir_comps.js index 538a9cee..9c2b12e2 100644 --- a/dist/components/forecast/ir_comps.js +++ b/dist/components/forecast/ir_comps.js @@ -10,14 +10,9 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); -var _Select = _interopRequireDefault(require("@material-ui/core/Select")); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem")); -var _CheckCircleOutline = _interopRequireDefault(require("@material-ui/icons/CheckCircleOutline")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _TableCell = _interopRequireDefault(require("@material-ui/core/TableCell")); -var _TableHead = _interopRequireDefault(require("@material-ui/core/TableHead")); -var _TableRow = _interopRequireDefault(require("@material-ui/core/TableRow")); +var _material = require("@mui/material"); +var _CheckCircleOutline = _interopRequireDefault(require("@mui/icons-material/CheckCircleOutline")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); var _comps = require("./comps"); var _forecast = require("../../actions/forecast"); /* eslint-disable react/function-component-definition, function-paren-newline, @@ -33,7 +28,7 @@ const baseSelectIrStatus = _ref => { setIrStatusAct } = _ref; const theStatus = ['accept', 'reject'].includes(status) ? status : ''; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, null, /*#__PURE__*/_react.default.createElement(_Select.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, null, /*#__PURE__*/_react.default.createElement(_material.Select, { value: theStatus, onChange: e => { setIrStatusAct({ @@ -45,19 +40,19 @@ const baseSelectIrStatus = _ref => { svgs: [] }); } - }, /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "accept" }, /*#__PURE__*/_react.default.createElement(_CheckCircleOutline.default, { style: { color: '#4caf50' } - })), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "reject" }, /*#__PURE__*/_react.default.createElement(_HighlightOff.default, { style: { color: '#e91e63' } - })), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "" }, /*#__PURE__*/_react.default.createElement("span", null)))); }; @@ -77,13 +72,13 @@ baseSelectIrStatus.defaultProps = { status: '' }; const SelectIrStatus = (0, _reactRedux.connect)(bssMapStateToProps, bssMapDispatchToProps)(baseSelectIrStatus); -const IrTableHeader = classes => /*#__PURE__*/_react.default.createElement(_TableHead.default, null, /*#__PURE__*/_react.default.createElement(_TableRow.default, null, /*#__PURE__*/_react.default.createElement(_TableCell.default, null), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +const IrTableHeader = classes => /*#__PURE__*/_react.default.createElement(_material.TableHead, null, /*#__PURE__*/_react.default.createElement(_material.TableRow, null, /*#__PURE__*/_react.default.createElement(_material.TableCell, null), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left" -}, (0, _comps.TxtLabel)(classes, 'FG SMARTS', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, 'FG SMARTS', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.TxtLabel)(classes, 'Machine Confidence', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, 'Machine Confidence', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.TxtLabel)(classes, 'Machine', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, 'Machine', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" }, (0, _comps.TxtLabel)(classes, 'Owner', 'txt-prd-table-title')))); exports.IrTableHeader = IrTableHeader; @@ -117,18 +112,18 @@ const colorLabel = function (classes, idx) { className: (0, _classnames.default)(classes.txtLabel, extClsName) }, idx + 1)); }; -const IrTableBodyRow = (classes, idx, fg) => /*#__PURE__*/_react.default.createElement(_TableRow.default, { +const IrTableBodyRow = (classes, idx, fg) => /*#__PURE__*/_react.default.createElement(_material.TableRow, { key: `${idx}-${fg.name}` -}, /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, /*#__PURE__*/_react.default.createElement(_material.TableCell, { component: "th", scope: "row" -}, colorLabel(classes, idx)), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, colorLabel(classes, idx)), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left" -}, (0, _comps.TxtLabel)(classes, fg.sma, 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, fg.sma, 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.ConfidenceLabel)(classes, fg.confidence, 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.ConfidenceLabel)(classes, fg.confidence, 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.StatusIcon)(fg.status)), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.StatusIcon)(fg.status)), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" }, /*#__PURE__*/_react.default.createElement(SelectIrStatus, { sma: fg.sma, diff --git a/dist/components/forecast/ir_viewer.js b/dist/components/forecast/ir_viewer.js index 0ab9c425..9caec92d 100644 --- a/dist/components/forecast/ir_viewer.js +++ b/dist/components/forecast/ir_viewer.js @@ -10,11 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _styles = require("@material-ui/core/styles"); -var _Table = _interopRequireDefault(require("@material-ui/core/Table")); -var _TableBody = _interopRequireDefault(require("@material-ui/core/TableBody")); -var _Paper = _interopRequireDefault(require("@material-ui/core/Paper")); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); +var _styles = require("@mui/styles"); +var _material = require("@mui/material"); var _comps = require("./comps"); var _ir_comps = require("./ir_comps"); const Styles = () => ({ @@ -65,12 +62,12 @@ const sectionTable = (classes, pds) => { fgs } = pds.output.result[0]; if (!fgs) return null; - return /*#__PURE__*/_react.default.createElement(_Paper.default, { + return /*#__PURE__*/_react.default.createElement(_material.Paper, { className: classes.tableRoot - }, /*#__PURE__*/_react.default.createElement(_Table.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table, size: "small" - }, (0, _ir_comps.IrTableHeader)(classes), /*#__PURE__*/_react.default.createElement(_TableBody.default, null, fgs.sort((a, b) => b.confidence - a.confidence).map((fg, idx) => (0, _ir_comps.IrTableBodyRow)(classes, idx, fg))))); + }, (0, _ir_comps.IrTableHeader)(classes), /*#__PURE__*/_react.default.createElement(_material.TableBody, null, fgs.sort((a, b) => b.confidence - a.confidence).map((fg, idx) => (0, _ir_comps.IrTableBodyRow)(classes, idx, fg))))); }; const IrViewer = _ref => { let { @@ -82,15 +79,15 @@ const IrViewer = _ref => { } = _ref; return /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.root, 'card-forecast-viewer') - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { className: (0, _classnames.default)(classes.container), container: true - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { item: true, xs: 4 - }, /*#__PURE__*/_react.default.createElement(_Paper.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Paper, { className: classes.svgRoot - }, (0, _comps.sectionSvg)(classes, forecastSt.predictions))), /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, (0, _comps.sectionSvg)(classes, forecastSt.predictions))), /*#__PURE__*/_react.default.createElement(_material.Grid, { item: true, xs: 8 }, sectionTable(classes, forecastSt.predictions))), (0, _comps.sectionInput)(classes, molecule, inputCb)); @@ -110,5 +107,4 @@ IrViewer.propTypes = { IrViewer.defaultProps = { inputCb: false }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(Styles))(IrViewer); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(Styles))(IrViewer); \ No newline at end of file diff --git a/dist/components/forecast/nmr_comps.js b/dist/components/forecast/nmr_comps.js index f823359b..f0cf960a 100644 --- a/dist/components/forecast/nmr_comps.js +++ b/dist/components/forecast/nmr_comps.js @@ -10,14 +10,9 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Select = _interopRequireDefault(require("@material-ui/core/Select")); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem")); -var _CheckCircleOutline = _interopRequireDefault(require("@material-ui/icons/CheckCircleOutline")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _TableCell = _interopRequireDefault(require("@material-ui/core/TableCell")); -var _TableHead = _interopRequireDefault(require("@material-ui/core/TableHead")); -var _TableRow = _interopRequireDefault(require("@material-ui/core/TableRow")); +var _material = require("@mui/material"); +var _CheckCircleOutline = _interopRequireDefault(require("@mui/icons-material/CheckCircleOutline")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); var _comps = require("./comps"); var _forecast = require("../../actions/forecast"); /* eslint-disable react/function-component-definition, react/destructuring-assignment */ @@ -32,7 +27,7 @@ const baseSelectNmrStatus = _ref => { setNmrStatusAct } = _ref; const theStatus = ['accept', 'reject'].includes(status) ? status : ''; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, null, /*#__PURE__*/_react.default.createElement(_Select.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, null, /*#__PURE__*/_react.default.createElement(_material.Select, { value: theStatus, onChange: e => { setNmrStatusAct({ @@ -45,19 +40,19 @@ const baseSelectNmrStatus = _ref => { svgs: [] }); } - }, /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "accept" }, /*#__PURE__*/_react.default.createElement(_CheckCircleOutline.default, { style: { color: '#4caf50' } - })), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "reject" }, /*#__PURE__*/_react.default.createElement(_HighlightOff.default, { style: { color: '#e91e63' } - })), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "" }, /*#__PURE__*/_react.default.createElement("span", null)))); }; @@ -88,32 +83,32 @@ const realFormat = (val, status) => { } return numFormat(val); }; -const NmrTableHeader = classes => /*#__PURE__*/_react.default.createElement(_TableHead.default, null, /*#__PURE__*/_react.default.createElement(_TableRow.default, null, /*#__PURE__*/_react.default.createElement(_TableCell.default, null, (0, _comps.TxtLabel)(classes, 'Atom', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +const NmrTableHeader = classes => /*#__PURE__*/_react.default.createElement(_material.TableHead, null, /*#__PURE__*/_react.default.createElement(_material.TableRow, null, /*#__PURE__*/_react.default.createElement(_material.TableCell, null, (0, _comps.TxtLabel)(classes, 'Atom', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.TxtLabel)(classes, 'Prediction (ppm)', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, 'Prediction (ppm)', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.TxtLabel)(classes, 'Real (ppm)', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, 'Real (ppm)', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.TxtLabel)(classes, 'Diff (ppm)', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, 'Diff (ppm)', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.TxtLabel)(classes, 'Machine', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, 'Machine', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" }, (0, _comps.TxtLabel)(classes, 'Owner', 'txt-prd-table-title')))); exports.NmrTableHeader = NmrTableHeader; -const NmrTableBodyRow = (classes, row, idx) => /*#__PURE__*/_react.default.createElement(_TableRow.default, { +const NmrTableBodyRow = (classes, row, idx) => /*#__PURE__*/_react.default.createElement(_material.TableRow, { key: `${idx}-${row.atom}` -}, /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, /*#__PURE__*/_react.default.createElement(_material.TableCell, { component: "th", scope: "row" -}, (0, _comps.TxtLabel)(classes, row.atom, 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, row.atom, 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.TxtLabel)(classes, numFormat(row.prediction), 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, numFormat(row.prediction), 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.TxtLabel)(classes, realFormat(row.real, row.status), 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, realFormat(row.real, row.status), 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.TxtLabel)(classes, realFormat(row.diff, row.status), 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.TxtLabel)(classes, realFormat(row.diff, row.status), 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" -}, (0, _comps.StatusIcon)(row.status)), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (0, _comps.StatusIcon)(row.status)), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" }, /*#__PURE__*/_react.default.createElement(SelectNmrStatus, { idx: idx, diff --git a/dist/components/forecast/nmr_viewer.js b/dist/components/forecast/nmr_viewer.js index 0cfea4fb..6188d539 100644 --- a/dist/components/forecast/nmr_viewer.js +++ b/dist/components/forecast/nmr_viewer.js @@ -10,11 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _styles = require("@material-ui/core/styles"); -var _Table = _interopRequireDefault(require("@material-ui/core/Table")); -var _TableBody = _interopRequireDefault(require("@material-ui/core/TableBody")); -var _Paper = _interopRequireDefault(require("@material-ui/core/Paper")); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); +var _styles = require("@mui/styles"); +var _material = require("@mui/material"); var _comps = require("./comps"); var _nmr_comps = require("./nmr_comps"); const Styles = () => ({ @@ -62,12 +59,12 @@ const sectionTable = (classes, pds) => { if (renderMsg) return renderMsg; const dict = pds.output.result[0]; if (!dict) return /*#__PURE__*/_react.default.createElement("div", null); - return /*#__PURE__*/_react.default.createElement(_Paper.default, { + return /*#__PURE__*/_react.default.createElement(_material.Paper, { className: classes.tableRoot - }, /*#__PURE__*/_react.default.createElement(_Table.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table, size: "small" - }, (0, _nmr_comps.NmrTableHeader)(classes), /*#__PURE__*/_react.default.createElement(_TableBody.default, null, dict.shifts.sort((a, b) => a.atom - b.atom).map((row, idx) => (0, _nmr_comps.NmrTableBodyRow)(classes, row, idx))))); + }, (0, _nmr_comps.NmrTableHeader)(classes), /*#__PURE__*/_react.default.createElement(_material.TableBody, null, dict.shifts.sort((a, b) => a.atom - b.atom).map((row, idx) => (0, _nmr_comps.NmrTableBodyRow)(classes, row, idx))))); }; const NmrViewer = _ref => { let { @@ -79,15 +76,15 @@ const NmrViewer = _ref => { } = _ref; return /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.root, 'card-forecast-viewer') - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { className: (0, _classnames.default)(classes.container), container: true - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { item: true, xs: 4 - }, /*#__PURE__*/_react.default.createElement(_Paper.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Paper, { className: classes.svgRoot - }, (0, _comps.sectionSvg)(classes, forecastSt.predictions))), /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, (0, _comps.sectionSvg)(classes, forecastSt.predictions))), /*#__PURE__*/_react.default.createElement(_material.Grid, { item: true, xs: 8 }, sectionTable(classes, forecastSt.predictions))), (0, _comps.sectionInput)(classes, molecule, inputCb), (0, _nmr_comps.SectionReference)(classes)); @@ -107,5 +104,4 @@ NmrViewer.propTypes = { NmrViewer.defaultProps = { inputCb: false }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(Styles))(NmrViewer); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(Styles))(NmrViewer); \ No newline at end of file diff --git a/dist/components/forecast/section_loading.js b/dist/components/forecast/section_loading.js index f6f7a444..25e1f2b9 100644 --- a/dist/components/forecast/section_loading.js +++ b/dist/components/forecast/section_loading.js @@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = void 0; var _react = _interopRequireDefault(require("react")); -var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress")); -var _ErrorOutline = _interopRequireDefault(require("@material-ui/icons/ErrorOutline")); +var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress")); +var _ErrorOutline = _interopRequireDefault(require("@mui/icons-material/ErrorOutline")); const styleLoading = { alignItems: 'center', display: 'flex', @@ -54,5 +54,4 @@ class SectionLoading extends _react.default.Component { return loading ? this.renderLoading() : this.renderNotFound(); } } -var _default = SectionLoading; -exports.default = _default; \ No newline at end of file +var _default = exports.default = SectionLoading; \ No newline at end of file diff --git a/dist/components/forecast_viewer.js b/dist/components/forecast_viewer.js index 3d6a23c0..b84ea1e7 100644 --- a/dist/components/forecast_viewer.js +++ b/dist/components/forecast_viewer.js @@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react")); var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _styles = require("@material-ui/core/styles"); +var _styles = require("@mui/styles"); var _index = _interopRequireDefault(require("./d3_line/index")); var _nmr_viewer = _interopRequireDefault(require("./forecast/nmr_viewer")); var _ir_viewer = _interopRequireDefault(require("./forecast/ir_viewer")); @@ -144,5 +144,4 @@ ForecastViewer.propTypes = { wavelength: _propTypes.default.object.isRequired, curveSt: _propTypes.default.object.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(ForecastViewer); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(ForecastViewer); \ No newline at end of file diff --git a/dist/components/multi_jcamps_viewer.js b/dist/components/multi_jcamps_viewer.js index 25b34668..94ef32b8 100644 --- a/dist/components/multi_jcamps_viewer.js +++ b/dist/components/multi_jcamps_viewer.js @@ -9,8 +9,8 @@ var _react = _interopRequireDefault(require("react")); var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); -var _styles = require("@material-ui/core/styles"); +var _Grid = _interopRequireDefault(require("@mui/material/Grid")); +var _styles = require("@mui/styles"); var _index = _interopRequireDefault(require("./panel/index")); var _index2 = _interopRequireDefault(require("./cmd_bar/index")); var _index3 = _interopRequireDefault(require("./d3_multi/index")); @@ -144,5 +144,4 @@ MultiJcampsViewer.defaultProps = { yLabel: '', entities: [] }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(MultiJcampsViewer); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(MultiJcampsViewer); \ No newline at end of file diff --git a/dist/components/panel/compare.js b/dist/components/panel/compare.js index e20067e4..f95c783a 100644 --- a/dist/components/panel/compare.js +++ b/dist/components/panel/compare.js @@ -12,19 +12,12 @@ var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); var _reactDropzone = _interopRequireDefault(require("react-dropzone")); -var _core = require("@material-ui/core"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _Table = _interopRequireDefault(require("@material-ui/core/Table")); -var _TableBody = _interopRequireDefault(require("@material-ui/core/TableBody")); -var _TableCell = _interopRequireDefault(require("@material-ui/core/TableCell")); -var _TableRow = _interopRequireDefault(require("@material-ui/core/TableRow")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _VisibilityOutlined = _interopRequireDefault(require("@material-ui/icons/VisibilityOutlined")); -var _VisibilityOffOutlined = _interopRequireDefault(require("@material-ui/icons/VisibilityOffOutlined")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); +var _VisibilityOutlined = _interopRequireDefault(require("@mui/icons-material/VisibilityOutlined")); +var _VisibilityOffOutlined = _interopRequireDefault(require("@mui/icons-material/VisibilityOffOutlined")); +var _styles = require("@mui/styles"); var _format = _interopRequireDefault(require("../../helpers/format")); var _jcamp = require("../../actions/jcamp"); /* eslint-disable function-paren-newline, react/jsx-props-no-spreading, @@ -126,7 +119,7 @@ const tpHint = classes => /*#__PURE__*/_react.default.createElement("span", { }, "- Accept *.dx, *.jdx, *.JCAMP,"), /*#__PURE__*/_react.default.createElement("p", { className: (0, _classnames.default)(classes.tpLabel, 'txt-sv-tp') }, "- Max 5 spectra.")); -const content = (classes, desc) => /*#__PURE__*/_react.default.createElement(_Tooltip.default, { +const content = (classes, desc) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: tpHint(classes), placement: "bottom" }, /*#__PURE__*/_react.default.createElement("span", { @@ -179,22 +172,22 @@ const compareList = (classes, jcampSt, rmOthersOneAct, toggleShowAct) => { isShow: o.show, toggleShowCb: () => toggleShowAct(idx) })); - return /*#__PURE__*/_react.default.createElement(_Table.default, { + return /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table - }, /*#__PURE__*/_react.default.createElement(_TableBody.default, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_TableRow.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TableBody, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_material.TableRow, { key: row.idx, className: classes.tRow, hover: true - }, /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'), style: { backgroundColor: row.color } - }, row.idx + 1), /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, row.idx + 1), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt', row.isShow ? null : classes.tTxtHide) - }, row.title), /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, row.title), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt') }, row.isShow ? /*#__PURE__*/_react.default.createElement(_VisibilityOutlined.default, { @@ -217,21 +210,21 @@ const ComparePanel = _ref2 => { rmOthersOneAct, toggleShowAct } = _ref2; - return /*#__PURE__*/_react.default.createElement(_core.Accordion, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, { expanded: expand, onChange: onExapnd, className: (0, _classnames.default)(classes.panel), TransitionProps: { unmountOnExit: true - } // increase ExpansionPanel performance - }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + } // increase Accordion performance + }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, { expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null), className: (0, _classnames.default)(classes.panelSummary) - }, /*#__PURE__*/_react.default.createElement(_Typography.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Typography, { className: "txt-panel-header" }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title') - }, "Spectra Comparisons"))), /*#__PURE__*/_react.default.createElement(_Divider.default, null), inputOthers(classes, jcampSt), /*#__PURE__*/_react.default.createElement("div", { + }, "Spectra Comparisons"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), inputOthers(classes, jcampSt), /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.panelDetail) }, compareList(classes, jcampSt, rmOthersOneAct, toggleShowAct))); }; @@ -252,5 +245,4 @@ ComparePanel.propTypes = { rmOthersOneAct: _propTypes.default.func.isRequired, toggleShowAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(ComparePanel)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(ComparePanel)); \ No newline at end of file diff --git a/dist/components/panel/cyclic_voltamery_data.js b/dist/components/panel/cyclic_voltamery_data.js index f02c351d..308a5650 100644 --- a/dist/components/panel/cyclic_voltamery_data.js +++ b/dist/components/panel/cyclic_voltamery_data.js @@ -10,16 +10,13 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _AddCircleOutline = _interopRequireDefault(require("@material-ui/icons/AddCircleOutline")); -var _RemoveCircle = _interopRequireDefault(require("@material-ui/icons/RemoveCircle")); -var _Info = _interopRequireDefault(require("@material-ui/icons/Info")); -var _Help = _interopRequireDefault(require("@material-ui/icons/Help")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _styles = require("@material-ui/core/styles"); -var _core = require("@material-ui/core"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _AddCircleOutline = _interopRequireDefault(require("@mui/icons-material/AddCircleOutline")); +var _RemoveCircle = _interopRequireDefault(require("@mui/icons-material/RemoveCircle")); +var _Info = _interopRequireDefault(require("@mui/icons-material/Info")); +var _Help = _interopRequireDefault(require("@mui/icons-material/Help")); +var _styles = require("@mui/styles"); +var _material = require("@mui/material"); var _cyclic_voltammetry = require("../../actions/cyclic_voltammetry"); var _ui = require("../../actions/ui"); var _list_ui = require("../../constants/list_ui"); @@ -159,73 +156,73 @@ const CyclicVoltammetryPanel = _ref => { jcampIdx }) })); - return /*#__PURE__*/_react.default.createElement(_core.Accordion, null, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, null, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, { expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null), className: (0, _classnames.default)(classes.panelSummary) - }, /*#__PURE__*/_react.default.createElement(_Typography.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Typography, { className: "txt-panel-header" }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title') - }, "Voltammetry data"))), /*#__PURE__*/_react.default.createElement(_Divider.default, null), /*#__PURE__*/_react.default.createElement(_core.Table, { + }, "Voltammetry data"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table - }, /*#__PURE__*/_react.default.createElement(_core.TableHead, null, /*#__PURE__*/_react.default.createElement(_core.TableRow, null, /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, /*#__PURE__*/_react.default.createElement(_material.TableHead, null, /*#__PURE__*/_react.default.createElement(_material.TableRow, null, /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') - }, "Max"), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, "Max"), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') - }, "Min"), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, "Min"), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') - }, "I \u03BB0", /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + }, "I \u03BB0", /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("p", { className: (0, _classnames.default)(classes.txtToolTip) }, "Baseline correction value for I ratio ", /*#__PURE__*/_react.default.createElement("br", null), "(a.k.a y value of pecker)") }, /*#__PURE__*/_react.default.createElement(_Info.default, { className: (0, _classnames.default)(classes.infoIcon) - }))), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }))), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') - }, "I ratio", /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + }, "I ratio", /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.txtToolTip) }, /*#__PURE__*/_react.default.createElement("p", null, "Nicholson's method"), /*#__PURE__*/_react.default.createElement("i", null, "NICHOLSON, Rl S. Semiempirical Procedure for Measuring with Stationary Electrode Polarography Rates of Chemical Reactions Involving the Product of Electron Transfer. Analytical Chemistry, 1966, 38. Jg., Nr. 10, S. 1406-1406. https://doi.org/10.1021/ac60242a030")) }, /*#__PURE__*/_react.default.createElement(_Info.default, { className: (0, _classnames.default)(classes.infoIcon) - }))), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }))), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') - }, "DeltaEp", /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + }, "DeltaEp", /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtToolTip) }, "| Epa - Epc |") }, /*#__PURE__*/_react.default.createElement(_Info.default, { className: (0, _classnames.default)(classes.infoIcon) - }))), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }))), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') }, /*#__PURE__*/_react.default.createElement(_AddCircleOutline.default, { onClick: () => addNewPairPeakAct(jcampIdx) - })))), /*#__PURE__*/_react.default.createElement(_core.TableBody, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_core.TableRow, { + })))), /*#__PURE__*/_react.default.createElement(_material.TableBody, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_material.TableRow, { key: row.idx - }, /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, spectra.isWorkMaxPeak && spectra.selectedIdx === row.idx ? classes.cellSelected : 'txt-sv-panel-txt'), onClick: row.onClickMax - }, row.max), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, row.max), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, !spectra.isWorkMaxPeak && spectra.selectedIdx === row.idx ? classes.cellSelected : 'txt-sv-panel-txt'), onClick: row.onClickMin - }, row.min), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, row.min), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') - }, row.pecker), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, row.pecker), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') - }, row.ratio), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, row.ratio), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') - }, row.delta), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, row.delta), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') }, /*#__PURE__*/_react.default.createElement(_RemoveCircle.default, { @@ -233,7 +230,7 @@ const CyclicVoltammetryPanel = _ref => { onClick: row.remove })))))), /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.rowRoot, classes.rowEven) - }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtToolTip) }, "Click here to open the User manual document") @@ -279,5 +276,4 @@ CyclicVoltammetryPanel.propTypes = { CyclicVoltammetryPanel.defaultProps = { jcampIdx: 0 }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(CyclicVoltammetryPanel)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(CyclicVoltammetryPanel)); \ No newline at end of file diff --git a/dist/components/panel/graph_selection.js b/dist/components/panel/graph_selection.js index 5bb814a7..b3cc59f7 100644 --- a/dist/components/panel/graph_selection.js +++ b/dist/components/panel/graph_selection.js @@ -10,11 +10,9 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _styles = require("@material-ui/core/styles"); -var _core = require("@material-ui/core"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _styles = require("@mui/styles"); +var _material = require("@mui/material"); var _curve = require("../../actions/curve"); var _list_layout = require("../../constants/list_layout"); function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); } @@ -126,22 +124,22 @@ const GraphSelectionPanel = _ref => { filename }; }); - return /*#__PURE__*/_react.default.createElement(_core.Accordion, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, { "data-testid": "GraphSelectionPanel" - }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, { expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null), className: (0, _classnames.default)(classes.panelSummary) - }, /*#__PURE__*/_react.default.createElement(_Typography.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Typography, { className: "txt-panel-header" }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title') - }, "Graph selection"))), /*#__PURE__*/_react.default.createElement(_Divider.default, null), layoutSt === _list_layout.LIST_LAYOUT.AIF ? /*#__PURE__*/_react.default.createElement(_core.FormControlLabel, { - control: /*#__PURE__*/_react.default.createElement(_core.Switch, { + }, "Graph selection"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), layoutSt === _list_layout.LIST_LAYOUT.AIF ? /*#__PURE__*/_react.default.createElement(_material.FormControlLabel, { + control: /*#__PURE__*/_react.default.createElement(_material.Switch, { checked: isShowAllCurve, onChange: onChangeSwitch }), label: "Show all curves" - }) : null, subLayoutValues && subLayoutValues.length > 1 ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_core.Tabs, { + }) : null, subLayoutValues && subLayoutValues.length > 1 ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_material.Tabs, { value: selectedSubLayout, onChange: onChangeTabSubLayout }, subLayoutValues.map((subLayout, i) => { @@ -156,12 +154,12 @@ const GraphSelectionPanel = _ref => { default: break; } - return /*#__PURE__*/_react.default.createElement(_core.Tab, { + return /*#__PURE__*/_react.default.createElement(_material.Tab, { key: i, value: subLayout, label: subLayoutName }); - })), /*#__PURE__*/_react.default.createElement(_core.List, null, itemsSubLayout.map(item => /*#__PURE__*/_react.default.createElement(_core.ListItem, { + })), /*#__PURE__*/_react.default.createElement(_material.List, null, itemsSubLayout.map(item => /*#__PURE__*/_react.default.createElement(_material.ListItem, { key: item.idx, onClick: () => onChange(item.idx), className: (0, _classnames.default)(item.idx === curveIdx ? classes.curveSelected : classes.curveDefault) // eslint-disable-line @@ -178,7 +176,7 @@ const GraphSelectionPanel = _ref => { backgroundColor: item.color } }), item.filename !== '' ? /*#__PURE__*/_react.default.createElement("span", null, "File: ", item.filename) : null // eslint-disable-line - )))))) : /*#__PURE__*/_react.default.createElement(_core.List, null, items.map(item => /*#__PURE__*/_react.default.createElement(_core.ListItem, { + )))))) : /*#__PURE__*/_react.default.createElement(_material.List, null, items.map(item => /*#__PURE__*/_react.default.createElement(_material.ListItem, { key: item.idx, onClick: () => onChange(item.idx), className: (0, _classnames.default)(item.idx === curveIdx ? classes.curveSelected : classes.curveDefault) // eslint-disable-line @@ -219,5 +217,4 @@ GraphSelectionPanel.propTypes = { subLayoutsInfo: _propTypes.default.array, toggleShowAllCurveAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(GraphSelectionPanel)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(GraphSelectionPanel)); \ No newline at end of file diff --git a/dist/components/panel/index.js b/dist/components/panel/index.js index 8c3eac4a..0fcc4064 100644 --- a/dist/components/panel/index.js +++ b/dist/components/panel/index.js @@ -10,7 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _styles = require("@material-ui/core/styles"); +var _styles = require("@mui/material/styles"); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); var _info = _interopRequireDefault(require("./info")); var _peaks = _interopRequireDefault(require("./peaks")); var _compare = _interopRequireDefault(require("./compare")); @@ -20,11 +21,11 @@ var _graph_selection = _interopRequireDefault(require("./graph_selection")); var _cfg = _interopRequireDefault(require("../../helpers/cfg")); /* eslint-disable react/prop-types, react/require-default-props */ -const theme = (0, _styles.createTheme)({ +const theme = (0, _styles.createTheme)((0, _styles.adaptV4Theme)({ typography: { useNextVariants: true } -}); +})); const styles = () => ({ panels: { maxHeight: 'calc(90vh - 220px)', @@ -93,7 +94,9 @@ class PanelViewer extends _react.default.Component { const hideGraphSelection = listCurves === false || listCurves === undefined; return /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.panels) - }, /*#__PURE__*/_react.default.createElement(_styles.MuiThemeProvider, { + }, /*#__PURE__*/_react.default.createElement(_styles.StyledEngineProvider, { + injectFirst: true + }, /*#__PURE__*/_react.default.createElement(_styles.ThemeProvider, { theme: theme }, hideGraphSelection ? null : /*#__PURE__*/_react.default.createElement(_graph_selection.default, { jcampIdx: jcampIdx, @@ -126,7 +129,7 @@ class PanelViewer extends _react.default.Component { expand: expand === 'cyclicvolta', onExapnd: onExapndCyclicVolta, userManualLink: userManualLink ? userManualLink.cv : undefined - }))); + })))); } } const mapStateToProps = (state, _) => ( @@ -151,7 +154,6 @@ PanelViewer.propTypes = { curveSt: _propTypes.default.object.isRequired, subLayoutsInfo: _propTypes.default.object }; -var _default = (0, _reactRedux.connect)( +var _default = exports.default = (0, _reactRedux.connect)( // eslint-disable-line -mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(PanelViewer)); // eslint-disable-line -exports.default = _default; \ No newline at end of file +mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(PanelViewer)); // eslint-disable-line \ No newline at end of file diff --git a/dist/components/panel/info.js b/dist/components/panel/info.js index 1e10ca9f..b819987c 100644 --- a/dist/components/panel/info.js +++ b/dist/components/panel/info.js @@ -12,11 +12,9 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _reactSvgFileZoomPan = _interopRequireDefault(require("@complat/react-svg-file-zoom-pan")); var _reactQuill = _interopRequireDefault(require("react-quill")); -var _core = require("@material-ui/core"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _styles = require("@mui/styles"); var _format = _interopRequireDefault(require("../../helpers/format")); /* eslint-disable no-mixed-operators, react/function-component-definition, react/require-default-props */ @@ -154,21 +152,21 @@ const InfoPanel = _ref => { originStack = integration.originStack; // eslint-disable-line } - return /*#__PURE__*/_react.default.createElement(_core.Accordion, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, { expanded: expand, onChange: onExapnd, className: (0, _classnames.default)(classes.panel), TransitionProps: { unmountOnExit: true - } // increase ExpansionPanel performance - }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + } // increase Accordion performance + }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, { expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null), className: (0, _classnames.default)(classes.panelSummary) - }, /*#__PURE__*/_react.default.createElement(_Typography.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Typography, { className: "txt-panel-header" }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title') - }, "Info"))), /*#__PURE__*/_react.default.createElement(_Divider.default, null), /*#__PURE__*/_react.default.createElement("div", { + }, "Info"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.panelDetail) }, /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd) @@ -239,7 +237,6 @@ InfoPanel.propTypes = { canChangeDescription: _propTypes.default.bool.isRequired, onDescriptionChanged: _propTypes.default.func }; -var _default = (0, _reactRedux.connect)( +var _default = exports.default = (0, _reactRedux.connect)( // eslint-disable-line -mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(InfoPanel)); // eslint-disable-line -exports.default = _default; \ No newline at end of file +mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(InfoPanel)); // eslint-disable-line \ No newline at end of file diff --git a/dist/components/panel/multiplicity.js b/dist/components/panel/multiplicity.js index 89ba08a7..3b91f374 100644 --- a/dist/components/panel/multiplicity.js +++ b/dist/components/panel/multiplicity.js @@ -10,20 +10,11 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _core = require("@material-ui/core"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _Table = _interopRequireDefault(require("@material-ui/core/Table")); -var _TableBody = _interopRequireDefault(require("@material-ui/core/TableBody")); -var _TableCell = _interopRequireDefault(require("@material-ui/core/TableCell")); -var _TableRow = _interopRequireDefault(require("@material-ui/core/TableRow")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _styles = require("@material-ui/core/styles"); -var _Checkbox = _interopRequireDefault(require("@material-ui/core/Checkbox")); -var _Button = _interopRequireDefault(require("@material-ui/core/Button")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _RefreshOutlined = _interopRequireDefault(require("@material-ui/icons/RefreshOutlined")); +var _material = require("@mui/material"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); +var _styles = require("@mui/styles"); +var _RefreshOutlined = _interopRequireDefault(require("@mui/icons-material/RefreshOutlined")); var _multiplicity = require("../../actions/multiplicity"); var _multiplicity_select = _interopRequireDefault(require("./multiplicity_select")); var _multiplicity_coupling = _interopRequireDefault(require("./multiplicity_coupling")); @@ -127,7 +118,7 @@ const cBoxStyle = () => ({ }, checked: {} }); -const MUCheckbox = (0, _styles.withStyles)(cBoxStyle)(_Checkbox.default); +const MUCheckbox = (0, _styles.withStyles)(cBoxStyle)(_material.Checkbox); const createData = (idx, xExtent, peaks, shift, smExtext, mpyType, js, onClick, onRefresh) => ({ idx: idx + 1, xExtent, @@ -151,24 +142,24 @@ const pkList = (classes, row, shift, digits, rmMpyPeakByPanelAct) => row.peaks.m onClick: cb, className: classes.rmBtn }); - return /*#__PURE__*/_react.default.createElement(_TableRow.default, { + return /*#__PURE__*/_react.default.createElement(_material.TableRow, { key: pk.x, className: classes.tRow, hover: true - }, /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt') - }, `(${(pk.x - shift).toFixed(digits)}, ${pk.y.toExponential(2)})`), /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, `(${(pk.x - shift).toFixed(digits)}, ${pk.y.toExponential(2)})`), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt') }, rmBtn)); }); -const refreshBtn = (classes, onRefresh) => /*#__PURE__*/_react.default.createElement(_Tooltip.default, { +const refreshBtn = (classes, onRefresh) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, { placement: "left", title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Calculate Multiplicity") -}, /*#__PURE__*/_react.default.createElement(_Button.default, { +}, /*#__PURE__*/_react.default.createElement(_material.Button, { className: classes.btnRf, onClick: onRefresh }, /*#__PURE__*/_react.default.createElement(_RefreshOutlined.default, null))); @@ -231,9 +222,9 @@ const mpyList = (classes, digits, multiplicitySt, curveSt, clickMpyOneAct, rmMpy target: row })), refreshBtn(classes, row.onRefresh)), /*#__PURE__*/_react.default.createElement(_multiplicity_coupling.default, { row: row - })), /*#__PURE__*/_react.default.createElement(_Table.default, { + })), /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table - }, /*#__PURE__*/_react.default.createElement(_TableBody.default, null, pkList(classes, row, shift, digits, rmMpyPeakByPanelAct)))))); + }, /*#__PURE__*/_react.default.createElement(_material.TableBody, null, pkList(classes, row, shift, digits, rmMpyPeakByPanelAct)))))); }; const MultiplicityPanel = _ref => { let { @@ -247,21 +238,21 @@ const MultiplicityPanel = _ref => { resetMpyOneAct } = _ref; const digits = 4; - return /*#__PURE__*/_react.default.createElement(_core.Accordion, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, { expanded: expand, onChange: onExapnd, className: (0, _classnames.default)(classes.panel), TransitionProps: { unmountOnExit: true - } // increase ExpansionPanel performance - }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + } // increase Accordion performance + }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, { expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null), className: (0, _classnames.default)(classes.panelSummary) - }, /*#__PURE__*/_react.default.createElement(_Typography.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Typography, { className: "txt-panel-header" }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title') - }, "Multiplicity"))), /*#__PURE__*/_react.default.createElement(_Divider.default, null), /*#__PURE__*/_react.default.createElement("div", { + }, "Multiplicity"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.panelDetail) }, mpyList(classes, digits, multiplicitySt, curveSt, clickMpyOneAct, rmMpyPeakByPanelAct, resetMpyOneAct))); }; @@ -287,5 +278,4 @@ MultiplicityPanel.propTypes = { resetMpyOneAct: _propTypes.default.func.isRequired, curveSt: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(MultiplicityPanel)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(MultiplicityPanel)); \ No newline at end of file diff --git a/dist/components/panel/multiplicity_coupling.js b/dist/components/panel/multiplicity_coupling.js index 23b909d1..745a720f 100644 --- a/dist/components/panel/multiplicity_coupling.js +++ b/dist/components/panel/multiplicity_coupling.js @@ -10,9 +10,8 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _TextField = _interopRequireDefault(require("@material-ui/core/TextField")); -var _InputAdornment = _interopRequireDefault(require("@material-ui/core/InputAdornment")); +var _styles = require("@mui/styles"); +var _material = require("@mui/material"); var _multiplicity = require("../../actions/multiplicity"); const styles = () => ({ jDiv: { @@ -37,12 +36,12 @@ const styles = () => ({ height: 24 } }); -const txtJ = () => /*#__PURE__*/_react.default.createElement(_InputAdornment.default, { +const txtJ = () => /*#__PURE__*/_react.default.createElement(_material.InputAdornment, { position: "start" }, /*#__PURE__*/_react.default.createElement("span", { className: "txt-cmd-j" }, "J\xA0=")); -const txtHz = () => /*#__PURE__*/_react.default.createElement(_InputAdornment.default, { +const txtHz = () => /*#__PURE__*/_react.default.createElement(_material.InputAdornment, { position: "end" }, /*#__PURE__*/_react.default.createElement("span", { className: "txt-cmd-hz" @@ -102,7 +101,7 @@ class MpyCoupling extends _react.default.Component { className: (0, _classnames.default)(classes.jDiv) }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.moExtTxt, classes.jTxt, 'txt-sv-panel-head') - }, /*#__PURE__*/_react.default.createElement(_TextField.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TextField, { className: (0, _classnames.default)(classes.txtField, 'txt-cmd-field'), placeholder: "-", value: value, @@ -130,5 +129,4 @@ MpyCoupling.propTypes = { row: _propTypes.default.object.isRequired, updateMpyJAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(MpyCoupling)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(MpyCoupling)); \ No newline at end of file diff --git a/dist/components/panel/multiplicity_select.js b/dist/components/panel/multiplicity_select.js index d2ce8ea4..4cb74b74 100644 --- a/dist/components/panel/multiplicity_select.js +++ b/dist/components/panel/multiplicity_select.js @@ -10,9 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _TextField = _interopRequireDefault(require("@material-ui/core/TextField")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _styles = require("@mui/styles"); var _multiplicity = require("../../actions/multiplicity"); /* eslint-disable react/function-component-definition */ @@ -58,10 +57,10 @@ const MpySelect = _ref => { }); } }; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.formControl), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_TextField.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TextField, { className: (0, _classnames.default)(classes.txtField, 'txt-cmd-field'), value: mpyType, margin: "none", @@ -85,5 +84,4 @@ MpySelect.propTypes = { target: _propTypes.default.object.isRequired, selectMpyTypeAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(Styles)(MpySelect)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(Styles)(MpySelect)); \ No newline at end of file diff --git a/dist/components/panel/peaks.js b/dist/components/panel/peaks.js index 789f5b2e..8bbe0a13 100644 --- a/dist/components/panel/peaks.js +++ b/dist/components/panel/peaks.js @@ -10,17 +10,10 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _core = require("@material-ui/core"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _Table = _interopRequireDefault(require("@material-ui/core/Table")); -var _TableBody = _interopRequireDefault(require("@material-ui/core/TableBody")); -var _TableCell = _interopRequireDefault(require("@material-ui/core/TableCell")); -var _TableHead = _interopRequireDefault(require("@material-ui/core/TableHead")); -var _TableRow = _interopRequireDefault(require("@material-ui/core/TableRow")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); +var _styles = require("@mui/styles"); var _chem = require("../../helpers/chem"); var _edit_peak = require("../../actions/edit_peak"); var _format = _interopRequireDefault(require("../../helpers/format")); @@ -98,36 +91,36 @@ const peakList = (peaks, digits, cbAct, classes, isPos) => { }); const rowKlass = isPos ? classes.tRowHeadPos : classes.tRowHeadNeg; const headTxt = isPos ? 'P+' : 'P-'; - return /*#__PURE__*/_react.default.createElement(_Table.default, { + return /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table - }, /*#__PURE__*/_react.default.createElement(_TableHead.default, null, /*#__PURE__*/_react.default.createElement(_TableRow.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TableHead, null, /*#__PURE__*/_react.default.createElement(_material.TableRow, { className: rowKlass - }, /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxtHead, 'txt-sv-panel-head') - }, /*#__PURE__*/_react.default.createElement("i", null, headTxt)), /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, /*#__PURE__*/_react.default.createElement("i", null, headTxt)), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxtHeadXY, 'txt-sv-panel-head') - }, "X"), /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, "X"), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxtHeadXY, 'txt-sv-panel-head') - }, "Y"), /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, "Y"), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxtHead, 'txt-sv-panel-head') - }, "-"))), /*#__PURE__*/_react.default.createElement(_TableBody.default, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_TableRow.default, { + }, "-"))), /*#__PURE__*/_react.default.createElement(_material.TableBody, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_material.TableRow, { key: row.idx, className: classes.tRow, hover: true - }, /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt') - }, row.idx), /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, row.idx), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt') - }, row.x), /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, row.x), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt') - }, row.y.toExponential(2)), /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, row.y.toExponential(2)), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt') }, row.rmBtn))))); @@ -172,22 +165,22 @@ const PeakPanel = _ref => { const filteredArray = currentPeakOfCurve.filter(element => neg.includes(element)); const peaksData = [].concat(filteredArray).concat(pos); const digits = _format.default.isEmWaveLayout(layoutSt) ? 0 : 4; - return /*#__PURE__*/_react.default.createElement(_core.Accordion, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, { "data-testid": "PeaksPanelInfo", expanded: expand, onChange: onExapnd, className: (0, _classnames.default)(classes.panel), TransitionProps: { unmountOnExit: true - } // increase ExpansionPanel performance - }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + } // increase Accordion performance + }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, { expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null), className: (0, _classnames.default)(classes.panelSummary) - }, /*#__PURE__*/_react.default.createElement(_Typography.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Typography, { className: "txt-panel-header" }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title') - }, "Peaks"))), /*#__PURE__*/_react.default.createElement(_Divider.default, null), /*#__PURE__*/_react.default.createElement("div", { + }, "Peaks"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.panelDetail) }, peakList(peaksData, digits, rmFromPosListAct, classes, true))); }; @@ -212,7 +205,6 @@ PeakPanel.propTypes = { rmFromNegListAct: _propTypes.default.func.isRequired, curveSt: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)( +var _default = exports.default = (0, _reactRedux.connect)( // eslint-disable-line -mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(PeakPanel)); // eslint-disable-line -exports.default = _default; \ No newline at end of file +mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(PeakPanel)); // eslint-disable-line \ No newline at end of file diff --git a/dist/constants/action_type.js b/dist/constants/action_type.js index 9c874150..11bcdb14 100644 --- a/dist/constants/action_type.js +++ b/dist/constants/action_type.js @@ -4,29 +4,26 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.XRD = exports.UI = exports.THRESHOLD = exports.SUBMIT = exports.STATUS = exports.SIMULATION = exports.SHIFT = exports.SCAN = exports.MULTIPLICITY = exports.META = exports.MANAGER = exports.LAYOUT = exports.JCAMP = exports.INTEGRATION = exports.FORECAST = exports.EDITPEAK = exports.CYCLIC_VOLTA_METRY = exports.CURVE = void 0; -const THRESHOLD = { +const THRESHOLD = exports.THRESHOLD = { UPDATE_VALUE: 'THRESHOLD_UPDATE_VALUE', RESET_VALUE: 'THRESHOLD_RESET_VALUE', TOGGLE_ISEDIT: 'THRESHOLD_TOGGLE_ISEDIT', UPDATE_UPPER_VALUE: 'THRESHOLD_UPDATE_UPPER_VALUE', UPDATE_LOWER_VALUE: 'THRESHOLD_UPDATE_LOWER_VALUE' }; -exports.THRESHOLD = THRESHOLD; -const EDITPEAK = { +const EDITPEAK = exports.EDITPEAK = { ADD_POSITIVE: 'ADD_TO_POSITIVE_EDITPEAK_LIST', ADD_NEGATIVE: 'ADD_TO_NEGATIVE_EDITPEAK_LIST', RM_NEGATIVE: 'RM_FROM_NEGATIVE_EDITPEAK_LIST', RM_POSITIVE: 'RM_FROM_POSITIVE_EDITPEAK_LIST', SHIFT: 'EDITPEAK_SHIFT' }; -exports.EDITPEAK = EDITPEAK; -const STATUS = { +const STATUS = exports.STATUS = { TOGGLEBTNSUBMIT: 'TOGGLE_BTN_SUBMIT', TOGGLEBTNALL: 'TOGGLE_BTN_ALL', ENABLEBTNALL: 'ENABLE_BTN_ALL' }; -exports.STATUS = STATUS; -const MANAGER = { +const MANAGER = exports.MANAGER = { RESETALL: 'RESET_ALL', RESETSHIFT: 'RESET_SHIFT', RESET_INIT_COMMON: 'RESET_INIT_COMMON', @@ -34,24 +31,20 @@ const MANAGER = { RESET_INIT_MS: 'RESET_INIT_MS', RESET_INIT_COMMON_WITH_INTERGATION: 'RESET_INIT_COMMON_WITH_INTERGATION' }; -exports.MANAGER = MANAGER; -const LAYOUT = { +const LAYOUT = exports.LAYOUT = { UPDATE: 'UPDATE_LAYOUT' }; -exports.LAYOUT = LAYOUT; -const SHIFT = { +const SHIFT = exports.SHIFT = { SET_REF: 'SHIFT_SET_REF', SET_PEAK: 'SHIFT_SET_PEAK', RM_PEAK: 'SHIFT_RM_PEAK' }; -exports.SHIFT = SHIFT; -const SCAN = { +const SCAN = exports.SCAN = { SET_TARGET: 'SCAN_SET_TARGET', RESET_TARGET: 'SCAN_RESET_TARGET', TOGGLE_ISAUTO: 'SCAN_TOGGLE_ISAUTO' }; -exports.SCAN = SCAN; -const UI = { +const UI = exports.UI = { CLICK_TARGET: 'UI_CLICK_TARGET', VIEWER: { SET_TYPE: 'UI_VIEWER_SET_TYPE' @@ -69,22 +62,19 @@ const UI = { SCROLL: 'UI_WHEEL_SCROLL' } }; -exports.UI = UI; -const FORECAST = { +const FORECAST = exports.FORECAST = { INIT_STATUS: 'FORECAST_INIT_STATUS', SET_IR_STATUS: 'FORECAST_SET_IR_STATUS', SET_NMR_STATUS: 'FORECAST_SET_NMR_STATUS', CLEAR_STATUS: 'FORECAST_CLEAR_STATUS' }; -exports.FORECAST = FORECAST; -const SUBMIT = { +const SUBMIT = exports.SUBMIT = { TOGGLE_IS_ASCEND: 'SUBMIT_TOGGLE_IS_ASCEND', TOGGLE_IS_INTENSITY: 'SUBMIT_TOGGLE_IS_INTENSITY', UPDATE_OPERATION: 'SUBMIT_UPDATE_OPERATION', UPDATE_DECIMAL: 'SUBMIT_UPDATE_DECIMAL' }; -exports.SUBMIT = SUBMIT; -const INTEGRATION = { +const INTEGRATION = exports.INTEGRATION = { RM_ONE: 'INTEGRATION_RM_ONE', SET_REF: 'INTEGRATION_SET_REF', SET_FKR: 'INTEGRATION_SET_FKR', @@ -92,12 +82,10 @@ const INTEGRATION = { CLEAR_ALL: 'INTEGRATION_CLEAR_ALL', SWEEP: 'INTEGRATION_SWEEP' }; -exports.INTEGRATION = INTEGRATION; -const SIMULATION = { +const SIMULATION = exports.SIMULATION = { RESET_ALL_RDC: 'SIMULATION_RESET_ALL_RDC' }; -exports.SIMULATION = SIMULATION; -const MULTIPLICITY = { +const MULTIPLICITY = exports.MULTIPLICITY = { ONE_CLICK: 'MULTIPLICITY_ONE_CLICK', ONE_CLICK_BY_UI: 'MULTIPLICITY_ONE_CLICK_BY_UI', PEAK_RM_BY_PANEL: 'MULTIPLICITY_PEAK_RM_BY_PANEL', @@ -114,24 +102,20 @@ const MULTIPLICITY = { UPDATE_J: 'MULTIPLICITY_UPDATE_J', CLEAR_ALL: 'MULTIPLICITY_CLEAR_ALL' }; -exports.MULTIPLICITY = MULTIPLICITY; -const META = { +const META = exports.META = { UPDATE_PEAKS: 'META_UPDATE_PEAKS', UPDATE_PEAKS_RDC: 'META_UPDATE_PEAKS_RDC' }; -exports.META = META; -const JCAMP = { +const JCAMP = exports.JCAMP = { ADD_OTHERS: 'JCAMP_ADD_OTHERS', RM_OTHERS_ONE: 'JCAMP_RM_OTHERS_ONE', TOGGLE_SHOW: 'JCAMP_TOGGLE_SHOW', CLEAR_ALL: 'JCAMP_CLEAR_ALL' }; -exports.JCAMP = JCAMP; -const XRD = { +const XRD = exports.XRD = { UPDATE_WAVE_LENGTH: 'UPDATE_WAVE_LENGTH' }; -exports.XRD = XRD; -const CYCLIC_VOLTA_METRY = { +const CYCLIC_VOLTA_METRY = exports.CYCLIC_VOLTA_METRY = { ADD_PAIR_PEAKS: 'ADD_PAIR_PEAKS', REMOVE_PAIR_PEAKS: 'REMOVE_PAIR_PEAKS', ADD_MAX_PEAK: 'ADD_MAX_PEAK', @@ -145,10 +129,8 @@ const CYCLIC_VOLTA_METRY = { RESETALL: 'RESETALL_VOLTA_METRY', SET_REF: 'VOLTA_METRY_SET_REF' }; -exports.CYCLIC_VOLTA_METRY = CYCLIC_VOLTA_METRY; -const CURVE = { +const CURVE = exports.CURVE = { SELECT_WORKING_CURVE: 'SELECT_WORKING_CURVE', SET_ALL_CURVES: 'SET_ALL_CURVES', SET_SHOULD_SHOW_ALL_CURVES: 'SET_SHOULD_SHOW_ALL_CURVES' -}; -exports.CURVE = CURVE; \ No newline at end of file +}; \ No newline at end of file diff --git a/dist/constants/list_layout.js b/dist/constants/list_layout.js index 20d27fb2..1c1399ac 100644 --- a/dist/constants/list_layout.js +++ b/dist/constants/list_layout.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.LIST_LAYOUT = void 0; -const LIST_LAYOUT = { +const LIST_LAYOUT = exports.LIST_LAYOUT = { PLAIN: 'PLAIN', IR: 'IR', RAMAN: 'RAMAN', @@ -26,5 +26,4 @@ const LIST_LAYOUT = { EMISSIONS: 'Emissions', DLS_ACF: 'DLS ACF', DLS_INTENSITY: 'DLS intensity' -}; -exports.LIST_LAYOUT = LIST_LAYOUT; \ No newline at end of file +}; \ No newline at end of file diff --git a/dist/constants/list_shift.js b/dist/constants/list_shift.js index f1416675..940a70e8 100644 --- a/dist/constants/list_shift.js +++ b/dist/constants/list_shift.js @@ -210,8 +210,7 @@ const cC6D5Cl4 = { value: 125.96, label: 'C6D5Cl' }; -const LIST_SHIFT_13C = [noReference, cActicAcidD4Sept, cActicAcidD4S, cAcetoneD6Sep, cAcetoneD6Broad, cAcetonitrileD3Sep, cAcetonitrileD3S, cBenzeneT, cChloroformDT, cCyclohexaneD12Quin, cDichloromethaneD2Quin, cDmfD7Sep1, cDmfD7Sep2, cDmfD7T3, cDioxaneD8Quin, cDmsoD6, cEthanolD6Sep, cEthanolD6Quin, cMethanolD4Sep, cPyridineD5T1, cPyridineD5T2, cPyridineD5T3, cThfD8Quin1, cThfD8Quin2, cTmsS, cTolueneD8Sep1, cTolueneD8T2, cTolueneD8T3, cTolueneD8T4, cTolueneD8T5, cTfaDQ1, cTfaDQ2, cTrifluoroethanolD3Quin, cTrifluoroethanolD3Broad, cC6D5Cl1, cC6D5Cl2, cC6D5Cl3, cC6D5Cl4]; -exports.LIST_SHIFT_13C = LIST_SHIFT_13C; +const LIST_SHIFT_13C = exports.LIST_SHIFT_13C = [noReference, cActicAcidD4Sept, cActicAcidD4S, cAcetoneD6Sep, cAcetoneD6Broad, cAcetonitrileD3Sep, cAcetonitrileD3S, cBenzeneT, cChloroformDT, cCyclohexaneD12Quin, cDichloromethaneD2Quin, cDmfD7Sep1, cDmfD7Sep2, cDmfD7T3, cDioxaneD8Quin, cDmsoD6, cEthanolD6Sep, cEthanolD6Quin, cMethanolD4Sep, cPyridineD5T1, cPyridineD5T2, cPyridineD5T3, cThfD8Quin1, cThfD8Quin2, cTmsS, cTolueneD8Sep1, cTolueneD8T2, cTolueneD8T3, cTolueneD8T4, cTolueneD8T5, cTfaDQ1, cTfaDQ2, cTrifluoroethanolD3Quin, cTrifluoroethanolD3Broad, cC6D5Cl1, cC6D5Cl2, cC6D5Cl3, cC6D5Cl4]; const hActicAcidD4Quin = { name: 'Acetic acid-d4 (quin)', value: 2.04, @@ -396,16 +395,11 @@ const hTrifluoroethanolD32 = { value: 5.02, label: 'Trifluoroethanol-d3' }; -const LIST_SHIFT_1H = [noReference, hActicAcidD4Quin, hActicAcidD4S, hAcetoneD6Quin, hAcetonitrileD3Qquin, hBenzeneS, hChloroformDS, hCyclohexaneD12S, hDeuteriumOxideS, hDichloroethaneD4S, hDichloromethaneD2T, hDMFD7Quin1, hDMFD7Quin2, hDMFD7Broad3, hDioxaneD8Broad, hDMSOD6Quin, hEthanolD6Broad1, hEthanolD6S2, hEthanolD6S3, hMethanolD4Quin, hMethanolD4S, hNitromethaneD3S, hPyridineD5Broad1, hPyridineD5Broad2, hPyridineD5Broad3, hTHFD8S1, hTHFD8S2, hTMSS, hTolueneD8Quin, hTolueneD8Boad2, hTolueneD8S3, hTolueneD8Broad4, hTFADS, hTrifluoroethanolD31, hTrifluoroethanolD32]; -exports.LIST_SHIFT_1H = LIST_SHIFT_1H; -const LIST_SHIFT_19F = []; -exports.LIST_SHIFT_19F = LIST_SHIFT_19F; -const LIST_SHIFT_31P = []; -exports.LIST_SHIFT_31P = LIST_SHIFT_31P; -const LIST_SHIFT_15N = []; -exports.LIST_SHIFT_15N = LIST_SHIFT_15N; -const LIST_SHIFT_29Si = []; -exports.LIST_SHIFT_29Si = LIST_SHIFT_29Si; +const LIST_SHIFT_1H = exports.LIST_SHIFT_1H = [noReference, hActicAcidD4Quin, hActicAcidD4S, hAcetoneD6Quin, hAcetonitrileD3Qquin, hBenzeneS, hChloroformDS, hCyclohexaneD12S, hDeuteriumOxideS, hDichloroethaneD4S, hDichloromethaneD2T, hDMFD7Quin1, hDMFD7Quin2, hDMFD7Broad3, hDioxaneD8Broad, hDMSOD6Quin, hEthanolD6Broad1, hEthanolD6S2, hEthanolD6S3, hMethanolD4Quin, hMethanolD4S, hNitromethaneD3S, hPyridineD5Broad1, hPyridineD5Broad2, hPyridineD5Broad3, hTHFD8S1, hTHFD8S2, hTMSS, hTolueneD8Quin, hTolueneD8Boad2, hTolueneD8S3, hTolueneD8Broad4, hTFADS, hTrifluoroethanolD31, hTrifluoroethanolD32]; +const LIST_SHIFT_19F = exports.LIST_SHIFT_19F = []; +const LIST_SHIFT_31P = exports.LIST_SHIFT_31P = []; +const LIST_SHIFT_15N = exports.LIST_SHIFT_15N = []; +const LIST_SHIFT_29Si = exports.LIST_SHIFT_29Si = []; const getListShift = layoutSt => { switch (layoutSt) { case _list_layout.LIST_LAYOUT.H1: diff --git a/dist/constants/list_ui.js b/dist/constants/list_ui.js index 43cac62d..ad219334 100644 --- a/dist/constants/list_ui.js +++ b/dist/constants/list_ui.js @@ -4,12 +4,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.LIST_UI_VIEWER_TYPE = exports.LIST_UI_SWEEP_TYPE = exports.LIST_NON_BRUSH_TYPES = void 0; -const LIST_UI_VIEWER_TYPE = { +const LIST_UI_VIEWER_TYPE = exports.LIST_UI_VIEWER_TYPE = { SPECTRUM: 'spectrum', ANALYSIS: 'analysis' }; -exports.LIST_UI_VIEWER_TYPE = LIST_UI_VIEWER_TYPE; -const LIST_UI_SWEEP_TYPE = { +const LIST_UI_SWEEP_TYPE = exports.LIST_UI_SWEEP_TYPE = { ZOOMIN: 'zoom in', ZOOMRESET: 'zoom reset', INTEGRATION_ADD: 'integration add', @@ -33,6 +32,4 @@ const LIST_UI_SWEEP_TYPE = { CYCLIC_VOLTA_RM_PECKER: 'cyclic voltammetry remove pecker', CYCLIC_VOLTA_SET_REF: 'cyclic voltammetry set ref' }; -exports.LIST_UI_SWEEP_TYPE = LIST_UI_SWEEP_TYPE; -const LIST_NON_BRUSH_TYPES = [LIST_UI_SWEEP_TYPE.PEAK_ADD, LIST_UI_SWEEP_TYPE.PEAK_DELETE, LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT, LIST_UI_SWEEP_TYPE.INTEGRATION_RM, LIST_UI_SWEEP_TYPE.INTEGRATION_SET_REF, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_ADD, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_RM, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_CLICK, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_RM, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_PECKER, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_PECKER, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_SET_REF]; -exports.LIST_NON_BRUSH_TYPES = LIST_NON_BRUSH_TYPES; \ No newline at end of file +const LIST_NON_BRUSH_TYPES = exports.LIST_NON_BRUSH_TYPES = [LIST_UI_SWEEP_TYPE.PEAK_ADD, LIST_UI_SWEEP_TYPE.PEAK_DELETE, LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT, LIST_UI_SWEEP_TYPE.INTEGRATION_RM, LIST_UI_SWEEP_TYPE.INTEGRATION_SET_REF, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_ADD, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_RM, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_CLICK, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_RM, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_PECKER, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_PECKER, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_SET_REF]; \ No newline at end of file diff --git a/dist/constants/list_wavelength.js b/dist/constants/list_wavelength.js index 77a2c998..069761ea 100644 --- a/dist/constants/list_wavelength.js +++ b/dist/constants/list_wavelength.js @@ -28,5 +28,4 @@ const MoKalpha = { label: 'Mo K-alpha', unit: 'nm' }; -const LIST_WAVE_LENGTH = [CuKalpha, Fe, Co, MoKalpha]; -exports.LIST_WAVE_LENGTH = LIST_WAVE_LENGTH; \ No newline at end of file +const LIST_WAVE_LENGTH = exports.LIST_WAVE_LENGTH = [CuKalpha, Fe, Co, MoKalpha]; \ No newline at end of file diff --git a/dist/fn.js b/dist/fn.js index 9138b3a6..348a8fe8 100644 --- a/dist/fn.js +++ b/dist/fn.js @@ -20,5 +20,4 @@ const FN = Object.assign({}, _format.default, { CalcMpyCenter: _multiplicity_calc.calcMpyCenter, CarbonFeatures: _carbonFeatures.carbonFeatures }); -var _default = FN; -exports.default = _default; \ No newline at end of file +var _default = exports.default = FN; \ No newline at end of file diff --git a/dist/helpers/brush.js b/dist/helpers/brush.js index f92c45f1..4f4b8024 100644 --- a/dist/helpers/brush.js +++ b/dist/helpers/brush.js @@ -94,10 +94,9 @@ const MountBrush = (focus, isUiAddIntgSt, isUiNoBrushSt) => { } svg.on('wheel', wheeledCb); }; -var _default = MountBrush; // const resetedCb = () => reseted(main); +var _default = exports.default = MountBrush; // const resetedCb = () => reseted(main); // main.svg.on('dblclick', resetedCb); // const reseted = (main) => { // const { selectUiSweepAct } = main; // selectUiSweepAct({ xExtent: false, yExtent: false }); -// }; -exports.default = _default; \ No newline at end of file +// }; \ No newline at end of file diff --git a/dist/helpers/cfg.js b/dist/helpers/cfg.js index ae0364bc..cacd5484 100644 --- a/dist/helpers/cfg.js +++ b/dist/helpers/cfg.js @@ -50,5 +50,4 @@ const Config = { showTwoThreshold, hidePanelCyclicVolta }; -var _default = Config; -exports.default = _default; \ No newline at end of file +var _default = exports.default = Config; \ No newline at end of file diff --git a/dist/helpers/chem.js b/dist/helpers/chem.js index 88876dd1..3561e1f4 100644 --- a/dist/helpers/chem.js +++ b/dist/helpers/chem.js @@ -87,8 +87,7 @@ const convertTopic = (topic, layout, feature, offset) => { return calcXY(xs, ys, maxY, offset); }; exports.convertTopic = convertTopic; -const Topic2Seed = (0, _reselect.createSelector)(getTopic, getLayout, getFeature, getShiftOffset, convertTopic); -exports.Topic2Seed = Topic2Seed; +const Topic2Seed = exports.Topic2Seed = (0, _reselect.createSelector)(getTopic, getLayout, getFeature, getShiftOffset, convertTopic); const getOthers = (_, props) => props.comparisons; const calcRescaleXY = (xs, ys, minY, maxY, show) => { const sp = []; @@ -126,8 +125,7 @@ const convertComparisons = (layout, comparisons, feature) => { return calcRescaleXY(xs, ys, minY, maxY, show); }); }; -const GetComparisons = (0, _reselect.createSelector)(getLayout, getOthers, getFeature, convertComparisons); -exports.GetComparisons = GetComparisons; +const GetComparisons = exports.GetComparisons = (0, _reselect.createSelector)(getLayout, getOthers, getFeature, convertComparisons); const convertFrequency = (layout, feature) => { if (['1H', '13C', '19F', '31P', '15N', '29Si'].indexOf(layout) < 0) return false; const { @@ -136,8 +134,7 @@ const convertFrequency = (layout, feature) => { const freq = Array.isArray(observeFrequency) ? observeFrequency[0] : observeFrequency; return parseFloat(freq) || false; }; -const ToFrequency = (0, _reselect.createSelector)(getLayout, getFeature, convertFrequency); -exports.ToFrequency = ToFrequency; +const ToFrequency = exports.ToFrequency = (0, _reselect.createSelector)(getLayout, getFeature, convertFrequency); const getThreshold = state => state.threshold ? state.threshold.value * 1.0 : false; const Convert2Peak = function (feature, threshold, offset) { let upThreshold = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false; @@ -202,8 +199,7 @@ const Convert2Peak = function (feature, threshold, offset) { return peak; }; exports.Convert2Peak = Convert2Peak; -const Feature2Peak = (0, _reselect.createSelector)(getFeature, getThreshold, getShiftOffset, Convert2Peak); -exports.Feature2Peak = Feature2Peak; +const Feature2Peak = exports.Feature2Peak = (0, _reselect.createSelector)(getFeature, getThreshold, getShiftOffset, Convert2Peak); const Convert2MaxMinPeak = (layout, feature, offset) => { const peaks = { max: [], @@ -277,8 +273,7 @@ const Convert2MaxMinPeak = (layout, feature, offset) => { return peaks; }; exports.Convert2MaxMinPeak = Convert2MaxMinPeak; -const Feature2MaxMinPeak = (0, _reselect.createSelector)(getLayout, getFeature, getShiftOffset, Convert2MaxMinPeak); -exports.Feature2MaxMinPeak = Feature2MaxMinPeak; +const Feature2MaxMinPeak = exports.Feature2MaxMinPeak = (0, _reselect.createSelector)(getLayout, getFeature, getShiftOffset, Convert2MaxMinPeak); const convertThresEndPts = (feature, threshold) => { const { maxY, @@ -298,8 +293,7 @@ const convertThresEndPts = (feature, threshold) => { }]; return endPts; }; -const ToThresEndPts = (0, _reselect.createSelector)(getFeature, getThreshold, convertThresEndPts); -exports.ToThresEndPts = ToThresEndPts; +const ToThresEndPts = exports.ToThresEndPts = (0, _reselect.createSelector)(getFeature, getThreshold, convertThresEndPts); const getShiftPeak = state => { const { curve, @@ -324,12 +318,11 @@ const convertSfPeaks = (peak, offset) => { y: peak.y }]; }; -const ToShiftPeaks = (0, _reselect.createSelector)(getShiftPeak, getShiftOffset, convertSfPeaks); +const ToShiftPeaks = exports.ToShiftPeaks = (0, _reselect.createSelector)(getShiftPeak, getShiftOffset, convertSfPeaks); // - - - - - - - - - - - - - - - - - - - - - - // ExtractJcamp // - - - - - - - - - - - - - - - - - - - - - - -exports.ToShiftPeaks = ToShiftPeaks; const readLayout = jcamp => { const { xType, diff --git a/dist/helpers/format.js b/dist/helpers/format.js index e2eb4820..9b42bc78 100644 --- a/dist/helpers/format.js +++ b/dist/helpers/format.js @@ -528,5 +528,4 @@ const Format = { isDLSACFLayout, strNumberFixedDecimal }; -var _default = Format; -exports.default = _default; \ No newline at end of file +var _default = exports.default = Format; \ No newline at end of file diff --git a/dist/helpers/multiplicity.js b/dist/helpers/multiplicity.js index 155038e2..c1a420b4 100644 --- a/dist/helpers/multiplicity.js +++ b/dist/helpers/multiplicity.js @@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.mpyBasicPatterns = exports.groupInterval = exports.getInterval = void 0; -const mpyBasicPatterns = ['s', 'd', 't', 'q', 'quint', 'h', 'sept', 'o', 'n']; -exports.mpyBasicPatterns = mpyBasicPatterns; +const mpyBasicPatterns = exports.mpyBasicPatterns = ['s', 'd', 't', 'q', 'quint', 'h', 'sept', 'o', 'n']; const getInterval = peaks => { let itvs = []; for (let idx = 0; idx < peaks.length - 1; idx += 1) { diff --git a/dist/helpers/zoom.js b/dist/helpers/zoom.js index a54d1a41..623e15bc 100644 --- a/dist/helpers/zoom.js +++ b/dist/helpers/zoom.js @@ -21,5 +21,4 @@ const MountZoom = (main, zoomed) => { main.zoom.on('zoom', zoomedCb); main.svg.call(main.zoom).on('contextmenu.zoom', resetZoomCb); }; -var _default = MountZoom; -exports.default = _default; \ No newline at end of file +var _default = exports.default = MountZoom; \ No newline at end of file diff --git a/dist/index.js b/dist/index.js index a9976f61..110a9d7d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -3,9 +3,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); var _react = _interopRequireDefault(require("react")); var _reactDom = _interopRequireDefault(require("react-dom")); -var _InputBase = _interopRequireDefault(require("@material-ui/core/InputBase")); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); -var _Button = _interopRequireDefault(require("@material-ui/core/Button")); +var _material = require("@mui/material"); var _reactQuill = _interopRequireDefault(require("react-quill")); var _app = require("./app"); var _nmr1h_jcamp = _interopRequireDefault(require("./__tests__/fixtures/nmr1h_jcamp")); @@ -538,151 +536,151 @@ class DemoWriteIr extends _react.default.Component { style: { margin: '0 0 15px 55px' } - }, /*#__PURE__*/_react.default.createElement(_Button.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('nmr 1h') - }, "NMR 1H"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "NMR 1H"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('nmr 13c') - }, "NMR 13C"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "NMR 13C"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('nmr 13c dept') - }, "NMR 13C DEPT"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "NMR 13C DEPT"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('nmr 19f') - }, "NMR 19F"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "NMR 19F"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('nmr 31p') - }, "NMR 31P"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "NMR 31P"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('nmr 15n') - }, "NMR 15N"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "NMR 15N"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('nmr 29si') - }, "NMR 29Si"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "NMR 29Si"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('ir') - }, "IR"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "IR"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('raman') - }, "RAMAN"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "RAMAN"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('uv/vis') - }, "UV/VIS"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "UV/VIS"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('hplc uv/vis') - }, "HPLC UV/VIS"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "HPLC UV/VIS"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('tga') - }, "TGA"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "TGA"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('xrd') - }, "XRD"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "XRD"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('cyclic volta') - }, "CV"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "CV"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('cds') - }, "CDS"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "CDS"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('sec') - }, "SEC"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "SEC"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('aif') - }, "SOPTION-DESORPTION"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "SOPTION-DESORPTION"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('emissions') - }, "EMISSIONS"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "EMISSIONS"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('dls acf') - }, "DLS ACF"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "DLS ACF"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('dls intensity') - }, "DLS intensity"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "DLS intensity"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('ms') - }, "MS"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "MS"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('multi') - }, "Multi NMR"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "Multi NMR"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('multi ir') - }, "Multi IR"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "Multi IR"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('multi hplc') - }, "Multi HPLC"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "Multi HPLC"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' @@ -708,12 +706,12 @@ class DemoWriteIr extends _react.default.Component { toolbar: false }, readOnly: true - })), /*#__PURE__*/_react.default.createElement(_Grid.default, { + })), /*#__PURE__*/_react.default.createElement(_material.Grid, { container: true - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { item: true, xs: 10 - }, /*#__PURE__*/_react.default.createElement(_InputBase.default, { + }, /*#__PURE__*/_react.default.createElement(_material.InputBase, { style: { margin: '0 0 0 63px' }, diff --git a/dist/layer_content.js b/dist/layer_content.js index c2208292..d19f7380 100644 --- a/dist/layer_content.js +++ b/dist/layer_content.js @@ -101,5 +101,4 @@ Content.propTypes = { operations: _propTypes.default.array.isRequired, layoutSt: _propTypes.default.string.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps))(Content); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps))(Content); \ No newline at end of file diff --git a/dist/layer_init.js b/dist/layer_init.js index d54f4705..e2fac642 100644 --- a/dist/layer_init.js +++ b/dist/layer_init.js @@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react")); var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _styles = require("@material-ui/core/styles"); +var _styles = require("@mui/styles"); var _submit = require("./actions/submit"); var _manager = require("./actions/manager"); var _meta = require("./actions/meta"); @@ -214,7 +214,6 @@ LayerInit.propTypes = { setAllCurvesAct: _propTypes.default.func.isRequired, userManualLink: _propTypes.default.object // eslint-disable-line }; -var _default = (0, _reactRedux.connect)( +var _default = exports.default = (0, _reactRedux.connect)( // eslint-disable-line -mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(LayerInit)); // eslint-disable-line -exports.default = _default; \ No newline at end of file +mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(LayerInit)); // eslint-disable-line \ No newline at end of file diff --git a/dist/layer_prism.js b/dist/layer_prism.js index e30304a8..1c9dbf0d 100644 --- a/dist/layer_prism.js +++ b/dist/layer_prism.js @@ -9,8 +9,8 @@ var _react = _interopRequireDefault(require("react")); var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); -var _styles = require("@material-ui/core/styles"); +var _Grid = _interopRequireDefault(require("@mui/material/Grid")); +var _styles = require("@mui/styles"); var _index = _interopRequireDefault(require("./components/panel/index")); var _index2 = _interopRequireDefault(require("./components/cmd_bar/index")); var _layer_content = _interopRequireDefault(require("./layer_content")); @@ -131,7 +131,6 @@ LayerPrism.propTypes = { canChangeDescription: _propTypes.default.bool.isRequired, onDescriptionChanged: _propTypes.default.func }; -var _default = (0, _reactRedux.connect)( +var _default = exports.default = (0, _reactRedux.connect)( // eslint-disable-line -mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(LayerPrism)); // eslint-disable-line -exports.default = _default; \ No newline at end of file +mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(LayerPrism)); // eslint-disable-line \ No newline at end of file diff --git a/dist/reducers/index.js b/dist/reducers/index.js index 0eed6edd..7757dfb2 100644 --- a/dist/reducers/index.js +++ b/dist/reducers/index.js @@ -44,5 +44,4 @@ const rootReducer = (0, _redux.combineReducers)({ cyclicvolta: _reducer_voltammetry.default, curve: _reducer_curve.default }); -var _default = rootReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = rootReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_curve.js b/dist/reducers/reducer_curve.js index 7816c399..7e244fd1 100644 --- a/dist/reducers/reducer_curve.js +++ b/dist/reducers/reducer_curve.js @@ -73,5 +73,4 @@ const curveReducer = function () { return state; } }; -var _default = curveReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = curveReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_edit_peak.js b/dist/reducers/reducer_edit_peak.js index 2fca5bf3..4cdb8232 100644 --- a/dist/reducers/reducer_edit_peak.js +++ b/dist/reducers/reducer_edit_peak.js @@ -208,5 +208,4 @@ const editPeakReducer = function () { } }; const undoableEditPeakReducer = (0, _reduxUndo.default)(editPeakReducer, _undo_redo_config.undoRedoConfig); -var _default = undoableEditPeakReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = undoableEditPeakReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_forecast.js b/dist/reducers/reducer_forecast.js index 7f06b9d1..cecf7278 100644 --- a/dist/reducers/reducer_forecast.js +++ b/dist/reducers/reducer_forecast.js @@ -119,5 +119,4 @@ const forecastReducer = function () { return state; } }; -var _default = forecastReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = forecastReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_integration.js b/dist/reducers/reducer_integration.js index 0d009fc7..0fd8b983 100644 --- a/dist/reducers/reducer_integration.js +++ b/dist/reducers/reducer_integration.js @@ -233,5 +233,4 @@ const integrationReducer = function () { } }; const undoableIntegrationReducer = (0, _reduxUndo.default)(integrationReducer, _undo_redo_config.undoRedoConfig); -var _default = undoableIntegrationReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = undoableIntegrationReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_jcamp.js b/dist/reducers/reducer_jcamp.js index 2044ac4e..a4d475f6 100644 --- a/dist/reducers/reducer_jcamp.js +++ b/dist/reducers/reducer_jcamp.js @@ -99,5 +99,4 @@ const layoutReducer = function () { return state; } }; -var _default = layoutReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = layoutReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_layout.js b/dist/reducers/reducer_layout.js index c99b8bda..95b82d53 100644 --- a/dist/reducers/reducer_layout.js +++ b/dist/reducers/reducer_layout.js @@ -21,5 +21,4 @@ const layoutReducer = function () { return state; } }; -var _default = layoutReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = layoutReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_manager.js b/dist/reducers/reducer_manager.js index 7924c69b..e7535ed5 100644 --- a/dist/reducers/reducer_manager.js +++ b/dist/reducers/reducer_manager.js @@ -16,5 +16,4 @@ const managerReducer = function () { return state; } }; -var _default = managerReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = managerReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_meta.js b/dist/reducers/reducer_meta.js index 9b64b1d3..c9b796a4 100644 --- a/dist/reducers/reducer_meta.js +++ b/dist/reducers/reducer_meta.js @@ -25,5 +25,4 @@ const metaReducer = function () { return state; } }; -var _default = metaReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = metaReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_multiplicity.js b/dist/reducers/reducer_multiplicity.js index 27029c7c..9785172f 100644 --- a/dist/reducers/reducer_multiplicity.js +++ b/dist/reducers/reducer_multiplicity.js @@ -196,5 +196,4 @@ const multiplicityReducer = function () { } }; const undoableMultiplicityReducer = (0, _reduxUndo.default)(multiplicityReducer, _undo_redo_config.undoRedoConfig); -var _default = undoableMultiplicityReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = undoableMultiplicityReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_scan.js b/dist/reducers/reducer_scan.js index 4d746422..e870a829 100644 --- a/dist/reducers/reducer_scan.js +++ b/dist/reducers/reducer_scan.js @@ -45,5 +45,4 @@ const scanReducer = function () { return state; } }; -var _default = scanReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = scanReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_shift.js b/dist/reducers/reducer_shift.js index 31d271e7..8d5511fc 100644 --- a/dist/reducers/reducer_shift.js +++ b/dist/reducers/reducer_shift.js @@ -242,5 +242,4 @@ const shiftReducer = function () { return state; } }; -var _default = shiftReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = shiftReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_simulation.js b/dist/reducers/reducer_simulation.js index 66390439..a74c426e 100644 --- a/dist/reducers/reducer_simulation.js +++ b/dist/reducers/reducer_simulation.js @@ -24,5 +24,4 @@ const simulatioinReducer = function () { return state; } }; -var _default = simulatioinReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = simulatioinReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_status.js b/dist/reducers/reducer_status.js index 0b444087..e0382afa 100644 --- a/dist/reducers/reducer_status.js +++ b/dist/reducers/reducer_status.js @@ -46,5 +46,4 @@ const statusReducer = function () { return initialState; } }; -var _default = statusReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = statusReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_submit.js b/dist/reducers/reducer_submit.js index 0cb0461e..5d672703 100644 --- a/dist/reducers/reducer_submit.js +++ b/dist/reducers/reducer_submit.js @@ -58,5 +58,4 @@ const submitReducer = function () { return state; } }; -var _default = submitReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = submitReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_threshold.js b/dist/reducers/reducer_threshold.js index 96960c21..a748e146 100644 --- a/dist/reducers/reducer_threshold.js +++ b/dist/reducers/reducer_threshold.js @@ -49,5 +49,4 @@ const thresholdReducer = function () { return state; } }; -var _default = thresholdReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = thresholdReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_ui.js b/dist/reducers/reducer_ui.js index c9f3e8c2..b1f6aff5 100644 --- a/dist/reducers/reducer_ui.js +++ b/dist/reducers/reducer_ui.js @@ -48,5 +48,4 @@ const uiReducer = function () { return state; } }; -var _default = uiReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = uiReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_voltammetry.js b/dist/reducers/reducer_voltammetry.js index eb22b26e..29e826d3 100644 --- a/dist/reducers/reducer_voltammetry.js +++ b/dist/reducers/reducer_voltammetry.js @@ -340,5 +340,4 @@ const cyclicVoltaReducer = function () { return state; } }; -var _default = cyclicVoltaReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = cyclicVoltaReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_wavelength.js b/dist/reducers/reducer_wavelength.js index 50ee50e4..424df2a1 100644 --- a/dist/reducers/reducer_wavelength.js +++ b/dist/reducers/reducer_wavelength.js @@ -19,5 +19,4 @@ const wavelengthReducer = function () { return state; } }; -var _default = wavelengthReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = wavelengthReducer; \ No newline at end of file diff --git a/dist/reducers/undo_redo_config.js b/dist/reducers/undo_redo_config.js index cb64f144..b4248a57 100644 --- a/dist/reducers/undo_redo_config.js +++ b/dist/reducers/undo_redo_config.js @@ -6,14 +6,12 @@ Object.defineProperty(exports, "__esModule", { exports.undoRedoConfig = exports.undoRedoActions = void 0; var _reduxUndo = require("redux-undo"); var _action_type = require("../constants/action_type"); -const undoRedoActions = [_action_type.EDITPEAK.ADD_POSITIVE, _action_type.EDITPEAK.ADD_NEGATIVE, _action_type.EDITPEAK.RM_POSITIVE, _action_type.EDITPEAK.RM_NEGATIVE, _action_type.EDITPEAK.SHIFT, _action_type.MANAGER.RESETALL, _action_type.MANAGER.RESETSHIFT, _action_type.MANAGER.RESET_INIT_COMMON, _action_type.MANAGER.RESET_INIT_NMR, _action_type.MANAGER.RESET_INIT_MS, _action_type.MANAGER.RESET_INIT_COMMON_WITH_INTERGATION, _action_type.UI.SWEEP.SELECT_INTEGRATION, _action_type.UI.SWEEP.SELECT_MULTIPLICITY_RDC, _action_type.INTEGRATION.RM_ONE, _action_type.INTEGRATION.SET_REF, _action_type.INTEGRATION.SET_FKR, _action_type.INTEGRATION.RESET_ALL, _action_type.INTEGRATION.CLEAR_ALL, _action_type.MULTIPLICITY.PEAK_RM_BY_PANEL_RDC, _action_type.MULTIPLICITY.PEAK_RM_BY_UI_RDC, _action_type.MULTIPLICITY.PEAK_ADD_BY_UI_RDC, _action_type.MULTIPLICITY.RESET_ONE_RDC, _action_type.MULTIPLICITY.UPDATE_J, _action_type.MULTIPLICITY.TYPE_SELECT_RDC, _action_type.MULTIPLICITY.ONE_CLICK, _action_type.MULTIPLICITY.ONE_CLICK_BY_UI, _action_type.MULTIPLICITY.RESET_ALL_RDC, _action_type.MULTIPLICITY.CLEAR_ALL]; -exports.undoRedoActions = undoRedoActions; -const undoRedoConfig = { +const undoRedoActions = exports.undoRedoActions = [_action_type.EDITPEAK.ADD_POSITIVE, _action_type.EDITPEAK.ADD_NEGATIVE, _action_type.EDITPEAK.RM_POSITIVE, _action_type.EDITPEAK.RM_NEGATIVE, _action_type.EDITPEAK.SHIFT, _action_type.MANAGER.RESETALL, _action_type.MANAGER.RESETSHIFT, _action_type.MANAGER.RESET_INIT_COMMON, _action_type.MANAGER.RESET_INIT_NMR, _action_type.MANAGER.RESET_INIT_MS, _action_type.MANAGER.RESET_INIT_COMMON_WITH_INTERGATION, _action_type.UI.SWEEP.SELECT_INTEGRATION, _action_type.UI.SWEEP.SELECT_MULTIPLICITY_RDC, _action_type.INTEGRATION.RM_ONE, _action_type.INTEGRATION.SET_REF, _action_type.INTEGRATION.SET_FKR, _action_type.INTEGRATION.RESET_ALL, _action_type.INTEGRATION.CLEAR_ALL, _action_type.MULTIPLICITY.PEAK_RM_BY_PANEL_RDC, _action_type.MULTIPLICITY.PEAK_RM_BY_UI_RDC, _action_type.MULTIPLICITY.PEAK_ADD_BY_UI_RDC, _action_type.MULTIPLICITY.RESET_ONE_RDC, _action_type.MULTIPLICITY.UPDATE_J, _action_type.MULTIPLICITY.TYPE_SELECT_RDC, _action_type.MULTIPLICITY.ONE_CLICK, _action_type.MULTIPLICITY.ONE_CLICK_BY_UI, _action_type.MULTIPLICITY.RESET_ALL_RDC, _action_type.MULTIPLICITY.CLEAR_ALL]; +const undoRedoConfig = exports.undoRedoConfig = { debug: false, limit: 10, ignoreInitialState: true, filter: (0, _reduxUndo.includeAction)(undoRedoActions), clearHistoryType: [_action_type.EDITPEAK.SHIFT, _action_type.MANAGER.RESETALL, _action_type.MANAGER.RESETSHIFT, _action_type.MANAGER.RESET_INIT_COMMON, _action_type.MANAGER.RESET_INIT_NMR, _action_type.MANAGER.RESET_INIT_MS, _action_type.MANAGER.RESET_INIT_COMMON_WITH_INTERGATION], neverSkipReducer: [_action_type.EDITPEAK.SHIFT, _action_type.MANAGER.RESETALL, _action_type.MANAGER.RESETSHIFT, _action_type.MANAGER.RESET_INIT_COMMON, _action_type.MANAGER.RESET_INIT_NMR, _action_type.MANAGER.RESET_INIT_MS, _action_type.MANAGER.RESET_INIT_COMMON_WITH_INTERGATION] -}; -exports.undoRedoConfig = undoRedoConfig; \ No newline at end of file +}; \ No newline at end of file diff --git a/dist/sagas/saga_edit_peak.js b/dist/sagas/saga_edit_peak.js index b331ef2d..a68ad59d 100644 --- a/dist/sagas/saga_edit_peak.js +++ b/dist/sagas/saga_edit_peak.js @@ -61,7 +61,7 @@ function* addVirtualFactor(action) { }); } const editPeakSagas = [(0, _effects.takeEvery)(_action_type.SHIFT.SET_REF, addVirtualFactor), (0, _effects.takeEvery)(_action_type.SHIFT.SET_PEAK, addVirtualFactor)]; -var _default = editPeakSagas; +var _default = exports.default = editPeakSagas; /* LOGIC -no po - tg | picked | another | absoffset | prevOffset | relative | newOffset @@ -72,5 +72,4 @@ var _default = editPeakSagas; 3 | 20 0 +20 -100 -120 ------------------------------------------------------------------- -*/ -exports.default = _default; \ No newline at end of file +*/ \ No newline at end of file diff --git a/dist/sagas/saga_manager.js b/dist/sagas/saga_manager.js index 108103f0..e87aec57 100644 --- a/dist/sagas/saga_manager.js +++ b/dist/sagas/saga_manager.js @@ -94,5 +94,4 @@ function* resetInitCommonWithIntergation(action) { } } const managerSagas = [(0, _effects.takeEvery)(_action_type.MANAGER.RESETALL, resetShift), (0, _effects.takeEvery)(_action_type.MANAGER.RESET_INIT_NMR, resetInitNmr), (0, _effects.takeEvery)(_action_type.MANAGER.RESET_INIT_COMMON_WITH_INTERGATION, resetInitCommonWithIntergation)]; -var _default = managerSagas; -exports.default = _default; \ No newline at end of file +var _default = exports.default = managerSagas; \ No newline at end of file diff --git a/dist/sagas/saga_meta.js b/dist/sagas/saga_meta.js index 9ec49869..fb1ebbad 100644 --- a/dist/sagas/saga_meta.js +++ b/dist/sagas/saga_meta.js @@ -33,5 +33,4 @@ function* updateMetaPeaks(action) { }); } const metaSagas = [(0, _effects.takeEvery)(_action_type.META.UPDATE_PEAKS, updateMetaPeaks)]; -var _default = metaSagas; -exports.default = _default; \ No newline at end of file +var _default = exports.default = metaSagas; \ No newline at end of file diff --git a/dist/sagas/saga_multi_entities.js b/dist/sagas/saga_multi_entities.js index 2d8b0b94..fa644f9a 100644 --- a/dist/sagas/saga_multi_entities.js +++ b/dist/sagas/saga_multi_entities.js @@ -73,5 +73,4 @@ function* setCyclicVoltametry(action) { } } const multiEntitiesSagas = [(0, _effects.takeEvery)(_action_type.CURVE.SET_ALL_CURVES, setCyclicVoltametry)]; -var _default = multiEntitiesSagas; -exports.default = _default; \ No newline at end of file +var _default = exports.default = multiEntitiesSagas; \ No newline at end of file diff --git a/dist/sagas/saga_multiplicity.js b/dist/sagas/saga_multiplicity.js index e771f8e6..6c1ef7c1 100644 --- a/dist/sagas/saga_multiplicity.js +++ b/dist/sagas/saga_multiplicity.js @@ -379,5 +379,4 @@ function* selectMpyType(action) { }); } const multiplicitySagas = [(0, _effects.takeEvery)(_action_type.UI.SWEEP.SELECT_MULTIPLICITY, selectMpy), (0, _effects.takeEvery)(_action_type.MULTIPLICITY.PEAK_ADD_BY_UI_SAG, addUiPeakToStack), (0, _effects.takeEvery)(_action_type.MULTIPLICITY.PEAK_RM_BY_PANEL, rmPanelPeakFromStack), (0, _effects.takeEvery)(_action_type.MULTIPLICITY.PEAK_RM_BY_UI, rmUiPeakFromStack), (0, _effects.takeEvery)(_action_type.MULTIPLICITY.TYPE_SELECT, selectMpyType), (0, _effects.takeEvery)(_action_type.MULTIPLICITY.RESET_ONE, resetOne), (0, _effects.takeEvery)(_action_type.MANAGER.RESET_INIT_NMR, resetInitNmr)]; -var _default = multiplicitySagas; -exports.default = _default; \ No newline at end of file +var _default = exports.default = multiplicitySagas; \ No newline at end of file diff --git a/dist/sagas/saga_ui.js b/dist/sagas/saga_ui.js index 9efd74ec..48da5752 100644 --- a/dist/sagas/saga_ui.js +++ b/dist/sagas/saga_ui.js @@ -317,5 +317,4 @@ function* clickUiTarget(action) { } } const managerSagas = [(0, _effects.takeEvery)(_action_type.UI.CLICK_TARGET, clickUiTarget), (0, _effects.takeEvery)(_action_type.UI.SWEEP.SELECT, selectUiSweep), (0, _effects.takeEvery)(_action_type.UI.WHEEL.SCROLL, scrollUiWheel)]; -var _default = managerSagas; -exports.default = _default; \ No newline at end of file +var _default = exports.default = managerSagas; \ No newline at end of file diff --git a/dist/third_party/jAnalyzer.js b/dist/third_party/jAnalyzer.js index b6186956..84032a1d 100644 --- a/dist/third_party/jAnalyzer.js +++ b/dist/third_party/jAnalyzer.js @@ -15,7 +15,7 @@ const patterns = ['s', 'd', 't', 'q', 'quint', 'h', 'sept', 'o', 'n']; let symRatio = 1.5; let maxErrorIter1 = 2.5; // Hz let maxErrorIter2 = 1; // Hz -var _default = { +var _default = exports.default = { /** * The compilation process implements at the first stage a normalization procedure described by Golotvin et al. * embedding in peak-component-counting method described by Hoyes et al. @@ -138,7 +138,6 @@ var _default = { * @param {*} signal * @param {*} Jc */ -exports.default = _default; function updateSignal(signal, Jc) { // Update the limits of the signal let peaks = signal.peaksComp; // Always in Hz diff --git a/package.json b/package.json index ca9a1ef2..c493909b 100644 --- a/package.json +++ b/package.json @@ -8,33 +8,31 @@ }, "license": "AGPL-3.0", "dependencies": { - "@babel/preset-env": "^7.21.5", - "@babel/preset-react": "^7.18.6", "@complat/react-svg-file-zoom-pan": "1.1.1", - "@material-ui/core": "^4.10.0", - "@material-ui/icons": "^4.10.0", - "@mdi/js": "^4.7.95", - "@mdi/react": "^1.2.1", - "@testing-library/jest-dom": "^5.16.5", - "@testing-library/react": "12.1.5", + "@emotion/react": "^11.11.1", + "@emotion/styled": "^11.11.0", + "@mdi/js": "^7.2.96", + "@mdi/react": "^1.6.1", + "@mui/icons-material": "^5.14.9", + "@mui/material": "^5.14.9", + "@mui/styles": "^5.14.9", "@types/jest": "^29.5.0", "@types/node": "^18.15.11", "@types/react": "^18.0.34", "@types/react-dom": "^18.0.11", "babel-plugin-transform-object-rest-spread": "^6.26.0", "browserslist": "^4.21.5", - "classnames": "^2.2.6", + "classnames": "^2.3.2", "d3": "^5.16.0", "d3-brush": "3.0.0", "d3-selection": "^2.0.0", "d3-tip": "^0.9.1", "jcampconverter": "4.1.0", "ml-savitzky-golay-generalized": "1.1.1", - "prop-types": "^15.7.2", + "prop-types": "^15.8.1", "react-dropzone": "^8.0.3", "react-quill": "^2.0.0", "react-redux": "^7.2.0", - "react-svg-inline": "^2.1.1", "redux": "^4.1.1", "redux-saga": "^1.1.3", "redux-undo": "^1.1.0", @@ -62,6 +60,8 @@ "@babel/preset-env": "^7.21.5", "@babel/preset-react": "^7.18.6", "@storybook/react": "7.0.7", + "@testing-library/jest-dom": "^5.17.0", + "@testing-library/react": "12.1.5", "@types/enzyme": "^3.10.13", "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0", "babel-loader": "8.2.5", diff --git a/src/__tests__/units/components/cmd_bar/01_viewer.test.js b/src/__tests__/units/components/cmd_bar/01_viewer.test.js new file mode 100644 index 00000000..994f026b --- /dev/null +++ b/src/__tests__/units/components/cmd_bar/01_viewer.test.js @@ -0,0 +1,49 @@ +import configureStore from 'redux-mock-store' +import { Provider } from 'react-redux' +import { render } from '@testing-library/react'; +import '@testing-library/jest-dom'; +import Viewer from '../../../../components/cmd_bar/01_viewer' +import { LIST_UI_VIEWER_TYPE } from '../../../../constants/list_ui'; +import { LIST_LAYOUT } from '../../../../constants/list_layout'; + +const mockStore = configureStore([]); +const store = mockStore({ + ui: LIST_UI_VIEWER_TYPE.SPECTRUM, + layout: LIST_LAYOUT.H1, +}); + +const dispatchMock = () => Promise.resolve({}); +store.dispatch = jest.fn(dispatchMock); + +describe('', () => { + let AppWrapper; + beforeEach(() => { + AppWrapper = ({ store, children}) => { + return {children} + } + }); + + it('Render Viewer', async () => { + const renderer = + + + + ; + const { queryByTestId } = render(renderer); + const renderResult = queryByTestId('Viewer'); + expect(renderResult).toBeInTheDocument(); + expect(renderResult.childElementCount).toEqual(2); + }); + + it('Render Viewer in editor only mode', () => { + const renderer = + + + + ; + const { queryByTestId } = render(renderer); + const renderResult = queryByTestId('Viewer'); + expect(renderResult).toBeInTheDocument(); + expect(renderResult.childElementCount).toEqual(1); + }); +}) diff --git a/src/__tests__/units/components/cmd_bar/02_zoom.test.js b/src/__tests__/units/components/cmd_bar/02_zoom.test.js new file mode 100644 index 00000000..b7422aef --- /dev/null +++ b/src/__tests__/units/components/cmd_bar/02_zoom.test.js @@ -0,0 +1,35 @@ +import configureStore from 'redux-mock-store' +import { Provider } from 'react-redux' +import { render } from '@testing-library/react'; +import '@testing-library/jest-dom'; +import Zoom from '../../../../components/cmd_bar/02_zoom'; +import { LIST_UI_SWEEP_TYPE } from '../../../../constants/list_ui'; + +const mockStore = configureStore([]); +const store = mockStore({ + ui:{ sweepType: LIST_UI_SWEEP_TYPE.ZOOMIN }, +}); + +const dispatchMock = () => Promise.resolve({}); +store.dispatch = jest.fn(dispatchMock); + +describe('', () => { + let AppWrapper; + beforeEach(() => { + AppWrapper = ({ store, children}) => { + return {children} + } + }); + + it('Render Zoom', async () => { + const renderer = + + + + ; + const { queryByTestId } = render(renderer); + const renderResult = queryByTestId('Zoom'); + expect(renderResult).toBeInTheDocument(); + expect(renderResult.childElementCount).toEqual(2); + }); +}) \ No newline at end of file diff --git a/src/__tests__/units/components/common/draw.test.jsx b/src/__tests__/units/components/common/draw.test.jsx new file mode 100644 index 00000000..9a1a46ac --- /dev/null +++ b/src/__tests__/units/components/common/draw.test.jsx @@ -0,0 +1,24 @@ +import { render } from '@testing-library/react'; +import '@testing-library/jest-dom'; +import { drawMain } from '../../../../components/common/draw'; +import { useEffect } from 'react'; +describe('common/draw', () => { + it('.drawMain()', () => { + function TestComponent({}) { + useEffect(() => { + drawMain('.testsvg', 100, 100) + }, []); + return ( +
+ ) + } + + const { queryByTestId } = render(); + const renderResult = queryByTestId('testsvg'); + expect(renderResult).toBeInTheDocument(); + const svgElement = document.querySelector('svg'); + expect(svgElement).toHaveClass('d3Svg'); + expect(svgElement).toHaveAttribute('preserveAspectRatio', 'xMinYMin meet'); + expect(svgElement).toHaveAttribute('viewBox', '0 0 100 100'); + }); +}) diff --git a/src/__tests__/units/components/panel/peaks.test.js b/src/__tests__/units/components/panel/peaks.test.js index 83d0883d..68ab184a 100644 --- a/src/__tests__/units/components/panel/peaks.test.js +++ b/src/__tests__/units/components/panel/peaks.test.js @@ -5,6 +5,8 @@ import configureStore from 'redux-mock-store' import { Provider } from 'react-redux'; import '@testing-library/jest-dom' import { LIST_LAYOUT } from "../../../../constants/list_layout"; +import { createTheme } from "@mui/material"; +import { ThemeProvider } from "@mui/styles"; const mockStore = configureStore([]); const store = mockStore({ @@ -48,6 +50,11 @@ const failedStore = mockStore({ const dispatchMock = () => Promise.resolve({}); store.dispatch = jest.fn(dispatchMock); +const theme = createTheme({ + typography: { + useNextVariants: true + }, +}); describe("", () => { let AppWrapper; @@ -60,7 +67,9 @@ describe("", () => { test('Render peaks panel info', () => { const renderer = - {}} /> + + {}} /> + ; const {queryByTestId} = render(renderer); @@ -70,7 +79,9 @@ describe("", () => { test('Render peaks panel with invalid store list', () => { const renderer = - {}} /> + + {}} /> + ; const {queryByTestId} = render(renderer); diff --git a/src/components/cmd_bar/01_viewer.js b/src/components/cmd_bar/01_viewer.js index 4568ebe4..d1dff1a2 100644 --- a/src/components/cmd_bar/01_viewer.js +++ b/src/components/cmd_bar/01_viewer.js @@ -5,10 +5,10 @@ import { bindActionCreators, compose } from 'redux'; import classNames from 'classnames'; import PropTypes from 'prop-types'; -import { withStyles } from '@material-ui/core/styles'; -import SpellcheckOutlinedIcon from '@material-ui/icons/SpellcheckOutlined'; -import TimelineOutlinedIcon from '@material-ui/icons/TimelineOutlined'; -import Tooltip from '@material-ui/core/Tooltip'; +import withStyles from '@mui/styles/withStyles'; +import SpellcheckOutlinedIcon from '@mui/icons-material/SpellcheckOutlined'; +import TimelineOutlinedIcon from '@mui/icons-material/TimelineOutlined'; +import Tooltip from '@mui/material/Tooltip'; import { setUiViewerType } from '../../actions/ui'; import Cfg from '../../helpers/cfg'; @@ -31,7 +31,7 @@ const Viewer = ({ const onViewAnalysis = () => setUiViewerTypeAct(LIST_UI_VIEWER_TYPE.ANALYSIS); return ( - + Spectrum Viewer}> setUiSweepTypeAct(LIST_UI_SWEEP_TYPE.ZOOMRESET); return ( - + Zoom In}> ( diff --git a/src/components/cmd_bar/07_pecker.js b/src/components/cmd_bar/07_pecker.js index 35b0ce04..5fccae59 100644 --- a/src/components/cmd_bar/07_pecker.js +++ b/src/components/cmd_bar/07_pecker.js @@ -7,8 +7,8 @@ import { bindActionCreators, compose } from 'redux'; import classNames from 'classnames'; import PropTypes from 'prop-types'; -import { withStyles } from '@material-ui/core/styles'; -import Tooltip from '@material-ui/core/Tooltip'; +import withStyles from '@mui/styles/withStyles'; +import Tooltip from '@mui/material/Tooltip'; import { setUiSweepType } from '../../actions/ui'; diff --git a/src/components/cmd_bar/common.js b/src/components/cmd_bar/common.js index 3f024b2f..bda1a265 100644 --- a/src/components/cmd_bar/common.js +++ b/src/components/cmd_bar/common.js @@ -1,5 +1,5 @@ -import { withStyles } from '@material-ui/core/styles'; -import Button from '@material-ui/core/Button'; +import { withStyles } from '@mui/styles'; +import Button from '@mui/material/Button'; const MuButton = withStyles({ root: { @@ -12,6 +12,7 @@ const MuButton = withStyles({ minWidth: 30, padding: 0, width: 30, + color: 'black', }, })(Button); diff --git a/src/components/cmd_bar/index.js b/src/components/cmd_bar/index.js index b534f96a..6df98e8c 100644 --- a/src/components/cmd_bar/index.js +++ b/src/components/cmd_bar/index.js @@ -5,7 +5,7 @@ import { connect } from 'react-redux'; import { bindActionCreators, compose } from 'redux'; import PropTypes from 'prop-types'; -import { withStyles } from '@material-ui/core/styles'; +import withStyles from '@mui/styles/withStyles'; import { commonStyle } from './common'; import Viewer from './01_viewer'; diff --git a/src/components/cmd_bar/r01_layout.js b/src/components/cmd_bar/r01_layout.js index 3cd2786a..9fce40e5 100644 --- a/src/components/cmd_bar/r01_layout.js +++ b/src/components/cmd_bar/r01_layout.js @@ -6,12 +6,10 @@ import classNames from 'classnames'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import Select from '@material-ui/core/Select'; -import MenuItem from '@material-ui/core/MenuItem'; -import FormControl from '@material-ui/core/FormControl'; -import OutlinedInput from '@material-ui/core/OutlinedInput'; -import InputLabel from '@material-ui/core/InputLabel'; -import { withStyles } from '@material-ui/core/styles'; +import { + Select, FormControl, MenuItem, InputLabel, +} from '@mui/material'; +import withStyles from '@mui/styles/withStyles'; import Scan from './r02_scan'; import { updateLayout } from '../../actions/layout'; @@ -66,20 +64,15 @@ const shiftSelect = ( className={classNames(classes.fieldShift)} variant="outlined" > - + Solvent @@ -93,22 +86,16 @@ const layoutSelect = (classes, layoutSt, updateLayoutAct) => { return ( - + Layout - ) - } + className={classNames(classes.selectInput, 'input-sv-bar-scan')} > { content } diff --git a/src/components/cmd_bar/r03_threshold.js b/src/components/cmd_bar/r03_threshold.js index 81118815..a76991e0 100644 --- a/src/components/cmd_bar/r03_threshold.js +++ b/src/components/cmd_bar/r03_threshold.js @@ -6,14 +6,13 @@ import classNames from 'classnames'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import TextField from '@material-ui/core/TextField'; -import InputAdornment from '@material-ui/core/InputAdornment'; -import { FormControl, InputLabel } from '@material-ui/core'; -import { withStyles } from '@material-ui/core/styles'; -import Tooltip from '@material-ui/core/Tooltip'; -import CloudDoneOutlinedIcon from '@material-ui/icons/CloudDoneOutlined'; -import HowToRegOutlinedIcon from '@material-ui/icons/HowToRegOutlined'; -import RefreshOutlinedIcon from '@material-ui/icons/RefreshOutlined'; +import { + TextField, InputAdornment, Tooltip, FormControl, InputLabel, +} from '@mui/material'; +import { withStyles } from '@mui/styles'; +import CloudDoneOutlinedIcon from '@mui/icons-material/CloudDoneOutlined'; +import HowToRegOutlinedIcon from '@mui/icons-material/HowToRegOutlined'; +import RefreshOutlinedIcon from '@mui/icons-material/RefreshOutlined'; import Cfg from '../../helpers/cfg'; import { diff --git a/src/components/cmd_bar/r04_submit.js b/src/components/cmd_bar/r04_submit.js index d83b0596..f7acdf37 100644 --- a/src/components/cmd_bar/r04_submit.js +++ b/src/components/cmd_bar/r04_submit.js @@ -6,12 +6,10 @@ import classNames from 'classnames'; import { connect } from 'react-redux'; import { bindActionCreators, compose } from 'redux'; -import Select from '@material-ui/core/Select'; -import MenuItem from '@material-ui/core/MenuItem'; -import FormControl from '@material-ui/core/FormControl'; -import OutlinedInput from '@material-ui/core/OutlinedInput'; -import InputLabel from '@material-ui/core/InputLabel'; -import { withStyles } from '@material-ui/core/styles'; +import { + Select, MenuItem, FormControl, InputLabel, +} from '@mui/material'; +import { withStyles } from '@mui/styles'; import { toggleIsAscend, toggleIsIntensity, @@ -52,20 +50,15 @@ const ascendSelect = ( className={classNames(classes.fieldOrder)} variant="outlined" > - + Write Peaks - ) - } + className={classNames(classes.selectInput, 'input-sv-bar-intensity')} + // input={ + // ( + // + // ) + // } > @@ -140,20 +136,23 @@ const decimalSelect = ( className={classNames(classes.fieldDecimal)} variant="outlined" > - + Decimal @@ -177,20 +176,23 @@ const operationSelect = ( className={classNames(classes.fieldOpertaion)} variant="outlined" > - + Submit diff --git a/src/components/cmd_bar/r05_submit_btn.js b/src/components/cmd_bar/r05_submit_btn.js index 0ffd6ffb..fce6830d 100644 --- a/src/components/cmd_bar/r05_submit_btn.js +++ b/src/components/cmd_bar/r05_submit_btn.js @@ -7,9 +7,9 @@ import { connect } from 'react-redux'; import classNames from 'classnames'; import { bindActionCreators, compose } from 'redux'; -import Tooltip from '@material-ui/core/Tooltip'; -import PlayCircleOutlineIcon from '@material-ui/icons/PlayCircleOutline'; -import { withStyles } from '@material-ui/core/styles'; +import Tooltip from '@mui/material/Tooltip'; +import PlayCircleOutlineIcon from '@mui/icons-material/PlayCircleOutline'; +import { withStyles } from '@mui/styles'; import { Convert2Scan, Convert2Thres, diff --git a/src/components/cmd_bar/r06_predict_btn.js b/src/components/cmd_bar/r06_predict_btn.js index 8619b837..2924486a 100644 --- a/src/components/cmd_bar/r06_predict_btn.js +++ b/src/components/cmd_bar/r06_predict_btn.js @@ -7,11 +7,12 @@ import { connect } from 'react-redux'; import classNames from 'classnames'; import { bindActionCreators, compose } from 'redux'; -import Tooltip from '@material-ui/core/Tooltip'; -import GpsFixedOutlinedIcon from '@material-ui/icons/GpsFixedOutlined'; -import HelpOutlineOutlinedIcon from '@material-ui/icons/HelpOutlineOutlined'; -import Button from '@material-ui/core/Button'; -import { withStyles } from '@material-ui/core/styles'; +import { + Tooltip, Button, +} from '@mui/material'; +import GpsFixedOutlinedIcon from '@mui/icons-material/GpsFixedOutlined'; +import HelpOutlineOutlinedIcon from '@mui/icons-material/HelpOutlineOutlined'; +import { withStyles } from '@mui/styles'; import { commonStyle } from './common'; import Format from '../../helpers/format'; diff --git a/src/components/cmd_bar/r07_wavelength_btn.js b/src/components/cmd_bar/r07_wavelength_btn.js index 9ab03696..ce70e30c 100644 --- a/src/components/cmd_bar/r07_wavelength_btn.js +++ b/src/components/cmd_bar/r07_wavelength_btn.js @@ -7,9 +7,9 @@ import classNames from 'classnames'; import { bindActionCreators } from 'redux'; import { - FormControl, InputLabel, Select, OutlinedInput, MenuItem, -} from '@material-ui/core'; -import { withStyles } from '@material-ui/core/styles'; + FormControl, InputLabel, Select, MenuItem, +} from '@mui/material'; +import withStyles from '@mui/styles/withStyles'; import { updateWaveLength } from '../../actions/wavelength'; import Format from '../../helpers/format'; import { commonStyle } from './common'; @@ -43,20 +43,15 @@ const wavelengthSelect = (classes, waveLengthSt, layoutSt, updateWaveLengthAct) className={classNames(classes.fieldLayout)} variant="outlined" > - + Wavelength ); diff --git a/src/components/d3_line/line_focus.js b/src/components/d3_line/line_focus.js index b560b7af..85ec6e55 100644 --- a/src/components/d3_line/line_focus.js +++ b/src/components/d3_line/line_focus.js @@ -785,7 +785,8 @@ class LineFocus { return [LIST_LAYOUT.UVVIS, LIST_LAYOUT.HPLC_UVVIS, LIST_LAYOUT.TGA, LIST_LAYOUT.XRD, LIST_LAYOUT.CYCLIC_VOLTAMMETRY, LIST_LAYOUT.CDS, LIST_LAYOUT.DLS_ACF, LIST_LAYOUT.SEC, - LIST_LAYOUT.EMISSIONS, LIST_LAYOUT.DLS_INTENSITY].indexOf(layoutSt) < 0; + LIST_LAYOUT.EMISSIONS, LIST_LAYOUT.DLS_INTENSITY, + LIST_LAYOUT.MASS_CHROMATOGRAM].indexOf(layoutSt) < 0; } create({ diff --git a/src/constants/list_layout.js b/src/constants/list_layout.js index c6ea126e..772bfd6b 100644 --- a/src/constants/list_layout.js +++ b/src/constants/list_layout.js @@ -20,6 +20,7 @@ const LIST_LAYOUT = { EMISSIONS: 'Emissions', DLS_ACF: 'DLS ACF', DLS_INTENSITY: 'DLS intensity', + MASS_CHROMATOGRAM: 'MASS CHROMATOGRAM', }; export { diff --git a/src/helpers/chem.js b/src/helpers/chem.js index 42ea1fda..bb2de844 100644 --- a/src/helpers/chem.js +++ b/src/helpers/chem.js @@ -334,6 +334,9 @@ const readLayout = (jcamp) => { if (dataType.includes('DLS intensity')) { return LIST_LAYOUT.DLS_INTENSITY; } + if (dataType.includes('MASS CHROMATOGRAM')) { + return LIST_LAYOUT.MASS_CHROMATOGRAM; + } } return false; }; diff --git a/src/helpers/format.js b/src/helpers/format.js index b17f88cf..dcd9d4ea 100644 --- a/src/helpers/format.js +++ b/src/helpers/format.js @@ -71,6 +71,7 @@ const spectraOps = { [LIST_LAYOUT.SEC]: { head: 'SIZE EXCLUSION CHROMATOGRAPHY', tail: '.' }, [LIST_LAYOUT.EMISSIONS]: { head: 'EMISSION', tail: '.' }, [LIST_LAYOUT.DLS_INTENSITY]: { head: 'DLS', tail: '.' }, + [LIST_LAYOUT.MASS_CHROMATOGRAM]: { head: 'MASS CHROMATOGRAM', tail: '.' }, }; const rmRef = (peaks, shift, atIndex = 0) => { @@ -359,6 +360,7 @@ const isAIFLayout = (layoutSt) => (LIST_LAYOUT.AIF === layoutSt); const isEmissionsLayout = (layoutSt) => (LIST_LAYOUT.EMISSIONS === layoutSt); const isDLSACFLayout = (layoutSt) => (LIST_LAYOUT.DLS_ACF === layoutSt); const isDLSIntensityLayout = (layoutSt) => (LIST_LAYOUT.DLS_INTENSITY === layoutSt); +const isMassChromatogramLayout = (layoutSt) => (LIST_LAYOUT.MASS_CHROMATOGRAM === layoutSt); const getNmrTyp = (layout) => { switch (layout) { @@ -459,6 +461,7 @@ const Format = { isAIFLayout, isDLSACFLayout, strNumberFixedDecimal, + isMassChromatogramLayout, }; export default Format; diff --git a/src/index.js b/src/index.js index ccde5b07..13e41ba2 100644 --- a/src/index.js +++ b/src/index.js @@ -47,6 +47,7 @@ import dlsAcfJcamp from './__tests__/fixtures/dls_acf_jcamp'; import dlsIntensityJcamp from './__tests__/fixtures/dls_intensity_jcamp'; import { q1H, qIR, q13C } from './__tests__/fixtures/qDescValue'; import './__tests__/style/svg.css'; +import massChromatogramJcamp from './__tests__/fixtures/mass_chromatogram_jcamp'; const nmr1HEntity = FN.ExtractJcamp(nmr1HJcamp); const nmr1HEntity2 = FN.ExtractJcamp(nmr1H2Jcamp); @@ -81,6 +82,7 @@ const aifEntity2 = FN.ExtractJcamp(aifJcamp2); const emissionsEntity = FN.ExtractJcamp(emissionsJcamp); const dlsAcfEntity = FN.ExtractJcamp(dlsAcfJcamp); const dlsIntensityEntity = FN.ExtractJcamp(dlsIntensityJcamp); +const massChromatogramEntity = FN.ExtractJcamp(massChromatogramJcamp); class DemoWriteIr extends React.Component { constructor(props) { @@ -174,6 +176,8 @@ class DemoWriteIr extends React.Component { return dlsAcfEntity; case 'dls intensity': return dlsIntensityEntity; + case 'mass chromatogram': + return massChromatogramEntity; case 'ms': default: return msEntity; @@ -230,6 +234,7 @@ class DemoWriteIr extends React.Component { case 'emissions': case 'dls acf': case 'dls intensity': + case 'mass chromatogram': default: return false; } @@ -578,6 +583,13 @@ class DemoWriteIr extends React.Component { > MS +