matlab-proxy 0.18.2__tar.gz → 0.20.0__tar.gz

{matlab-proxy-0.18.2/matlab_proxy.egg-info → matlab-proxy-0.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: matlab-proxy
-Version: 0.18.2
+Version: 0.20.0
 Summary: Python® package enables you to launch MATLAB® and access it from a web browser.
 Home-page: https://github.com/mathworks/matlab-proxy/
 Author: The MathWorks, Inc.
@@ -171,7 +171,7 @@ Description: # MATLAB Proxy
         
         ### Windows Subsystem for Linux (WSL 2)
         
-        To install `matlab-proxy` in WSL 2, follow the steps mentioned in the [Installation Guide for WSL 2](./installation/wsl2/README.md).
+        To install `matlab-proxy` in WSL 2, follow the steps mentioned in the [Installation Guide for WSL 2](./install_guides/wsl2/README.md).
         
         ## Using an already activated MATLAB with matlab-proxy
         `matlab-proxy` version `v0.7.0` introduces support for using an existing MATLAB license. Use the Existing License option only if you have an activated MATLAB. This allows you to start MATLAB without authenticating every time.

{matlab-proxy-0.18.2 → matlab-proxy-0.20.0}/README.md

@@ -163,7 +163,7 @@ $ pip install --upgrade matlab-proxy>=0.5.0
 
 ### Windows Subsystem for Linux (WSL 2)
 
-To install `matlab-proxy` in WSL 2, follow the steps mentioned in the [Installation Guide for WSL 2](./installation/wsl2/README.md).
+To install `matlab-proxy` in WSL 2, follow the steps mentioned in the [Installation Guide for WSL 2](./install_guides/wsl2/README.md).
 
 ## Using an already activated MATLAB with matlab-proxy
 `matlab-proxy` version `v0.7.0` introduces support for using an existing MATLAB license. Use the Existing License option only if you have an activated MATLAB. This allows you to start MATLAB without authenticating every time.

{matlab-proxy-0.18.2 → matlab-proxy-0.20.0}/gui/package-lock.json

@@ -11,6 +11,7 @@
         "clsx": "^1.1.1",
         "cross-fetch": "^3.0.6",
         "crypto-js": "4.2.0",
+        "postcss": "^8.4.38",
         "react": "^16.13.1",
         "react-dom": "^16.13.1",
         "react-draggable": "^4.4.3",
@@ -21,7 +22,8 @@
         "react-use": "^15.3.4",
         "redux": "^4.0.5",
         "redux-thunk": "^2.3.0",
-        "reselect": "^4.0.0"
+        "reselect": "^4.0.0",
+        "resolve-url-loader": "^5.0.0"
       },
       "devDependencies": {
         "@babel/preset-env": "^7.11.0",
@@ -15671,6 +15673,54 @@
         "node": ">=10"
       }
     },
+    "node_modules/react-scripts/node_modules/picocolors": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+    },
+    "node_modules/react-scripts/node_modules/resolve-url-loader": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
+      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
+      "dependencies": {
+        "adjust-sourcemap-loader": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "loader-utils": "^2.0.0",
+        "postcss": "^7.0.35",
+        "source-map": "0.6.1"
+      },
+      "engines": {
+        "node": ">=8.9"
+      },
+      "peerDependencies": {
+        "rework": "1.0.1",
+        "rework-visit": "1.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rework": {
+          "optional": true
+        },
+        "rework-visit": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-scripts/node_modules/resolve-url-loader/node_modules/postcss": {
+      "version": "7.0.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "dependencies": {
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
     "node_modules/react-scripts/node_modules/semver": {
       "version": "7.5.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
@@ -15685,6 +15735,14 @@
         "node": ">=10"
       }
     },
+    "node_modules/react-scripts/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/react-scripts/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -16046,51 +16104,18 @@
       "dev": true
     },
     "node_modules/resolve-url-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
