Infrastructural updates to support MATLAB R2025a.

rashedmyt · prabhakk-mw · commit 410704412fba · 2025-05-06T05:42:06.000Z
diff --git a/gui/src/components/App/index.jsx b/gui/src/components/App/index.jsx
@@ -31,8 +31,6 @@ import {
     selectLicensingMhlmHasEntitlements,
     selectIsEntitled,
     selectLicensingInfo,
-    selectUseMOS,
-    selectUseMRE,
     selectIsConcurrent,
     selectWasEverActive,
     selectIsConcurrencyEnabled,
@@ -73,8 +71,6 @@ function App () {
     const isAuthenticated = useSelector(selectIsAuthenticated);
     const authEnabled = useSelector(selectAuthEnabled);
     const licensingInfo = useSelector(selectLicensingInfo);
-    const useMOS = useSelector(selectUseMOS);
-    const useMRE = useSelector(selectUseMRE);
     const isSessionConcurrent = useSelector(selectIsConcurrent);
     const isActiveClient = useSelector(selectIsActiveClient);
     const isConcurrencyEnabled = useSelector(selectIsConcurrencyEnabled);
@@ -163,12 +159,11 @@ function App () {
     }, []);
 
     const htmlToRenderMATLAB = () => {
-        let theHtmlToRenderMATLAB = useMOS
-            ? 'index-matlabonlineserver.html'
-            : 'index-jsd-cr.html';
-        if (useMRE) {
-            theHtmlToRenderMATLAB += `?mre=${encodeURIComponent(fullyQualifiedUrl)}`;
-        }
+        let theHtmlToRenderMATLAB = 'index-jsd-cr.html';
+
+        // Add mre query parameter
+        theHtmlToRenderMATLAB += `?mre=${encodeURIComponent(fullyQualifiedUrl)}`;
+
         return theHtmlToRenderMATLAB;
     };
 
@@ -377,7 +372,6 @@ function App () {
     // process in development mode
 
     // MW Internal Comment: See g2992889 for a discussion on why a FQDN is required in the MRE parameter.
-    // MW Internal Comment: Using websocket on breaks some UI components : `./index-matlabonlineserver.html?websocket=on&mre=${fullyQualifiedUrl}`;
     const matlabUrl = process.env.NODE_ENV === 'development'
         ? 'http://localhost:31515/index-jsd-cr.html'
         : `./${htmlToRenderMATLAB()}`;
diff --git a/gui/src/reducers/index.js b/gui/src/reducers/index.js
@@ -41,26 +41,6 @@ export function authEnabled (state = false, action) {
     }
 }
 
-// Stores information on whether to use MOS HTML while rendering MATLAB.
-export function useMOS (state = false, action) {
-    switch (action.type) {
-        case RECEIVE_ENV_CONFIG:
-            return action.config.useMOS;
-        default:
-            return state;
-    }
-}
-
-// Stores information on whether to provide MRE parameter to HTML while rendering MATLAB.
-export function useMRE (state = false, action) {
-    switch (action.type) {
-        case RECEIVE_ENV_CONFIG:
-            return action.config.useMRE;
-        default:
-            return state;
-    }
-}
-
 // Stores timeout duration for idle timer.
 export function idleTimeoutDuration (state = null, action) {
     switch (action.type) {
@@ -413,8 +393,6 @@ export const matlab = combineReducers({
     versionOnPath: matlabVersionOnPath,
     supportedVersions: supportedMatlabVersions,
     busyStatus: matlabBusyStatus,
-    useMOS,
-    useMRE
 });
 
 export const serverStatus = combineReducers({
diff --git a/gui/src/selectors/index.js b/gui/src/selectors/index.js
@@ -19,8 +19,6 @@ export const selectServerStatusFetchFailCount = state => state.serverStatus.fetc
 export const selectLoadUrl = state => state.loadUrl;
 export const selectError = state => state.error;
 export const selectWarnings = state => state.warnings;
-export const selectUseMOS = state => state.matlab.useMOS === true;
-export const selectUseMRE = state => state.matlab.useMRE === true;
 export const selectAuthEnabled = state => state.authentication.enabled;
 export const selectAuthToken = state => state.authentication.token;
 export const selectIsAuthenticated = state => state.authentication.status === true;
diff --git a/gui/src/test/utils/responses.js b/gui/src/test/utils/responses.js
@@ -28,8 +28,6 @@ export const getEnvConfigResponse = {
     doc_url: state.envConfig.doc_url,
     extension_name: state.envConfig.extension_name,
     extension_name_short_description: state.envConfig.extension_name_short_description,
-    useMOS: state.matlab.useMOS,
-    useMRE: state.matlab.useMRE,
     authentication: state.authentication,
     matlab: {
         version: state.matlab.versionOnPath,
diff --git a/gui/src/test/utils/state.js b/gui/src/test/utils/state.js
@@ -42,8 +42,6 @@ const state = {
         versionOnPath: 'R2023b',
         supportedVersions: ['R2020b', 'R2023b'],
         busyStatus: 'idle',
-        useMOS: false,
-        useMRE: false
     },
     authentication: {
         enabled: false,
diff --git a/matlab_proxy/app.py b/matlab_proxy/app.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 
 import asyncio
 import json
@@ -197,8 +197,6 @@ async def get_env_config(req):
     state = req.app["state"]
     config = state.settings["env_config"]
 
-    config["useMOS"] = mwi_env.Experimental.should_use_mos_html()
-    config["useMRE"] = mwi_env.Experimental.should_use_mre_html()
     config["isConcurrencyEnabled"] = IS_CONCURRENCY_CHECK_ENABLED
     # In a previously authenticated session, if the url is accessed without the token(using session cookie), send the token as well.
     config["authentication"] = {
diff --git a/matlab_proxy/app_state.py b/matlab_proxy/app_state.py
@@ -994,12 +994,11 @@ async def __setup_env_for_matlab(self) -> dict:
         # The mwi_logs_dir is where MATLAB will write any subsequent logs
         matlab_env["MATLAB_LOG_DIR"] = str(self.mwi_logs_dir)
 
-        # Set MW_CONNECTOR_CONTEXT_ROOT for MPA
-        if mwi_env.Experimental.is_mpa_enabled():
-            matlab_env["MW_CONNECTOR_CONTEXT_ROOT"] = self.settings.get("base_url", "/")
-            logger.info(
-                f"MW_CONNECTOR_CONTEXT_ROOT is set to: {matlab_env['MW_CONNECTOR_CONTEXT_ROOT']}"
-            )
+        # Set MW_CONNECTOR_CONTEXT_ROOT
+        matlab_env["MW_CONNECTOR_CONTEXT_ROOT"] = self.settings.get("base_url", "/")
+        logger.info(
+            f"MW_CONNECTOR_CONTEXT_ROOT is set to: {matlab_env['MW_CONNECTOR_CONTEXT_ROOT']}"
+        )
 
         # Setup Simulink Online which requires a pre-warm stage
         if mwi_env.Experimental.is_simulink_enabled():
diff --git a/matlab_proxy/constants.py b/matlab_proxy/constants.py
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 The MathWorks, Inc.
+# Copyright 2023-2025 The MathWorks, Inc.
 from typing import Final, List
 
 """This module defines project-level constants"""
@@ -24,6 +24,7 @@
     "R2023b",
     "R2024a",
     "R2024b",
+    "R2025a",
 ]
 
 # This constant when set to True restricts the number of active sessions to one
diff --git a/matlab_proxy/matlab/startup.m b/matlab_proxy/matlab/startup.m
@@ -1,8 +1,5 @@
-% Copyright 2020-2024 The MathWorks, Inc.
+% Copyright 2020-2025 The MathWorks, Inc.
 
-if (strlength(getenv('MWI_BASE_URL')) > 0)
-    connector.internal.setConfig('contextRoot', getenv('MWI_BASE_URL'));
-end
 evalc('connector.internal.Worker.start');
 
 % Add-on explorer is not supported in this environment.
diff --git a/matlab_proxy/settings.py b/matlab_proxy/settings.py
@@ -674,12 +674,6 @@ def _get_matlab_cmd(matlab_executable_path, code_to_execute, nlm_conn_str):
     if system.is_windows():
         flag_to_hide_desktop.extend(["-noDisplayDesktop", "-wait", "-log"])
 
-    mpa_flags = (
-        mwi_env.Experimental.get_mpa_flags()
-        if mwi_env.Experimental.is_mpa_enabled()
-        else ""
-    )
-
     profile_matlab_startup = (
         "-timing" if mwi_env.Experimental.is_matlab_startup_profiling_enabled() else ""
     )
@@ -691,7 +685,7 @@ def _get_matlab_cmd(matlab_executable_path, code_to_execute, nlm_conn_str):
         "-softwareopengl",
         # " v=mvm ",
         *matlab_lic_mode,
-        *mpa_flags,
+        "-externalUI",
         profile_matlab_startup,
         "-r",
         code_to_execute,
diff --git a/matlab_proxy/util/mwi/environment_variables.py b/matlab_proxy/util/mwi/environment_variables.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 """This file lists and exposes the environment variables which are used by the integration."""
 
 import os
@@ -189,26 +189,6 @@ def is_simulink_enabled():
         """Returns true if the simulink online is enabled."""
         return _is_env_set_to_true(Experimental.get_env_name_enable_simulink())
 
-    @staticmethod
-    def should_use_mos_html():
-        """Returns true if matlab-proxy should use MOS htmls to load MATLAB"""
-        return _is_env_set_to_true("MWI_USE_MOS")
-
-    @staticmethod
-    def should_use_mre_html():
-        """Returns true if matlab-proxy should provide MRE parameter to the htmls used to load MATLAB"""
-        return _is_env_set_to_true("MWI_USE_MRE")
-
-    @staticmethod
-    def get_env_name_enable_mpa():
-        """Returns the environment variable name used to enable MPA support"""
-        return "MWI_ENABLE_MPA"
-
-    @staticmethod
-    def is_mpa_enabled():
-        """Returns true if the simulink online is enabled."""
-        return _is_env_set_to_true(Experimental.get_env_name_enable_mpa())
-
     @staticmethod
     def get_env_name_profile_matlab_startup():
         """Returns the environment variable name used to enable MPA support"""
@@ -218,8 +198,3 @@ def get_env_name_profile_matlab_startup():
     def is_matlab_startup_profiling_enabled():
         """Returns true if the simulink online is enabled."""
         return _is_env_set_to_true(Experimental.get_env_name_profile_matlab_startup())
-
-    @staticmethod
-    def get_mpa_flags():
-        """Returns list of flags required to enable MPA"""
-        return ["-webui", "-externalUI"]
diff --git a/tests/unit/test_app.py b/tests/unit/test_app.py
@@ -335,8 +335,6 @@ async def test_get_env_config(test_server):
         test_server (aiohttp_client): A aiohttp_client server for sending GET request.
     """
     expected_json_structure = {
-        "useMOS": False,
-        "useMRE": False,
         "authentication": {"enabled": False, "status": False},
         "matlab": {
             "status": "up",
diff --git a/tests/unit/test_settings.py b/tests/unit/test_settings.py
@@ -543,21 +543,6 @@ def test_get_matlab_cmd_windows(mocker):
     assert ".exe" in cmd[0]  # Assert .exe suffix in matlab_executable_path
 
 
-def test_get_matlab_cmd_with_mpa_flags(mocker):
-    # Arrange
-    mocker.patch(
-        "matlab_proxy.settings.mwi_env.Experimental.is_mpa_enabled", return_value=True
-    )
-    matlab_executable_path = "/path/to/matlab"
-    code_to_execute = "disp('Test')"
-
-    # Act
-    cmd = settings._get_matlab_cmd(matlab_executable_path, code_to_execute, None)
-
-    # Assert
-    assert all(mpa_flag in cmd for mpa_flag in mwi_env.Experimental.get_mpa_flags())
-
-
 def test_get_matlab_cmd_with_startup_profiling(mocker):
     # Arrange
     mocker.patch("matlab_proxy.settings.system.is_windows", return_value=False)
