Skip to content

Commit 8238de9

Browse files
author
Lan Le
committed
feat: add lcms layout
1 parent 1c80817 commit 8238de9

Some content is hidden

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

80 files changed

+2745002
-145
lines changed

‎.github/workflows/e2e_testing.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
- name: Cypress run
1111
uses: cypress-io/github-action@v6
1212
with:
13-
build: npm run build
14-
start: npm start
13+
build: npm run --max_old_space_size=12288 build
14+
start: npm --max_old_space_size=12288 start
1515
browser: chrome

‎cypress.config.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
import { defineConfig } from "cypress";
22

33
export default defineConfig({
4+
pageLoadTimeout: 100000,
5+
requestTimeout: 100000,
6+
responseTimeout: 100000,
47
e2e: {
58
setupNodeEvents(on, config) {
69
// implement node event listeners here
710
},
8-
experimentalStudio: true
11+
experimentalStudio: true,
12+
pageLoadTimeout: 100000,
13+
requestTimeout: 100000,
14+
responseTimeout: 100000,
915
},
1016
});

‎cypress/e2e/nmr1h_spec.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ describe('NMR 1H', () => {
7070
cy.get('.btn-sv-bar-spctrum').click()
7171
cy.get('.input-sv-bar-layout').click()
7272
cy.get('.option-sv-bar-layout').should($li => {
73-
expect($li).to.have.length(24)
73+
expect($li).to.have.length(25)
7474
})
7575
cy.get('ul li:nth-child(9)').click()
7676

‎dist/actions/hplcms.js‎

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

‎dist/components/cmd_bar/08_peak_group.js‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
"use strict";
2+
3+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4+
Object.defineProperty(exports, "__esModule", {
5+
value: true
6+
});
7+
exports.default = void 0;
8+
var _react = _interopRequireDefault(require("react"));
9+
var _reactRedux = require("react-redux");
10+
var _redux = require("redux");
11+
var _classnames = _interopRequireDefault(require("classnames"));
12+
var _propTypes = _interopRequireDefault(require("prop-types"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
15+
var _Troubleshoot = _interopRequireDefault(require("@mui/icons-material/Troubleshoot"));
16+
var _ui = require("../../actions/ui");
17+
var _common = require("./common");
18+
var _list_ui = require("../../constants/list_ui");
19+
var _format = _interopRequireDefault(require("../../helpers/format"));
20+
/* eslint-disable prefer-object-spread, react/function-component-definition */
21+
22+
const styles = () => Object.assign({}, _common.commonStyle);
23+
const PeakGroup = _ref => {
24+
let {
25+
classes,
26+
feature,
27+
isSelectingGroupSt,
28+
setUiSweepTypeAct,
29+
graphIndex
30+
} = _ref;
31+
const {
32+
operation
33+
} = feature;
34+
const {
35+
layout
36+
} = operation;
37+
if (!_format.default.isLCMsLayout(layout)) {
38+
return null;
39+
}
40+
const onSelectPeakGroup = () => {
41+
const payload = {
42+
graphIndex,
43+
sweepType: _list_ui.LIST_UI_SWEEP_TYPE.PEAK_GROUP_SELECT
44+
};
45+
setUiSweepTypeAct(payload);
46+
};
47+
return /*#__PURE__*/_react.default.createElement("span", {
48+
className: classes.group,
49+
"data-testid": "Zoom"
50+
}, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
51+
title: /*#__PURE__*/_react.default.createElement("span", {
52+
className: "txt-sv-tp"
53+
}, "Select peak group")
54+
}, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
55+
className: (0, _classnames.default)((0, _common.focusStyle)(isSelectingGroupSt, classes), 'btn-sv-bar-zoomin'),
56+
onClick: onSelectPeakGroup
57+
}, /*#__PURE__*/_react.default.createElement(_Troubleshoot.default, {
58+
className: (0, _classnames.default)(classes.icon, classes.iconWp)
59+
}))));
60+
};
61+
const mapStateToProps = (state, _) => (
62+
// eslint-disable-line
63+
{
64+
isSelectingGroupSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.PEAK_GROUP_SELECT
65+
});
66+
const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
67+
setUiSweepTypeAct: _ui.setUiSweepType
68+
}, dispatch);
69+
PeakGroup.propTypes = {
70+
classes: _propTypes.default.object.isRequired,
71+
feature: _propTypes.default.object.isRequired,
72+
isSelectingGroupSt: _propTypes.default.bool.isRequired,
73+
setUiSweepTypeAct: _propTypes.default.func.isRequired,
74+
graphIndex: _propTypes.default.number.isRequired
75+
};
76+
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(PeakGroup);