-      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
+      "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
       "dependencies": {
         "adjust-sourcemap-loader": "^4.0.0",
         "convert-source-map": "^1.7.0",
         "loader-utils": "^2.0.0",
-        "postcss": "^7.0.35",
+        "postcss": "^8.2.14",
         "source-map": "0.6.1"
       },
       "engines": {
-        "node": ">=8.9"
-      },
-      "peerDependencies": {
-        "rework": "1.0.1",
-        "rework-visit": "1.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rework": {
-          "optional": true
-        },
-        "rework-visit": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-    },
-    "node_modules/resolve-url-loader/node_modules/postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-      "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
+        "node": ">=12"
       }
     },
     "node_modules/resolve-url-loader/node_modules/source-map": {
@@ -18235,9 +18260,9 @@
       }
     },
     "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -18804,9 +18829,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -29916,6 +29941,34 @@
             "yallist": "^4.0.0"
           }
         },
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+        },
+        "resolve-url-loader": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
+          "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
+          "requires": {
+            "adjust-sourcemap-loader": "^4.0.0",
+            "convert-source-map": "^1.7.0",
+            "loader-utils": "^2.0.0",
+            "postcss": "^7.0.35",
+            "source-map": "0.6.1"
+          },
+          "dependencies": {
+            "postcss": {
+              "version": "7.0.39",
+              "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+              "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+              "requires": {
+                "picocolors": "^0.2.1",
+                "source-map": "^0.6.1"
+              }
+            }
+          }
+        },
         "semver": {
           "version": "7.5.2",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
@@ -29924,6 +29977,11 @@
             "lru-cache": "^6.0.0"
           }
         },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -30213,31 +30271,17 @@
       "dev": true
     },
     "resolve-url-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
-      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
+      "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
       "requires": {
         "adjust-sourcemap-loader": "^4.0.0",
         "convert-source-map": "^1.7.0",
         "loader-utils": "^2.0.0",
-        "postcss": "^7.0.35",
+        "postcss": "^8.2.14",
         "source-map": "0.6.1"
       },
       "dependencies": {
-        "picocolors": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-        },
-        "postcss": {
-          "version": "7.0.39",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-          "requires": {
-            "picocolors": "^0.2.1",
-            "source-map": "^0.6.1"
-          }
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -31817,9 +31861,9 @@
           }
         },
         "ws": {
-          "version": "8.13.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-          "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+          "version": "8.17.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+          "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
           "requires": {}
         }
       }
