Disabled some cmd_bar option if it's a comparison

Author: Nicolass67

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@complat/react-spectra-editor",
-  "version": "1.3.4",
+  "version": "1.4.0",
   "description": "An editor to View and Edit Chemical Spectra data (NMR, IR, MS, CV, UIVIS, XRD, GC, and DSC).",
   "repository": {
     "type": "git",

src/app.js

@@ -35,7 +35,7 @@ const SpectraEditor = ({
   entity, others, cLabel, xLabel, yLabel,
   operations, forecast, molSvg, editorOnly, descriptions, theoryMass,
   canChangeDescription, onDescriptionChanged,
-  multiEntities, multiMolSvgs, entityFileNames, userManualLink,
+  multiEntities, multiMolSvgs, entityFileNames, userManualLink, isComparison,
 }) => (
   <Provider store={store}>
     <StyledEngineProvider injectFirst>
@@ -57,6 +57,7 @@ const SpectraEditor = ({
         theoryMass={theoryMass}
         canChangeDescription={canChangeDescription}
         onDescriptionChanged={onDescriptionChanged}
+        isComparison={isComparison}
       />
     </StyledEngineProvider>
   </Provider>
@@ -83,6 +84,7 @@ SpectraEditor.propTypes = {
   onDescriptionChanged: PropTypes.func,
   userManualLink: PropTypes.object,
   theoryMass: PropTypes.string,
+  isComparison: PropTypes.bool,
 };
 
 SpectraEditor.defaultProps = {
@@ -101,6 +103,7 @@ SpectraEditor.defaultProps = {
   editorOnly: false,
   canChangeDescription: false,
   userManualLink: {},
+  isComparison: true,
 };
 
 export {

src/components/cmd_bar/index.js

@@ -33,8 +33,16 @@ const styles = () => (
 );
 
 const CmdBar = ({
-  classes, feature, hasEdit, forecast, operations, editorOnly, jcampIdx, hideThreshold,
-}) => (
+  classes,
+  feature,
+  hasEdit,
+  forecast,
+  operations,
+  editorOnly,
+  jcampIdx,
+  hideThreshold,
+  isComparison,
+}) => (!isComparison ? (
   <div className={classes.card}>
     <Viewer editorOnly={editorOnly} />
     <Zoom />
@@ -51,14 +59,26 @@ const CmdBar = ({
       hideSwitch={false}
       disabled={false}
     />
-    {
-      hideThreshold ? null : (<Threshold feature={feature} hasEdit={hasEdit} />)
-    }
+    {hideThreshold ? null : <Threshold feature={feature} hasEdit={hasEdit} />}
     <Layout feature={feature} hasEdit={hasEdit} />
     <Wavelength />
     <ChangeAxes />
     <Detector />
   </div>
+) : (
+  <div className={classes.card}>
+    <Viewer editorOnly={editorOnly} />
+    <Zoom />
+    <Submit
+      operations={operations}
+      feature={feature}
+      forecast={forecast}
+      editorOnly={editorOnly}
+      hideSwitch={false}
+      disabled={false}
+    />
+  </div>
+)
 );
 
 const mapStateToProps = (state, _) => ( // eslint-disable-line
@@ -80,6 +100,7 @@ CmdBar.propTypes = {
   editorOnly: PropTypes.bool.isRequired,
   jcampIdx: PropTypes.any,
   hideThreshold: PropTypes.bool,
+  isComparison: PropTypes.bool.isRequired,
 };
 
 export default compose(

src/components/multi_jcamps_viewer.js

@@ -55,7 +55,7 @@ class MultiJcampsViewer extends React.Component { // eslint-disable-line
     const {
       classes, curveSt, operations, entityFileNames,
       entities, userManualLink, molSvg, theoryMass, layoutSt,
-      integrationSt,
+      integrationSt, isComparison,
     } = this.props;
     if (!entities || entities.length === 0) return (<div />);
 
@@ -74,6 +74,7 @@ class MultiJcampsViewer extends React.Component { // eslint-disable-line
           operations={operations}
           editorOnly={true}
           hideThreshold={true}
+          isComparison={isComparison}
         />
         <div className="react-spectrum-editor">
           <Grid container>
@@ -145,6 +146,7 @@ MultiJcampsViewer.propTypes = {
   layoutSt: PropTypes.string.isRequired,
   theoryMass: PropTypes.string,
   integrationSt: PropTypes.object.isRequired,
+  isComparison: PropTypes.bool.isRequired,
 };
 
 MultiJcampsViewer.defaultProps = {
@@ -155,6 +157,7 @@ MultiJcampsViewer.defaultProps = {
   xLabel: '',
   yLabel: '',
   entities: [],
+  isComparison: false,
 };
 
 export default compose(

src/layer_init.js

@@ -110,10 +110,9 @@ class LayerInit extends React.Component {
       entity, cLabel, xLabel, yLabel, forecast, operations,
       descriptions, molSvg, editorOnly, theoryMass,
       canChangeDescription, onDescriptionChanged,
-      multiEntities, entityFileNames, userManualLink,
+      multiEntities, entityFileNames, userManualLink, isComparison,
     } = this.props;
     const target = entity.spectra[0];
-
     const { layout } = entity;
 
     const xxLabel = !xLabel && xLabel === '' ? `X (${target.xUnit})` : xLabel;
@@ -128,6 +127,7 @@ class LayerInit extends React.Component {
           molSvg={molSvg}
           theoryMass={theoryMass}
           operations={operations}
+          isComparison={isComparison}
         />
       );
     } else if (Format.isCyclicVoltaLayout(layout)) {  // eslint-disable-line
@@ -139,6 +139,7 @@ class LayerInit extends React.Component {
           molSvg={molSvg}
           theoryMass={theoryMass}
           operations={operations}
+          isComparison={isComparison}
         />
       );
     }
@@ -157,6 +158,7 @@ class LayerInit extends React.Component {
         theoryMass={theoryMass}
         canChangeDescription={canChangeDescription}
         onDescriptionChanged={onDescriptionChanged}
+        isComparison={isComparison}
       />
     );
   }
@@ -208,6 +210,7 @@ LayerInit.propTypes = {
   userManualLink: PropTypes.object, // eslint-disable-line
   resetDetectorAct: PropTypes.func.isRequired,
   updateDSCMetaDataAct: PropTypes.func.isRequired,
+  isComparison: PropTypes.bool.isRequired,
 };
 
 export default connect( // eslint-disable-line

src/layer_prism.js

@@ -22,7 +22,7 @@ const LayerPrism = ({
   entity, cLabel, xLabel, yLabel, forecast, operations,
   descriptions, molSvg, editorOnly, theoryMass,
   thresSt, scanSt, uiSt,
-  canChangeDescription, onDescriptionChanged,
+  canChangeDescription, onDescriptionChanged, isComparison,
 }) => {
   const {
     topic, feature, hasEdit, integration,
@@ -67,6 +67,7 @@ const LayerPrism = ({
         forecast={forecast}
         operations={operations}
         editorOnly={editorOnly}
+        isComparison={isComparison}
       />
       <div className="react-spectrum-editor">
         <Grid container>
@@ -128,6 +129,7 @@ LayerPrism.propTypes = {
   uiSt: PropTypes.object.isRequired,
   canChangeDescription: PropTypes.bool.isRequired,
   onDescriptionChanged: PropTypes.func,
+  isComparison: PropTypes.bool.isRequired,
 };
 
 export default connect( // eslint-disable-line