‎dist/components/cmd_bar/index.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,19 @@ const CmdBar = _ref => {
3737
operations,
3838
editorOnly,
3939
jcampIdx,
40-
hideThreshold
40+
hideThreshold,
41+
hideMainEditTools
4142
} = _ref;
4243
return /*#__PURE__*/_react.default.createElement("div", {
4344
className: classes.card
44-
}, /*#__PURE__*/_react.default.createElement(_viewer.default, {
45+
}, hideMainEditTools ? null : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_viewer.default, {
4546
editorOnly: editorOnly
4647
}), /*#__PURE__*/_react.default.createElement(_zoom.default, null), /*#__PURE__*/_react.default.createElement(_peak.default, {
4748
jcampIdx: jcampIdx,
4849
feature: feature
4950
}), /*#__PURE__*/_react.default.createElement(_pecker.default, {
5051
jcampIdx: jcampIdx
51-
}), /*#__PURE__*/_react.default.createElement(_integration.default, null), /*#__PURE__*/_react.default.createElement(_multiplicity.default, null), /*#__PURE__*/_react.default.createElement(_undo_redo.default, null), /*#__PURE__*/_react.default.createElement(_r04_submit.default, {
52+
}), /*#__PURE__*/_react.default.createElement(_integration.default, null), /*#__PURE__*/_react.default.createElement(_multiplicity.default, null), /*#__PURE__*/_react.default.createElement(_undo_redo.default, null)), /*#__PURE__*/_react.default.createElement(_r04_submit.default, {
5253
operations: operations,
5354
feature: feature,
5455
forecast: forecast,
@@ -75,6 +76,7 @@ CmdBar.propTypes = {
7576
operations: _propTypes.default.array.isRequired,
7677
editorOnly: _propTypes.default.bool.isRequired,
7778
jcampIdx: _propTypes.default.any,
78-
hideThreshold: _propTypes.default.bool
79+
hideThreshold: _propTypes.default.bool,
80+
hideMainEditTools: _propTypes.default.bool
7981
};
8082
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(CmdBar);

‎dist/components/cmd_bar/r01_layout.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@ const layoutSelect = (classes, layoutSt, updateLayoutAct) => {
144144
}, /*#__PURE__*/_react.default.createElement("span", {
145145
className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
146146
}, "MS")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
147+
value: _list_layout.LIST_LAYOUT.LC_MS
148+
}, /*#__PURE__*/_react.default.createElement("span", {
149+
className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
150+
}, "LC/MS")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
147151
value: _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY
148152
}, /*#__PURE__*/_react.default.createElement("span", {
149153
className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')

‎dist/components/cmd_bar/r03_threshold.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,12 @@ const Threshold = _ref => {
9191
thresValSt,
9292
isEditSt,
9393
curveSt,
94+
hplcMsSt,
9495
updateThresholdValueAct,
9596
resetThresholdValueAct,
9697
toggleThresholdIsEditAct
9798
} = _ref;
98-
const thresVal = thresValSt || feature.thresRef;
99+
const thresVal = thresValSt || (feature ? feature.thresRef : hplcMsSt.threshold.value);
99100
return /*#__PURE__*/_react.default.createElement("span", {
100101
className: classes.groupRight
101102
}, setThreshold(classes, thresVal, updateThresholdValueAct, curveSt), /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
@@ -124,7 +125,8 @@ const mapStateToProps = (state, props) => (
124125
hideThresSt: _cfg.default.hideCmdThres(state.layout),
125126
isEditSt: state.threshold.list[state.curve.curveIdx].isEdit,
126127
thresValSt: parseFloat(state.threshold.list[state.curve.curveIdx].value) || 0,
127-
curveSt: state.curve
128+
curveSt: state.curve,
129+
hplcMsSt: state.hplcMs
128130
});
129131
const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
130132
updateThresholdValueAct: _threshold.updateThresholdValue,
@@ -141,6 +143,7 @@ Threshold.propTypes = {
141143
curveSt: _propTypes.default.object.isRequired,
142144
updateThresholdValueAct: _propTypes.default.func.isRequired,
143145
resetThresholdValueAct: _propTypes.default.func.isRequired,
144-
toggleThresholdIsEditAct: _propTypes.default.func.isRequired
146+
toggleThresholdIsEditAct: _propTypes.default.func.isRequired,
147+
hplcMsSt: _propTypes.default.bool.isRequired
145148
};
146149
var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Threshold));

‎dist/components/cmd_bar/r05_submit_btn.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ var _styles = require("@mui/styles");
1616
var _chem = require("../../helpers/chem");
1717
var _common = require("./common");
1818
var _extractPeaksEdit = require("../../helpers/extractPeaksEdit");
19+
var _format = _interopRequireDefault(require("../../helpers/format"));
1920
/* eslint-disable prefer-object-spread, function-paren-newline,
2021
react/function-component-definition, function-call-argument-newline,
2122
react/require-default-props */
@@ -70,7 +71,7 @@ const BtnSubmit = _ref => {
7071
} = _ref;
7172
const peaksEdit = (0, _extractPeaksEdit.extractPeaksEdit)(feature, editPeakSt, thresSt, shiftSt, layoutSt);
7273
// const disBtn = peaksEdit.length === 0 || statusSt.btnSubmit || disabled;
73-
const scan = (0, _chem.Convert2Scan)(feature, scanSt);
74+
const scan = _format.default.isMsLayout(layoutSt) ? (0, _chem.Convert2Scan)(feature, scanSt) : 0;
7475
const thres = (0, _chem.Convert2Thres)(feature, thresSt);
7576
const aucValues = (0, _extractPeaksEdit.extractAreaUnderCurve)(allIntegrationSt, integrationSt, layoutSt);
7677
const {

‎dist/components/cmd_bar/r06_predict_btn.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ const BtnPredict = _ref => {
156156
if (!(is13Cor1H || isIr)) return null;
157157
const oriPeaksEdit = (0, _extractPeaksEdit.extractPeaksEdit)(feature, editPeakSt, thresSt, shiftSt, layoutSt);
158158
const peaksEdit = _format.default.rmShiftFromPeaks(oriPeaksEdit, shiftSt);
159-
const scan = (0, _chem.Convert2Scan)(feature, scanSt);
159+
const scan = _format.default.isMsLayout(layoutSt) ? (0, _chem.Convert2Scan)(feature, scanSt) : 0;
160160
const thres = (0, _chem.Convert2Thres)(feature, thresSt);
161161
const simuCount = simulationSt.nmrSimPeaks.length;
162162
const uniqCount = [...new Set(simulationSt.nmrSimPeaks)].length;

0 commit comments

Comments
 (0)