@@ -32277,9 +32321,9 @@
       }
     },
     "ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "requires": {}
     },
     "xdg-basedir": {

{matlab-proxy-0.18.2 → matlab-proxy-0.20.0}/gui/package.json

@@ -6,6 +6,7 @@
     "clsx": "^1.1.1",
     "cross-fetch": "^3.0.6",
     "crypto-js": "4.2.0",
+    "postcss": "^8.4.38",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-draggable": "^4.4.3",
@@ -16,7 +17,8 @@
     "react-use": "^15.3.4",
     "redux": "^4.0.5",
     "redux-thunk": "^2.3.0",
-    "reselect": "^4.0.0"
+    "reselect": "^4.0.0",
+    "resolve-url-loader": "^5.0.0"
   },
   "scripts": {
     "start": "react-scripts start",

{matlab-proxy-0.18.2 → matlab-proxy-0.20.0}/gui/src/actionCreators/actionCreators.spec.js

@@ -36,7 +36,7 @@ describe.each([
     [actionCreators.requestSetLicensing, { type: actions.REQUEST_SET_LICENSING }],
     [actionCreators.requestStopMatlab, { type: actions.REQUEST_STOP_MATLAB, status: 'stopping' }],
     [actionCreators.requestStartMatlab, { type: actions.REQUEST_START_MATLAB, status: 'starting' }],
-    [actionCreators.requestTerminateIntegration, { type: actions.REQUEST_TERMINATE_INTEGRATION }]
+    [actionCreators.requestShutdownIntegration, { type: actions.REQUEST_SHUTDOWN_INTEGRATION }]
 ])('Test Request actionCreators', (method, expectedAction) => {
     test(`check if an action of type  ${expectedAction.type} is returned when method actionCreator.${method.name}() is called`, () => {
         expect(method()).toEqual(expectedAction);
@@ -48,7 +48,7 @@ describe.each([
     [actionCreators.receiveStopMatlab, { matlabStatus: 'down' }, { type: actions.RECEIVE_STOP_MATLAB, status: { matlabStatus: 'down' } }],
     [actionCreators.receiveStartMatlab, { matlabStatus: 'up' }, { type: actions.RECEIVE_START_MATLAB, status: { matlabStatus: 'up' } }],
     [actionCreators.receiveError, { message: 'ERROR: License Manager Error -9', logs: null }, { type: actions.RECEIVE_ERROR, error: { message: 'ERROR: License Manager Error -9', logs: null } }],
-    [actionCreators.receiveTerminateIntegration, { licensing: {} }, { type: actions.RECEIVE_TERMINATE_INTEGRATION, status: { licensing: {} }, loadUrl: '../' }]
+    [actionCreators.requestShutdownIntegration, {}, { type: actions.REQUEST_SHUTDOWN_INTEGRATION }]
 ])('Test Receive actionCreators', (method, input, expectedAction) => {
     test(`check if an action of type  ${expectedAction.type} is returned when method actionCreator.${method.name}() is called`, () => {
         expect(method(input)).toEqual(expectedAction);
@@ -429,32 +429,6 @@ describe('Test Async actionCreators', () => {
         });
     });
 
-    it('should dispatch REQUEST_TERMINATE_INTEGRATION and RECEIVE_TERMINATE_INTEGRATION when we terminate the integration', () => {
-        fetchMock.deleteOnce('./terminate_integration', {
-            body: {
-                matlab: {
-                    status: 'down'
-                },
-                licensing: null
-            },
-            headers: { 'content-type': 'application/json' }
-        });
-
-        const expectedActionTypes = [
-            actions.REQUEST_TERMINATE_INTEGRATION,
-            actions.RECEIVE_TERMINATE_INTEGRATION
-        ];
-
-        return store
-            .dispatch(actionCreators.fetchTerminateIntegration())
-            .then(() => {
-                const receivedActions = store.getActions();
-                expect(receivedActions.map((action) => action.type)).toEqual(
-                    expectedActionTypes
-                );
-            });
-    });
-
     it('should dispatch REQUEST_STOP_MATLAB AND RECEIVE_STOP_MATLAB when we stop matlab', () => {
         fetchMock.putOnce('./start_matlab', {
             body: {

{matlab-proxy-0.18.2 → matlab-proxy-0.20.0}/gui/src/actionCreators/index.js

@@ -8,13 +8,13 @@ import {
     RECEIVE_SERVER_STATUS,
     REQUEST_SET_LICENSING,
     REQUEST_UPDATE_LICENSING,
-    REQUEST_TERMINATE_INTEGRATION,
+    REQUEST_SHUTDOWN_INTEGRATION,
     REQUEST_STOP_MATLAB,
     REQUEST_START_MATLAB,
     REQUEST_ENV_CONFIG,
     RECEIVE_SET_LICENSING,
     RECEIVE_UPDATE_LICENSING,
-    RECEIVE_TERMINATE_INTEGRATION,
+    RECEIVE_SHUTDOWN_INTEGRATION,
     RECEIVE_STOP_MATLAB,
     RECEIVE_START_MATLAB,
     RECEIVE_ERROR,
@@ -162,15 +162,15 @@ export function receiveUpdateLicensing (status) {
     };
 }
 
-export function requestTerminateIntegration () {
+export function requestShutdownIntegration () {
     return {
-        type: REQUEST_TERMINATE_INTEGRATION
+        type: REQUEST_SHUTDOWN_INTEGRATION
     };
 }
 
-export function receiveTerminateIntegration (status) {
+export function receiveShutdownIntegration (status) {
     return {
-        type: RECEIVE_TERMINATE_INTEGRATION,
+        type: RECEIVE_SHUTDOWN_INTEGRATION,
         status,
         loadUrl: '../'
     };
@@ -244,7 +244,7 @@ export function fetchServerStatus (requestTransferSession = false) {
         const isAuthEnabled = selectAuthEnabled(getState());
         const isAuthenticated = selectIsAuthenticated(getState());
         const clientIdInState = selectClientId(getState());
-        const clientId = clientIdInState || sessionStorage.getItem('MWI_CLIENT_ID');
+        const clientId = clientIdInState;
 
         dispatch(requestServerStatus());
         let url = './get_status';
@@ -269,7 +269,6 @@ export function fetchServerStatus (requestTransferSession = false) {
         dispatch(receiveServerStatus(data));
 
         if (clientId == null && data.clientId) {
-            sessionStorage.setItem('MWI_CLIENT_ID', data.clientId);
             dispatch(setClientId(data.clientId));
         }
         if ('isActiveClient' in data) {
@@ -375,7 +374,7 @@ export function fetchUnsetLicensing () {
     };
 }
 
-export function fetchTerminateIntegration () {
+export function fetchShutdownIntegration () {
     return async function (dispatch, getState) {
         const options = {
             method: 'DELETE',
@@ -384,10 +383,10 @@ export function fetchTerminateIntegration () {
             credentials: 'same-origin'
         };
 
-        dispatch(requestTerminateIntegration());
-        const response = await fetchWithTimeout(dispatch, './terminate_integration', options, 15000);
+        dispatch(requestShutdownIntegration());
+        const response = await fetchWithTimeout(dispatch, './shutdown_integration', options, 15000);
         const data = await response.json();
-        dispatch(receiveTerminateIntegration(data));
+        dispatch(receiveShutdownIntegration(data));
     };
 }
 

{matlab-proxy-0.18.2 → matlab-proxy-0.20.0}/gui/src/actions/index.js

@@ -8,12 +8,12 @@ export const REQUEST_SERVER_STATUS = 'REQUEST_SERVER_STATUS';
 export const RECEIVE_SERVER_STATUS = 'RECEIVE_SERVER_STATUS';
 export const REQUEST_SET_LICENSING = 'REQUEST_SET_LICENSING';
 export const REQUEST_UPDATE_LICENSING = 'REQUEST_UPDATE_LICENSING';
-export const REQUEST_TERMINATE_INTEGRATION = 'REQUEST_TERMINATE_INTEGRATION';
+export const REQUEST_SHUTDOWN_INTEGRATION = 'REQUEST_SHUTDOWN_INTEGRATION';
 export const REQUEST_STOP_MATLAB = 'REQUEST_STOP_MATLAB';
 export const REQUEST_START_MATLAB = 'REQUEST_START_MATLAB';
 export const RECEIVE_SET_LICENSING = 'RECEIVE_SET_LICENSING';
 export const RECEIVE_UPDATE_LICENSING = 'RECEIVE_UPDATE_LICENSING';
-export const RECEIVE_TERMINATE_INTEGRATION = 'RECEIVE_TERMINATE_INTEGRATION';
+export const RECEIVE_SHUTDOWN_INTEGRATION = 'RECEIVE_SHUTDOWN_INTEGRATION';
 export const RECEIVE_STOP_MATLAB = 'RECEIVE_STOP_MATLAB';
 export const RECEIVE_START_MATLAB = 'RECEIVE_START_MATLAB';
 export const RECEIVE_ERROR = 'RECEIVE_ERROR';

{matlab-proxy-0.18.2 → matlab-proxy-0.20.0}/gui/src/components/App/App.spec.js

@@ -143,13 +143,9 @@ describe('App Component', () => {
             initialState
         });
 
-        const paragraphElements = [...container.getElementsByTagName('pre')];
+        const paragraphElement = [...container.getElementsByTagName('pre')][0];
 
-        expect(
-            paragraphElements.some((p) =>
-                p.textContent.includes('integration terminated')
-            )
-        ).toBe(true);
+        expect(paragraphElement.textContent.includes('terminated or the session ended')).toBe(true);
     });
 
     it('should display MatlabInstallError', () => {

matlab-proxy-0.20.0/gui/src/components/App/IdleBufferTimeouts.spec.js

@@ -0,0 +1,120 @@
+// Copyright 2024 The MathWorks, Inc.
+
+// File to test IDLE and BUFFER timeouts.
+// Need a seperate file for mocking BUFFER_TIMEOUT_DURATION before App component is imported for testing.
+
+import React from 'react';
+
+import fetchMock from 'fetch-mock';
+import state from '../../test/utils/state';
+import { createStatusResponse } from '../../test/utils/responses';
+import { render } from '../../test/utils/react-test';
+import { waitFor } from '@testing-library/react';
+import * as responses from '../../test/utils/responses';
+import {screen} from '@testing-library/dom';
+
+import App from './index';
+//
+// Mock BUFFER_TIMEOUT_DURATION before import App.
+jest.mock('../../constants', () => ({
+    BUFFER_TIMEOUT_DURATION: 1
+}));
+
+const _ = require('lodash');
+
+describe('Timeouts in App Component', () => {
+    let initialState;
+    beforeEach(() => {
+        initialState = _.cloneDeep(state);
+
+        // As the tests are run in a NodeJS environment whereas the correct values for document.URL and window.location.href
+        // are set by the browser, for tests, set the appropriate values for document.URL, window.location.href and window.location.origin
+        // for the component to render without errors
+        // Delete and redefine 'origin' and 'href' properties as they are read-only.
+        delete window.location;
+        window.location = {
+            origin: '/',
+            href: 'http://127.0.0.1/'
+        };
+
+        initialState.serverStatus.licensingInfo.entitlements = [{ id: '1234567', label: null, license_number: '7654321' }];
+        initialState.serverStatus.licensingInfo.entitlementId = '1234567';
+
+        const mockIntersectionObserver = jest.fn();
+        mockIntersectionObserver.mockReturnValue({
+            observe: () => null,
+            disconnect: () => null
+        });
+
+        window.IntersectionObserver = mockIntersectionObserver;
+    });
+
+    afterEach(() => {
+        jest.clearAllMocks();
+        fetchMock.restore();
+    });
+
+    it('should dispatch fetchShutdownIntegration when both IDLE and BUFFER timer expires', async () => {
+    // Hide the tutorial and make the overlay visible
+        initialState.tutorialHidden = true;
+        initialState.overlayVisibility = true;
+        initialState.idleTimeoutDuration = 1;
+        const mockBufferTimeoutDuration = 1;
+        // Takes a tiny amount of time(10ms) apart from idleTimeoutDuration + bufferTimeoutDuration
+        // for fetchMock to be called for the second time. Only specific to this test. Using 1000ms for test to pass in CI systems.
+        const additionalTimeForFetchMock = 1;
+
+        // Mock initial fetchServerStatus response
+        fetchMock.getOnce('/get_status', {
+            body: createStatusResponse,
+            headers: { 'content-type': 'application/json' }
+        });
+
+        // Mock fetchShutdownIntegration response
+        fetchMock.deleteOnce('/shutdown_integration', {
+            body: createStatusResponse,
+            headers: { 'content-type': 'application/json' }
+        });
+
+        render(<App />, {
+            initialState
+        });
+
+        await waitFor(() => {
+            expect(fetchMock.called('get_status')).toBe(true);
+            expect(fetchMock.called('shutdown_integration')).toBe(true);
+        }, { timeout: initialState.idleTimeoutDuration * 1000 + mockBufferTimeoutDuration * 1000 + additionalTimeForFetchMock * 1000 });
+    });
+
+    it('should show TerminationWarning dialog box when IDLE timer expires', async () => {
+    // Hide the tutorial and make the overlay visible
+        initialState.tutorialHidden = true;
+        initialState.overlayVisibility = true;
+        initialState.idleTimeoutDuration = 1;
+
+        // Mock initial fetchServerStatus response
+        fetchMock.getOnce('/get_status', {
+            status: 200,
+            body: responses.createStatusResponse,
+            headers: { 'Content-Type': 'application/json' }
+
+        });
+
+        const consoleSpy = jest.spyOn(console, 'log').mockImplementation();
+
+        const { getByTestId } = render(<App />, {
+            initialState
+        });
+
+        await waitFor(() => {
+            const shutdownWarningDialogBox = getByTestId('ShutdownWarning');
+            expect(shutdownWarningDialogBox).toBeInTheDocument();
+            const hasLog = consoleSpy.mock.calls.some(call => {
+                return call[0].includes('The IDLE timer has expired due to inactivity. Will display Shutdown Warning to the user.');
+            });
+            expect(hasLog).toBe(true);
+        }, { timeout: initialState.idleTimeoutDuration * 1000 });
+
+        consoleSpy.mockRestore();
+    });
+});