This change allows users to point matlab-proxy at custom scripts named matlab for use during startup by, either adding their matlab script to the PATH or, by setting the MWI_CUSTOM_MATLAB_ROOT environment variable. This capability requires users to either use Network License Manager or Existing License to license MATLAB.

Previously, matlab-proxy errored out when it was unable to determine the Version of MATLAB being launched. This restriction is now relaxed for all modes of licensing except Online Licensing.

fixes #19

Author: diningPhilosopher64

gui/package.json

@@ -40,7 +40,7 @@
       "last 1 safari version"
     ]
   },
-  "proxy": "http://localhost:8000",
+  "proxy": "http://127.0.0.1:8000",
   "homepage": "./",
   "devDependencies": {
     "@babel/preset-env": "^7.11.0",
@@ -52,4 +52,4 @@
     "react-test-renderer": "^16.13.1",
     "redux-mock-store": "^1.5.4"
   }
-}
+}

gui/src/actionCreators/actionCreators.spec.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 The MathWorks, Inc.
+// Copyright 2020-2023 The MathWorks, Inc.
 
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
@@ -65,7 +65,6 @@ describe('Test Sync actionCreators', () => {
       error: null,
       serverStatus: {
         matlabStatus: 'starting',
-        matlabVersion: 'R2020b',
         isFetching: true,
         hasFetched: false,
         fetchFailCount: 0,
@@ -105,7 +104,6 @@ describe('Test fetchWithTimeout method', () => {
     store = mockStore({
       error: null,
       serverStatus: {
-        matlabVersion: 'R2020b',
         licensingInfo: {
           type: 'NLM',
           connectionString: 'abc@nlm',
@@ -184,7 +182,6 @@ describe('Test Async actionCreators', () => {
     store = mockStore({
       error: null,
       serverStatus: {
-        matlabVersion: 'R2020b',
         licensingInfo: {
           type: 'NLM',
           connectionString: 'abc@nlm',

gui/src/components/App/App.spec.js

@@ -15,7 +15,6 @@ describe('App Component', () => {
       serverStatus: {
         licensingInfo: { type: 'MHLM', emailAddress: '[email protected]' },
         matlabStatus: 'up',
-        matlabVersion: 'R2020b',
         isFetching: false,
         hasFetched: true,
         isSubmitting: false,

gui/src/components/Confirmation/Confirmation.spec.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 The MathWorks, Inc.
+// Copyright 2020-2023 The MathWorks, Inc.
 
 import React from 'react';
 import Confirmation from './index';
@@ -25,7 +25,6 @@ describe('Confirmation Component', () => {
       serverStatus: {
         licensingInfo: { type: 'MHLM', emailAddress: '[email protected]' },
         matlabStatus: 'up',
-        matlabVersion: 'R2020b',
         isFetching: false,
         hasFetched: true,
         isSubmitting: false,

gui/src/components/Controls/Controls.spec.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 The MathWorks, Inc.
+// Copyright 2020-2023 The MathWorks, Inc.
 
 import React from 'react';
 import Controls from './index';
@@ -16,7 +16,6 @@ describe('Controls Component', () => {
       serverStatus: {
         licensingInfo: { type: 'MHLM', emailAddress: '[email protected]' },
         matlabStatus: 'up',
-        matlabVersion: 'R2020b',
         isFetching: false,
         hasFetched: true,
         isSubmitting: false,

gui/src/components/Controls/index.js

@@ -1,6 +1,6 @@
-// Copyright (c) 2020-2023 The MathWorks, Inc.
+// Copyright 2020-2023 The MathWorks, Inc.
 
-import React, { useMemo } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import ReactTooltip from 'react-tooltip';
@@ -12,10 +12,11 @@ import {
     selectMatlabStarting,
     selectMatlabStopping,
     selectMatlabDown, 
-    selectMatlabVersion,
     selectError,
     selectIsAuthenticated,
     selectAuthEnabled,
+    selectLicensingIsMhlm, 
+    selectIsEntitled, 
 } from '../../selectors';
 import {
     fetchStartMatlab,
@@ -40,20 +41,16 @@ function Controls({
     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 licensingInfo = useSelector(selectLicensingInfo);
     const canResetLicensing = licensed && !submitting;
 
-    const feedbackBody = useMemo(
-        () => `%0D%0A
-Thank you for providing feedback.%0D%0A
-%0D%0A
-MATLAB version: ${matlabVersion}%0D%0A`,
-        [matlabVersion]
-    );
+    // If licensing type is MHLM and the user is not entitled ( MATLAB version couldn't be determined (VersionInfo.xml was not found))
+    // then start, stop & signout buttons should be disabled.
+    const licensingIsMhlm = useSelector(selectLicensingIsMhlm); 
+    const isEntitled = useSelector(selectIsEntitled); 
 
     let licensingData, licensingConfirmationMessage;
     switch (licensingInfo?.type) {
@@ -136,7 +133,7 @@ MATLAB version: ${matlabVersion}%0D%0A`,
                 data-testid='startMatlabBtn'
                 className={getBtnClass(matlabUp ? 'restart' : 'start')}
                 onClick={() => callback(Confirmations.START)}
-                disabled={!licensed || matlabStarting || matlabStopping || (authEnabled && !isAuthenticated)}
+                disabled={!licensed || matlabStarting || matlabStopping || (authEnabled && !isAuthenticated) || (licensingIsMhlm && !isEntitled)}
                 data-for="control-button-tooltip"
                 data-tip={`${matlabUp ? 'Restart' : 'Start'}  MATLAB`}
             >
@@ -160,7 +157,7 @@ MATLAB version: ${matlabVersion}%0D%0A`,
                 data-testid='unsetLicensingBtn'
                 className={getBtnClass('sign-out')}
                 onClick={() => callback(Confirmations.SIGN_OUT)}
-                disabled={!canResetLicensing || (authEnabled && !isAuthenticated)}
+                disabled={!canResetLicensing || (authEnabled && !isAuthenticated) || (licensingIsMhlm && !isEntitled)}
                 data-for="control-button-tooltip"
                 data-tip= {licensingData.dataTip}
             >
@@ -183,9 +180,11 @@ MATLAB version: ${matlabVersion}%0D%0A`,
                 id="feedback"
                 data-testid='feedbackLink'
                 className="btn btn_color_mediumgray companion_btn"
-                href={`mailto:[email protected]?subject=MATLAB-PROXY Feedback&body=${feedbackBody}`}
+                href="https://github.com/mathworks/matlab-proxy/issues/new/choose"
+                target="_blank"
+                rel="noreferrer"
                 data-for="control-button-tooltip"
-                data-tip="Send feedback (opens your default email application)"
+                data-tip="Provide feedback (opens matlab-proxy repository on github.com in a new tab)"
             >
                 <span className='icon-custom-feedback'></span>
                 <span className='btn-label'>Feedback</span>

gui/src/components/EntitlementSelector/EntitlementSelector.spec.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2023 The MathWorks, Inc.
+// Copyright 2020-2023 The MathWorks, Inc.
 
 import React from "react";
 import EntitlementSelector from "./index";
@@ -31,7 +31,6 @@ describe("EntitlementSelector Component", () => {
           entitlementId: null,
         },
         matlabStatus: "down",
-        matlabVersion: "R2023a",
         isFetching: false,
         hasFetched: true,
         isSubmitting: false,

gui/src/components/EntitlementSelector/index.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2023 The MathWorks, Inc.
+// Copyright 2020-2023 The MathWorks, Inc.
 
 import { useState } from "react";
 import { useDispatch } from "react-redux";

gui/src/components/Help/Help.spec.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 The MathWorks, Inc.
+// Copyright 2020-2023 The MathWorks, Inc.
 
 import React from 'react';
 import App from '../App'
@@ -16,7 +16,6 @@ describe('Help Component', () => {
       serverStatus: {
         licensingInfo: { type: 'MHLM', emailAddress: '[email protected]' },
         matlabStatus: 'up',
-        matlabVersion: 'R2020b',
         isFetching: false,
         hasFetched: true,
         isSubmitting: false,

gui/src/components/Help/index.js

@@ -55,7 +55,7 @@ function Help({
                                 Sign out of MATLAB. Use this to stop MATLAB and to sign in with an alternative account. Available if using online licensing.<br />
                                 Unset network license manager server address. Use this to stop MATLAB and enter new licensing information. Available if using network license manager.
                             </p>
-                            <p className="icon-custom-feedback">{`Send feedback about the ${targetEnvMsg}. This action opens your default email application.`}</p>
+                            <p className="icon-custom-feedback">{`Send feedback about the ${targetEnvMsg}. This action opens the matlab-proxy repository on github.com`}</p>
                         </div>
                     </div>
                     <div className="modal-footer">