added popup modal for rerun optimization with functionality for overw…

…rite current scenario, still needs functionality for create new scenario; added prop to all instances of popupmodal
MichaelPesce · Aug 2, 2023 · d5a4e91 · d5a4e91
1 parent 5bd414f
commit d5a4e91
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 8 deletions.
diff --git a/electron/ui/src/components/Bottombar/Bottombar.js b/electron/ui/src/components/Bottombar/Bottombar.js
@@ -12,11 +12,13 @@ import PopupModal from '../../components/PopupModal/PopupModal';
 
 export default function Bottombar(props) {
     const [ openSaveModal, setOpenSaveModal ] = useState(false)
+    const [ openRerunModal, setOpenRerunModal] = useState(false)
     // const [ disableOptimize, setDisableOptimize ] = useState(false) 
     const [ key, setKey ] =  useState(null)
     const [ hasOverride, setHasOverride ] = useState(false)
     const handleOpenSaveModal = () => setOpenSaveModal(true);
     const handleCloseSaveModal = () => setOpenSaveModal(false);
+    const handleCloseRerunModal = () => setOpenRerunModal(false);
     const styles = {
         filled: {
             backgroundColor: '#01678f',
@@ -94,12 +96,15 @@ export default function Bottombar(props) {
       }
 
       const handleRunOptimize = () => {
-        // console.log('rerun with the following overrides: ')
-        // console.log(props.scenario.override_values)
-
+        handleCloseRerunModal()
         props.handleRunModel()
       }
 
+      const reoptimizeNewScenario = () => {
+        // create function in app.js for this
+        // props.handleRunModel()
+      }
+
   return ( 
     <Box sx={{ width: 500 }}>
       <CssBaseline />
@@ -116,7 +121,7 @@ export default function Bottombar(props) {
                     <Box sx={{display: 'flex', justifyContent: 'flex-end', marginRight:'10px'}}>
                         {props.section === 0 && <Button sx={styles.filled} onClick={() => handleClick(1)} variant="contained" size="large" endIcon={<ArrowForwardIcon /> }> continue to optimization </Button>}
                         {props.section === 1 && <Button onClick={handleRunOptimize} sx={styles.filled} variant="contained" size="large" disabled={props.disableOptimize ? true : false} endIcon={<ArrowForwardIcon /> }> Optimize </Button>}
-                        {(props.section === 2 && hasOverride) && <Button onClick={handleRunOptimize} sx={styles.filled} variant="contained" size="large" disabled={props.disableOptimize ? true : false} endIcon={<ArrowForwardIcon /> }> Re-run Optimization </Button>}
+                        {(props.section === 2 && hasOverride) && <Button onClick={() => setOpenRerunModal(true)} sx={styles.filled} variant="contained" size="large" disabled={props.disableOptimize ? true : false} endIcon={<ArrowForwardIcon /> }> Re-run Optimization </Button>}
                     </Box>
                 </Grid>
             </Grid>
@@ -137,6 +142,22 @@ export default function Bottombar(props) {
         buttonTwoText='Discard'
         buttonTwoColor='error'
         buttonTwoVariant='outlined'
+        width={400}
+      />
+      <PopupModal
+        hasTwoButtons
+        open={openRerunModal}
+        handleClose={handleCloseRerunModal}
+        handleSave={reoptimizeNewScenario}
+        handleButtonTwoClick={handleRunOptimize}
+        text="Would you like to create a new scenario for this optimization, or overwrite the current scenario?"
+        buttonText='+ Create New Scenario'
+        buttonColor='primary'
+        buttonVariant='contained'
+        buttonTwoText='Overwrite Current Scenario'
+        buttonTwoColor='secondary'
+        buttonTwoVariant='outlined'
+        width={775}
       />
     </Box>
   );

diff --git a/electron/ui/src/components/PopupModal/PopupModal.js b/electron/ui/src/components/PopupModal/PopupModal.js
@@ -9,7 +9,7 @@ export default function Dashboard(props) {
             top: '50%',
             left: '50%',
             transform: 'translate(-50%, -50%)',
-            width: 400,
+            width: props.width !== undefined ? props.width : 400,
             bgcolor: 'background.paper',
             border: '2px solid #000',
             boxShadow: 24,
@@ -53,11 +53,11 @@ export default function Dashboard(props) {
             {props.hasTwoButtons ? 
             <>
             <Grid item xs={1}></Grid>
-            <Grid item xs={4}>
+            <Grid item xs={4.5}>
                 <Button fullWidth onClick={props.handleButtonTwoClick} variant={props.buttonTwoVariant} color={props.buttonTwoColor}>{props.buttonTwoText}</Button>
             </Grid>
-            <Grid item xs={2}></Grid>
-            <Grid item xs={4}>
+            <Grid item xs={1}></Grid>
+            <Grid item xs={4.5}>
                 <Button fullWidth onClick={props.handleSave} variant={props.buttonVariant} color={props.buttonColor}>{props.buttonText}</Button>
             </Grid>
             <Grid item xs={1}></Grid>

diff --git a/electron/ui/src/components/ProcessToolbar/ProcessToolbar.js b/electron/ui/src/components/ProcessToolbar/ProcessToolbar.js
@@ -104,6 +104,7 @@ export default function ProcessToolbar(props) {
         buttonTwoText='Discard'
         buttonTwoColor='error'
         buttonTwoVariant='outlined'
+        width={400}
       />
     </Box>
   );

diff --git a/electron/ui/src/components/Sidebar/Sidebar.js b/electron/ui/src/components/Sidebar/Sidebar.js
@@ -310,6 +310,7 @@ export default function Sidebar(props) {
         buttonTwoText='Discard'
         buttonTwoColor='error'
         buttonTwoVariant='outlined'
+        width={400}
       />
     </Box>
   );

diff --git a/electron/ui/src/views/Dashboard/Dashboard.js b/electron/ui/src/views/Dashboard/Dashboard.js
@@ -142,6 +142,7 @@ export default function Dashboard(props) {
         buttonText='Save'
         buttonColor='primary'
         buttonVariant='contained'
+        width={400}
       />
       <Grid item xs={4}>
       <div>

diff --git a/electron/ui/src/views/ScenarioList/ScenarioList.js b/electron/ui/src/views/ScenarioList/ScenarioList.js
@@ -253,6 +253,7 @@ export default function ScenarioList(props) {
             buttonText='Save'
             buttonColor='primary'
             buttonVariant='contained'
+            width={400}
         />
         <PopupModal
             open={openDeleteModal}
@@ -262,6 +263,7 @@ export default function ScenarioList(props) {
             buttonText='Delete'
             buttonColor='error'
             buttonVariant='contained'
+            width={400}
         />
         {
             showError && <ErrorBar duration={2000} setOpen={setShowError} severity="error" errorMessage={errorMessage} />