add id for build flowsheet button; fix parameter sweep for remaining …

…flowsheets
watertap-org · Jul 22, 2024 · cff229e · cff229e
1 parent eee502d
commit cff229e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/electron/ui/cypress/e2e/Flowsheets.js b/electron/ui/cypress/e2e/Flowsheets.js
@@ -3,13 +3,13 @@ export const flowsheets = [
         name: 'NF-DSPM-DE flowsheet',
         buildRequired: true,
         sweepVariable: 'Volumetricflowrate',
-        sweepValues: []
+        sweepValues: ['3500', '3600']
     },
     {
         name: 'BSM2 flowsheet',
         buildRequired: false,
         sweepVariable: 'Watermassflowrate',
-        sweepValues: [],
+        sweepValues: ['20000', '21000'],
     },
     {
         name: 'BSM2_P_extension flowsheet',
@@ -44,14 +44,14 @@ export const flowsheets = [
     {
         name: 'Granular Activated Carbon (GAC) flowsheet',
         buildRequired: true,
-        sweepVariable: 'MW',
-        sweepValues: ['75','85'],
+        sweepVariable: 'Apparentdensity',
+        sweepValues: ['700','800'],
     },
     {
         name: 'Electrodialysis with concentrate recirculation flowsheet',
         buildRequired: false,
         sweepVariable: 'Feedsolutionvolumeflowrate',
-        sweepValues: ['0.001,0.002'],
+        sweepValues: ['0.001','0.002'],
     },
     {
         name: 'LSRRO flowsheet',

diff --git a/electron/ui/cypress/support/commands.js b/electron/ui/cypress/support/commands.js
@@ -38,7 +38,7 @@ Cypress.Commands.add('build_flowsheet', () => {
         method: 'GET',
         url: 'http://localhost:8001/flowsheets/**',
     }).as('buildFlowsheet');
-    cy.findAllByRole('button', {name: /build flowsheet/i}).eq(0).click();
+    cy.get('#build-flowsheet-button').click()
     cy.wait('@buildFlowsheet', {timeout: 90000});
 })
 

diff --git a/electron/ui/src/components/BuildOptions/BuildOptions.js b/electron/ui/src/components/BuildOptions/BuildOptions.js
@@ -61,7 +61,15 @@ export default function BuildOptions(props) {
         ))}
         <Grid item xs={6}>
             <div style={{display:"flex"}}>
-            <Button size="small" variant="contained" color="primary" sx={{marginLeft: 1}} onClick={runBuildFlowsheet} disabled={tabValue!==0 || disableBuildButton}>
+            <Button 
+                id='build-flowsheet-button' 
+                size="small" 
+                variant="contained" 
+                color="primary" 
+                sx={{marginLeft: 1}} 
+                onClick={runBuildFlowsheet} 
+                disabled={tabValue!==0 || disableBuildButton}
+            >
                 {isBuilt ? "Re-build Flowsheet" : "Build Flowsheet"}
             </Button>
             </div>