fixup: merge master - resolve conflicts

Author: PiTrem

cypress/e2e/cv_spec.cy.ts

@@ -2,7 +2,7 @@ describe('CV', () => {
   beforeEach(() => {
     cy.viewport(2000, 2000)
     cy.visit('http://localhost:3000/')
-    cy.get('#btn-cv').click()
+    cy.get('#btn-cv').click({ force: true })
   })
 
   it('Open layout', () => {
@@ -219,47 +219,4 @@ describe('CV', () => {
       /* ==== End Cypress Studio ==== */
     });
   })
-
-  it('Change axes labels', () => {
-    /* ==== Generated with Cypress Studio ==== */
-    cy.get('[aria-labelledby="select-x-axis-label"]').click();
-    cy.get('[data-value="Voltage in V"]').click();
-    cy.get('[aria-labelledby="select-y-axis-label"]').click();
-    cy.get('[data-value="Current in A"]').click();
-    // /* ==== End Cypress Studio ==== */
-
-    cy.get('.d3Svg text.xLabel').should('have.text', 'Voltage in V')
-    cy.get('.d3Svg text.yLabel').should('have.text', 'Current in A')
-
-    /* ==== Generated with Cypress Studio ==== */
-    cy.get('[aria-labelledby="select-x-axis-label"]').click();
-    cy.get('[data-value="Voltage vs Ref in V"]').click();
-    cy.get('[aria-labelledby="select-y-axis-label"]').click();
-    cy.get('[data-value="Current in mA"]').click();
-    // /* ==== End Cypress Studio ==== */
-
-    cy.get('.d3Svg text.xLabel').should('have.text', 'Voltage vs Ref in V')
-    cy.get('.d3Svg text.yLabel').should('have.text', 'Current in mA')
-
-    /* ==== Generated with Cypress Studio ==== */
-    cy.get('[aria-labelledby="select-x-axis-label"]').click();
-    cy.get('[data-value="Potential in V"]').click();
-    cy.get('[aria-labelledby="select-y-axis-label"]').click();
-    cy.get('[data-value="Current in A"]').click();
-    /* ==== End Cypress Studio ==== */
-
-    cy.get('.d3Svg text.xLabel').should('have.text', 'Potential in V')
-    cy.get('.d3Svg text.yLabel').should('have.text', 'Current in A')
-
-    // /* ==== Generated with Cypress Studio ==== */
-    cy.get('[aria-labelledby="select-x-axis-label"]').click();
-    cy.get('[data-value="Potential vs Ref in V"]').click();
-    cy.get('[aria-labelledby="select-y-axis-label"]').click();
-    cy.get('[data-value="Current in mA"]').click();
-    /* ==== End Cypress Studio ==== */
-
-    cy.get('.d3Svg text.xLabel').should('have.text', 'Potential vs Ref in V')
-    cy.get('.d3Svg text.yLabel').should('have.text', 'Current in mA')
-
-  })
 })

package.json

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

src/__tests__/units/components/panel/cyclic_voltamery_data.test.tsx

@@ -82,9 +82,9 @@ describe('<CyclicVoltammetryPanel />', () => {
       expect(tabelCells?.length).toEqual(24)
 
       const arrCellLabel = [
-        '', 'E: 2.00 V,I: 2.00e+3 mA', 'E: -2.00 V,I: 1.00e+3 mA', '1.60e+3 mA', '0.97', '0.00 V', '4000 mV', '',
-        '', 'E: 2.00 V,I: 2.00e+3 mA', 'E: 1.00 V,I: 1.00e+3 mA', '1.60e+3 mA', '0.97', '1.50 V', '1000 mV', '',
-        '', 'nd', 'nd', '1.60e+3 mA', 'nd', 'nd', 'nd', '',]
+        '', 'E: 2.00 V,I: 2.00e+0 A', 'E: -2.00 V,I: 1.00e+0 A', '1.60e+0 A', '0.97', '0.00 V', '4000 mV', '',
+        '', 'E: 2.00 V,I: 2.00e+0 A', 'E: 1.00 V,I: 1.00e+0 A', '1.60e+0 A', '0.97', '1.50 V', '1000 mV', '',
+        '', 'nd', 'nd', '1.60e+0 A', 'nd', 'nd', 'nd', '',]
       tabelCells?.forEach((cell, idx) => {
         expect(cell).toHaveTextContent(arrCellLabel[idx])
         expect(cell).toHaveClass('txt-sv-panel-txt')

src/actions/cyclic_voltammetry.js

@@ -91,6 +91,21 @@ const setCylicVoltaRef = (payload) => (
   }
 );
 
+const setCyclicVoltaAreaValue = (value) => ({
+  type: CYCLIC_VOLTA_METRY.SET_AREA_VALUE,
+  payload: { value },
+});
+
+const setCyclicVoltaAreaUnit = (unit) => ({
+  type: CYCLIC_VOLTA_METRY.SET_AREA_UNIT,
+  payload: { unit },
+});
+
+const toggleCyclicVoltaDensity = (payload) => ({
+  type: CYCLIC_VOLTA_METRY.TOGGLE_DENSITY,
+  payload,
+});
+
 export {
   addNewCylicVoltaPairPeak, removeCylicVoltaPairPeak,
   addCylicVoltaMaxPeak, removeCylicVoltaMaxPeak,
@@ -99,4 +114,7 @@ export {
   addCylicVoltaPecker, removeCylicVoltaPecker,
   selectRefPeaks, setCylicVoltaRefFactor,
   setCylicVoltaRef,
+  setCyclicVoltaAreaValue,
+  setCyclicVoltaAreaUnit,
+  toggleCyclicVoltaDensity,
 };

src/components/cmd_bar/index.js

@@ -21,6 +21,7 @@ import Wavelength from './r07_wavelength_btn';
 import Pecker from './07_pecker';
 import ChangeAxes from './r08_change_axes';
 import Detector from './r09_detector';
+import CvDensityControls from './r10_cv_density';
 import Format from '../../helpers/format';
 
 const styles = () => (
@@ -60,6 +61,7 @@ const CmdBar = ({
       }
       <Layout feature={feature} hasEdit={hasEdit} />
       <Wavelength />
+      <CvDensityControls />
       <ChangeAxes />
       <Detector />
     </div>