Skip to content

Commit df4eaa0

Browse files
baolanlequangLan Le
baolanlequang
authored and
Lan Le
committed
feat: add ref button for CV layout (#159)
BREAKING CHANGE: update dependency and UI to use material version 5.
1 parent 2da3561 commit df4eaa0

File tree

123 files changed

+2948
-1157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+2948
-1157
lines changed

‎.github/workflows/testing.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Testing
33
on: push
44

55
jobs:
6-
build:
6+
testing:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v2

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# react-spectra-editor
22

3-
An editor to View and Edit Chemical Spectra data (NMR, IR and MS).
3+
An editor to View and Edit Chemical Spectra data (NMR, IR, MS, UV, CV and XRD).
44

5+
![GitHub package.json version](https://img.shields.io/github/package-json/v/ComPlat/react-spectra-editor)
56
![Testing](https://github.com/ComPlat/react-spectra-editor/actions/workflows/testing.yml/badge.svg)
67

78
### Usage

‎dist/actions/axes.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
"use strict";
2+
3+
Object.defineProperty(exports, "__esModule", {
4+
value: true
5+
});
6+
exports.updateYAxis = exports.updateXAxis = void 0;
7+
var _action_type = require("../constants/action_type");
8+
const updateXAxis = payload => ({
9+
type: _action_type.AXES.UPDATE_X_AXIS,
10+
payload
11+
});
12+
exports.updateXAxis = updateXAxis;
13+
const updateYAxis = payload => ({
14+
type: _action_type.AXES.UPDATE_Y_AXIS,
15+
payload
16+
});
17+
18+
// eslint-disable-line
19+
exports.updateYAxis = updateYAxis;

‎dist/actions/cyclic_voltammetry.js‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
6-
exports.setWorkWithMaxPeak = exports.selectPairPeak = exports.removeCylicVoltaPecker = exports.removeCylicVoltaPairPeak = exports.removeCylicVoltaMinPeak = exports.removeCylicVoltaMaxPeak = exports.addNewCylicVoltaPairPeak = exports.addCylicVoltaPecker = exports.addCylicVoltaMinPeak = exports.addCylicVoltaMaxPeak = void 0;
6+
exports.setWorkWithMaxPeak = exports.setCylicVoltaRefFactor = exports.setCylicVoltaRef = exports.selectRefPeaks = exports.selectPairPeak = exports.removeCylicVoltaPecker = exports.removeCylicVoltaPairPeak = exports.removeCylicVoltaMinPeak = exports.removeCylicVoltaMaxPeak = exports.addNewCylicVoltaPairPeak = exports.addCylicVoltaPecker = exports.addCylicVoltaMinPeak = exports.addCylicVoltaMaxPeak = void 0;
77
var _action_type = require("../constants/action_type");
88
const addNewCylicVoltaPairPeak = payload => ({
99
type: _action_type.CYCLIC_VOLTA_METRY.ADD_PAIR_PEAKS,
@@ -54,4 +54,19 @@ const removeCylicVoltaPecker = payload => ({
5454
type: _action_type.CYCLIC_VOLTA_METRY.REMOVE_PECKER,
5555
payload
5656
});
57-
exports.removeCylicVoltaPecker = removeCylicVoltaPecker;
57+
exports.removeCylicVoltaPecker = removeCylicVoltaPecker;
58+
const selectRefPeaks = payload => ({
59+
type: _action_type.CYCLIC_VOLTA_METRY.SELECT_REF_PEAK,
60+
payload
61+
});
62+
exports.selectRefPeaks = selectRefPeaks;
63+
const setCylicVoltaRefFactor = payload => ({
64+
type: _action_type.CYCLIC_VOLTA_METRY.SET_FACTOR,
65+
payload
66+
});
67+
exports.setCylicVoltaRefFactor = setCylicVoltaRefFactor;
68+
const setCylicVoltaRef = payload => ({
69+
type: _action_type.CYCLIC_VOLTA_METRY.SET_REF,
70+
payload
71+
});
72+
exports.setCylicVoltaRef = setCylicVoltaRef;

‎dist/app.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ var _react = _interopRequireDefault(require("react"));
1515
var _reactRedux = require("react-redux");
1616
var _redux = require("redux");
1717
var _propTypes = _interopRequireDefault(require("prop-types"));
18+
var _material = require("@mui/material");
1819
require("regenerator-runtime/runtime");
1920
var _reduxSaga = _interopRequireDefault(require("redux-saga"));
2021
var _index = _interopRequireDefault(require("./reducers/index"));
@@ -64,6 +65,8 @@ const SpectraEditor = _ref => {
6465
} = _ref;
6566
return /*#__PURE__*/_react.default.createElement(_reactRedux.Provider, {
6667
store: store
68+
}, /*#__PURE__*/_react.default.createElement(_material.StyledEngineProvider, {
69+
injectFirst: true
6770
}, /*#__PURE__*/_react.default.createElement(_layer_init.default, {
6871
entity: entity,
6972
multiEntities: multiEntities,
@@ -81,7 +84,7 @@ const SpectraEditor = _ref => {
8184
editorOnly: editorOnly,
8285
canChangeDescription: canChangeDescription,
8386
onDescriptionChanged: onDescriptionChanged
84-
}));
87+
})));
8588
};
8689
exports.SpectraEditor = SpectraEditor;
8790
SpectraEditor.propTypes = {

‎dist/components/cmd_bar/01_viewer.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _classnames = _interopRequireDefault(require("classnames"));
1212
var _propTypes = _interopRequireDefault(require("prop-types"));
13-
var _styles = require("@material-ui/core/styles");
14-
var _SpellcheckOutlined = _interopRequireDefault(require("@material-ui/icons/SpellcheckOutlined"));
15-
var _TimelineOutlined = _interopRequireDefault(require("@material-ui/icons/TimelineOutlined"));
16-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _SpellcheckOutlined = _interopRequireDefault(require("@mui/icons-material/SpellcheckOutlined"));
15+
var _TimelineOutlined = _interopRequireDefault(require("@mui/icons-material/TimelineOutlined"));
16+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
1717
var _ui = require("../../actions/ui");
1818
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
1919
var _common = require("./common");
@@ -33,7 +33,8 @@ const Viewer = _ref => {
3333
const onViewSpectrum = () => setUiViewerTypeAct(_list_ui.LIST_UI_VIEWER_TYPE.SPECTRUM);
3434
const onViewAnalysis = () => setUiViewerTypeAct(_list_ui.LIST_UI_VIEWER_TYPE.ANALYSIS);
3535
return /*#__PURE__*/_react.default.createElement("span", {
36-
className: classes.group
36+
className: classes.group,
37+
"data-testid": "Viewer"
3738
}, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
3839
title: /*#__PURE__*/_react.default.createElement("span", {
3940
className: "txt-sv-tp"
@@ -74,4 +75,4 @@ Viewer.propTypes = {
7475
disableCmdAnaViewerSt: _propTypes.default.bool.isRequired,
7576
setUiViewerTypeAct: _propTypes.default.func.isRequired
7677
};
77-
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Viewer);
78+
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Viewer);

‎dist/components/cmd_bar/02_zoom.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _classnames = _interopRequireDefault(require("classnames"));
1212
var _propTypes = _interopRequireDefault(require("prop-types"));
13-
var _styles = require("@material-ui/core/styles");
14-
var _ZoomInOutlined = _interopRequireDefault(require("@material-ui/icons/ZoomInOutlined"));
15-
var _FindReplaceOutlined = _interopRequireDefault(require("@material-ui/icons/FindReplaceOutlined"));
16-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _ZoomInOutlined = _interopRequireDefault(require("@mui/icons-material/ZoomInOutlined"));
15+
var _FindReplaceOutlined = _interopRequireDefault(require("@mui/icons-material/FindReplaceOutlined"));
16+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
1717
var _ui = require("../../actions/ui");
1818
var _common = require("./common");
1919
var _list_ui = require("../../constants/list_ui");
@@ -29,7 +29,8 @@ const Zoom = _ref => {
2929
const onSweepZoomIn = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ZOOMIN);
3030
const onSweepZoomReset = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ZOOMRESET);
3131
return /*#__PURE__*/_react.default.createElement("span", {
32-
className: classes.group
32+
className: classes.group,
33+
"data-testid": "Zoom"
3334
}, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
3435
title: /*#__PURE__*/_react.default.createElement("span", {
3536
className: "txt-sv-tp"
@@ -63,4 +64,4 @@ Zoom.propTypes = {
6364
isfocusZoomSt: _propTypes.default.bool.isRequired,
6465
setUiSweepTypeAct: _propTypes.default.func.isRequired
6566
};
66-
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Zoom);
67+
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Zoom);

‎dist/components/cmd_bar/03_peak.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _classnames = _interopRequireDefault(require("classnames"));
1212
var _propTypes = _interopRequireDefault(require("prop-types"));
13-
var _styles = require("@material-ui/core/styles");
14-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
15-
var _AddLocationOutlined = _interopRequireDefault(require("@material-ui/icons/AddLocationOutlined"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
15+
var _AddLocationOutlined = _interopRequireDefault(require("@mui/icons-material/AddLocationOutlined"));
1616
var _ui = require("../../actions/ui");
1717
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
1818
var _common = require("./common");
@@ -62,7 +62,8 @@ const Peak = _ref => {
6262
}
6363
}
6464
return /*#__PURE__*/_react.default.createElement("span", {
65-
className: classes.group
65+
className: classes.group,
66+
"data-testid": "Peak"
6667
}, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
6768
title: /*#__PURE__*/_react.default.createElement("span", {
6869
className: "txt-sv-tp"
@@ -83,7 +84,7 @@ const Peak = _ref => {
8384
onClick: onSweepPeakDELETE
8485
}, /*#__PURE__*/_react.default.createElement("span", {
8586
className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmpeak')
86-
}, "P-")))), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
87+
}, "P-")))), !disableSetRefSt ? /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
8788
title: /*#__PURE__*/_react.default.createElement("span", {
8889
className: "txt-sv-tp"
8990
}, "Set Reference")
@@ -93,7 +94,7 @@ const Peak = _ref => {
9394
onClick: onSweepAnchorShift
9495
}, /*#__PURE__*/_react.default.createElement(_AddLocationOutlined.default, {
9596
className: classes.icon
96-
})))));
97+
})))) : null);
9798
};
9899
const mapStateToProps = (state, _) => (
99100
// eslint-disable-line
@@ -102,7 +103,7 @@ const mapStateToProps = (state, _) => (
102103
disableAddPeakSt: _cfg.default.btnCmdAddPeak(state.layout),
103104
isFocusRmPeakSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.PEAK_DELETE || state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MAX_PEAK || state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MIN_PEAK,
104105
disableRmPeakSt: _cfg.default.btnCmdRmPeak(state.layout),
105-
isFocusSetRefSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT,
106+
isFocusSetRefSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT || state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_SET_REF,
106107
disableSetRefSt: _cfg.default.btnCmdSetRef(state.layout),
107108
isHandleMaxAndMinPeaksSt: !_cfg.default.hidePanelCyclicVolta(state.layout),
108109
cyclicVotaSt: state.cyclicvolta,
@@ -124,4 +125,4 @@ Peak.propTypes = {
124125
cyclicVotaSt: _propTypes.default.object.isRequired,
125126
curveSt: _propTypes.default.object.isRequired
126127
};
127-
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Peak);
128+
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Peak);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _classnames = _interopRequireDefault(require("classnames"));
1212
var _propTypes = _interopRequireDefault(require("prop-types"));
13-
var _styles = require("@material-ui/core/styles");
14-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
15-
var _TextField = _interopRequireDefault(require("@material-ui/core/TextField"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
15+
var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
1616
var _react2 = _interopRequireDefault(require("@mdi/react"));
1717
var _js = require("@mdi/js");
1818
var _integration = require("../../actions/integration");
@@ -185,4 +185,4 @@ Integration.propTypes = {
185185
curveSt: _propTypes.default.object.isRequired,
186186
integrationSt: _propTypes.default.object.isRequired
187187
};
188-
var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Integration));
188+
var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Integration));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _classnames = _interopRequireDefault(require("classnames"));
1212
var _propTypes = _interopRequireDefault(require("prop-types"));
13-
var _styles = require("@material-ui/core/styles");
14-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
1515
var _ui = require("../../actions/ui");
1616
var _multiplicity = require("../../actions/multiplicity");
1717
var _list_ui = require("../../constants/list_ui");
@@ -130,4 +130,4 @@ Multiplicity.propTypes = {
130130
clearMpyAllAct: _propTypes.default.func.isRequired,
131131
curveSt: _propTypes.default.object.isRequired
132132
};
133-
var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Multiplicity));
133+
var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Multiplicity));

0 commit comments

Comments
 (0)