WIP: Test force-closing vex instances

Author: e-halinen

src/renderer/components/App.jsx

@@ -110,9 +110,11 @@ const App = ({helmetUIVersion, versions, searchEMMEPython}) => {
       if (found) {
         if (confirm(`Python ${versions.emme_python} löytyi sijainnista:\n\n${pythonPath}\n\nHaluatko käyttää tätä sijaintia?`)) {
           globalSettingsStore.current.set('emme_python_path', pythonPath);
+          vex.closeAll()
         }
       } else {
         alert(`Emme ${versions.emme_system} ja Python ${versions.emme_python} eivät löytyneet oletetusta sijainnista.\n\nMääritä Pythonin sijainti Asetukset-dialogissa.`);
+        vex.closeAll()
       }
     }
     // Copy existing global store values to state. Remember: state updates async so refer to existing.
@@ -136,6 +138,7 @@ const App = ({helmetUIVersion, versions, searchEMMEPython}) => {
     if (!fs.existsSync(existingProjectPath)) {
       alert(`Projektikansiota ei löydy polusta '${existingProjectPath}'.\nProjektikansioksi asetetaan kotikansio '${homedir}'.`)
       _setProjectPath(homedir);
+      vex.closeAll();
     }
 
     // If HELMET Scripts is the initial (un-set), download latest version and use that. Remember: state updates async so refer to existing.

src/renderer/components/HelmetProject/HelmetProject.jsx

@@ -3,7 +3,6 @@ import { v4 as uuidv4 } from 'uuid';
 import Store from "electron-store";
 import fs from "fs";
 import path from "path";
-import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
 
 const {ipcRenderer} = require('electron');
 
@@ -37,9 +36,6 @@ const HelmetProject = ({
   const [statusRunFinishTime, setStatusRunFinishTime] = useState(null); //Updated when receiving "finished" message
   const [demandConvergenceArray, setDemandConvergenceArray] = useState([]); // Add convergence values to array every iteration
 
-  // User-set scenario list height in the Scenarios tab
-  const [scenarioListHeight, setScenarioListHeight] = useState(null);
-
   // Cost-Benefit Analysis (CBA) controls
   const [cbaOptions, setCbaOptions] = useState({});
 
@@ -216,7 +212,8 @@ const HelmetProject = ({
       setOpenScenarioID(null);
       setScenarios(scenarios.filter((s) => s.id !== scenario.id));
       fs.unlinkSync(path.join(projectPath, `${scenario.name}.json`));
-      // window.location.reload();  // Testing if the new version works without this hack...
+      vex.closeAll();
+      // window.location.reload();  // Vex-js dialog input gets stuck otherwise
     }
   };
 
@@ -236,22 +233,27 @@ const HelmetProject = ({
     // Check required global parameters are set
     if (!emmePythonPath) {
       alert("Python -sijaintia ei ole asetettu!");
+      vex.closeAll();
       return;
     }
     if (!helmetScriptsPath) {
       alert("Helmet Scripts -kansiota ei ole asetettu, tarkista Asetukset.");
+      vex.closeAll();
       return;
     }
     if (!projectPath) {
       alert("Projektin kotikansiota ei ole asetettu, tarkista Asetukset.");
+      vex.closeAll();
       return;
     }
     if (!basedataPath) {
       alert("L\u00E4ht\u00F6datan kansiota ei ole asetettu, tarkista Asetukset.");
+      vex.closeAll();
       return;
     }
     if (!resultsPath) {
       alert("Tulosdatan kansiota ei ole asetettu, tarkista Asetukset.");
+      vex.closeAll();
       return;
     }
 
@@ -273,6 +275,8 @@ const HelmetProject = ({
       }
     }
 
+    vex.closeAll();
+
     // Perform UI changes to indicate "initializing run of active scenarios"
     setOpenScenarioID(null); // Close any open scenario configuration
     setLogContents([
@@ -387,44 +391,27 @@ const HelmetProject = ({
 
       {/* Panel for primary view and controls */}
       <div className="Project__runtime">
-        <Tabs className="tab-container">
-          <TabList className="tab-list">
-            <Tab selectedClassName="selected-tab" className="tab-list-item tab-item-name"> 
-              Skenaariot
-            </Tab>
-            <Tab selectedClassName="selected-tab" className="tab-list-item tab-item-name">
-              CBA
-            </Tab>
-          </TabList>
-
-          <TabPanel className="runtime-tab">
-            <Runtime
-              projectPath={projectPath}
-              reloadScenarios={() => _loadProjectScenarios(projectPath)}
-              scenarios={scenarios}
-              scenarioIDsToRun={scenarioIDsToRun}
-              runningScenarioID={runningScenarioID}
-              openScenarioID={openScenarioID}
-              setOpenScenarioID={setOpenScenarioID}
-              deleteScenario={(scenario) => {_deleteScenario(scenario)}}
-              handleClickScenarioToActive={_handleClickScenarioToActive}
-              handleClickNewScenario={_handleClickNewScenario}
-              handleClickStartStop={_handleClickStartStop}
-              logArgs={logArgs}
-              duplicateScenario={duplicateScenario}
-              scenarioListHeight={scenarioListHeight}
-              setScenarioListHeight={setScenarioListHeight}
-            />
-          </TabPanel>
-          <TabPanel>
-            <CostBenefitAnalysis
-              resultsPath={resultsPath}
-              cbaOptions={cbaOptions}
-              setCbaOptions={setCbaOptions}
-              runCbaScript={_runCbaScript}
-            />
-          </TabPanel>
-        </Tabs>
+        <Runtime
+          projectPath={projectPath}
+          reloadScenarios={() => _loadProjectScenarios(projectPath)}
+          scenarios={scenarios}
+          scenarioIDsToRun={scenarioIDsToRun}
+          runningScenarioID={runningScenarioID}
+          openScenarioID={openScenarioID}
+          setOpenScenarioID={setOpenScenarioID}
+          deleteScenario={(scenario) => {_deleteScenario(scenario)}}
+          handleClickScenarioToActive={_handleClickScenarioToActive}
+          handleClickNewScenario={_handleClickNewScenario}
+          handleClickStartStop={_handleClickStartStop}
+          logArgs={logArgs}
+          duplicateScenario={duplicateScenario}
+        />
+        <CostBenefitAnalysis
+          resultsPath={resultsPath}
+          cbaOptions={cbaOptions}
+          setCbaOptions={setCbaOptions}
+          runCbaScript={_runCbaScript}
+        />
       </div>
 
       {/* Panel for secondary view(s) and controls */}