Allow Stop MATLAB button when MATLAB is in a starting state.

Author: diningPhilosopher64

gui/src/actionCreators/index.js

@@ -286,7 +286,7 @@ export function fetchStopMatlab() {
         }
 
         dispatch(requestStopMatlab());
-        const response = await fetchWithTimeout(dispatch, './stop_matlab', options, 15000);
+        const response = await fetchWithTimeout(dispatch, './stop_matlab', options, 30000);
         const data = await response.json();
         dispatch(receiveStopMatlab(data));
 

gui/src/components/Controls/index.js

@@ -8,9 +8,10 @@ import {
     selectSubmittingServerStatus,
     selectLicensingIsMhlm,
     selectLicensingProvided,
-    selectMatlabRunning,
+    selectMatlabUp,
     selectMatlabStarting,
     selectMatlabStopping,
+    selectMatlabDown, 
     selectMatlabVersion,
     selectError,
     selectIsAuthenticated,
@@ -36,14 +37,14 @@ function Controls({
     const submitting = useSelector(selectSubmittingServerStatus);
     const licensed = useSelector(selectLicensingProvided);
     const mhlmLicense = useSelector(selectLicensingIsMhlm);
-    const matlabRunning = useSelector(selectMatlabRunning);
     const matlabStarting = useSelector(selectMatlabStarting);
+    const matlabUp = useSelector(selectMatlabUp);
     const matlabStopping = useSelector(selectMatlabStopping);
+    const matlabDown = useSelector(selectMatlabDown);
     const matlabVersion = useSelector(selectMatlabVersion);
     const error = useSelector(selectError);
     const authEnabled = useSelector(selectAuthEnabled);
     const isAuthenticated = useSelector(selectIsAuthenticated);
-    //     const canTerminateIntegration = !submitting;
     const canResetLicensing = licensed && !submitting;
 
     const feedbackBody = useMemo(
@@ -57,7 +58,7 @@ MATLAB version: ${matlabVersion}%0D%0A`,
     const Confirmations = {
         START: {
             type: 'confirmation',
-            message: `Are you sure you want to ${matlabRunning ? 're' : ''}start MATLAB?`,
+            message: `Are you sure you want to ${ matlabUp ? 're' : ''}start MATLAB?`,
             callback: fetchStartMatlab
         },
         STOP: {
@@ -98,7 +99,7 @@ MATLAB version: ${matlabVersion}%0D%0A`,
             <button
                 id="startMatlab"
                 data-testid='startMatlabBtn'
-                className={getBtnClass(matlabRunning ? 'restart' : 'start')}
+                className={getBtnClass(matlabUp ? 'restart' : 'start')}
                 onClick={() => callback(Confirmations.START)}
                 disabled={!licensed || matlabStarting || matlabStopping || (authEnabled && !isAuthenticated)}
                 data-for="control-button-tooltip"
@@ -112,7 +113,7 @@ MATLAB version: ${matlabVersion}%0D%0A`,
                 data-testid='stopMatlabBtn'
                 className={getBtnClass('stop')}
                 onClick={() => callback(Confirmations.STOP)}
-                disabled={!matlabRunning || (authEnabled && !isAuthenticated)}
+                disabled={ matlabStopping || matlabDown || (authEnabled && !isAuthenticated)}
                 data-for="control-button-tooltip"
                 data-tip="Stop MATLAB"
             >

gui/src/selectors/index.js

@@ -42,11 +42,6 @@ export const selectMatlabUp = createSelector(
     matlabStatus => matlabStatus === 'up'
 );
 
-export const selectMatlabRunning = createSelector(
-    selectMatlabStatus,
-    matlabStatus => matlabStatus === 'up'
-);
-
 export const selectMatlabStarting = createSelector(
     selectMatlabStatus,
     matlabStatus => matlabStatus === 'starting'
@@ -57,6 +52,11 @@ export const selectMatlabStopping = createSelector(
     matlabStatus => matlabStatus === 'stopping'
 );
 
+export const selectMatlabDown = createSelector(
+    selectMatlabStatus,
+    matlabStatus => matlabStatus === 'down'
+);
+
 export const selectOverlayHidable = createSelector(
     selectMatlabStatus,
     selectIsError,

matlab_proxy/app_state.py

@@ -910,10 +910,13 @@ async def stop_matlab(self, force_quit=False):
 
         waiters = []
         if matlab is not None:
-            # Sending a request to embedded connector works sporadically on posix systems.
-            # So, terminating the process when force_quit is set to True.
             if system.is_posix() and matlab.returncode is None:
-                if force_quit:
+                # Sending an exit request to the embedded connector takes time.
+                # When MATLAB is in a "starting" state (implies the Embedded connector is not up)
+                # OR
+                # When force_quit is set to True
+                # directly terminate the MATLAB process instead.
+                if await self.get_matlab_state() == "starting" or force_quit:   
                     logger.debug("Forcing the MATLAB process to terminate...")
                     matlab.terminate()
                     waiters.append(matlab.wait())