@sapui5/sap.ushell 1.134.1 → 1.136.0

package/src/main/js/sap/ushell/appRuntime/ui5/services/Navigation.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.Navigation}.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ushell/services/Navigation",
@@ -38,18 +38,15 @@ sap.ui.define([
 
         this.getHref = function (oTarget) {
             //not ready for scube
-            return AppRuntimeService.postMessageToFLP(
-                "sap.ushell.services.Navigation.getHref", {
-                    oTarget: oTarget
-                });
+            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.getHref", {
+                oTarget: oTarget
+            });
         };
 
         this.backToPreviousApp = function () {
             //ready also for scube
             if (AppRuntimeContext.checkDataLossAndContinue()) {
-                return AppRuntimeService.postMessageToFLP(
-                    "sap.ushell.services.Navigation.backToPreviousApp"
-                );
+                return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.backToPreviousApp");
             }
 
             return Promise.resolve();
@@ -58,11 +55,9 @@ sap.ui.define([
         this.historyBack = function (iSteps) {
             //ready for scube
             if (AppRuntimeContext.checkDataLossAndContinue()) {
-                AppRuntimeService.postMessageToFLP(
-                    "sap.ushell.services.Navigation.historyBack", {
-                        iSteps: iSteps
-                    }
-                );
+                AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.historyBack", {
+                    iSteps: iSteps
+                });
             }
         };
 
@@ -87,10 +82,9 @@ sap.ui.define([
                     return oShellNavigationInternal.toExternal(oTarget, oComponent);
                 });
             } else if (AppRuntimeContext.checkDataLossAndContinue()) {
-                return AppRuntimeService.postMessageToFLP(
-                    "sap.ushell.services.Navigation.navigate", {
-                        oTarget: oTarget
-                    });
+                return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.navigate", {
+                    oTarget: oTarget
+                });
             }
 
             return Promise.resolve();
@@ -98,12 +92,10 @@ sap.ui.define([
 
         this.getPrimaryIntent = async function (sSemanticObject, oLinkFilter) {
             //not ready for scube
-            return AppRuntimeService.postMessageToFLP(
-                "sap.ushell.services.Navigation.getPrimaryIntent", {
-                    sSemanticObject: sSemanticObject,
-                    oLinkFilter: oLinkFilter
-                }
-            );
+            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.getPrimaryIntent", {
+                sSemanticObject: sSemanticObject,
+                oLinkFilter: oLinkFilter
+            });
         };
 
         this.getLinksLocal = this.getLinks;
@@ -125,7 +117,9 @@ sap.ui.define([
                 this.getLinksLocal(aLinkFilter).then(function (arrResult1) {
                     removeComponent(aLinkFilter);
                     return AppRuntimeService.postMessageToFLP(
-                        "sap.ushell.services.Navigation.getLinks", aLinkFilter).then(function (arrResult2) {
+                        "sap.ushell.services.Navigation.getLinks",
+                        aLinkFilter
+                    ).then(function (arrResult2) {
                         if (arrResult1.length !== 0) {
                             arrResult2 = arrResult2.concat(arrResult1);
                         }
@@ -134,8 +128,7 @@ sap.ui.define([
                 });
             } else {
                 removeComponent(aLinkFilter);
-                return AppRuntimeService.postMessageToFLP(
-                    "sap.ushell.services.Navigation.getLinks", aLinkFilter);
+                return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.getLinks", aLinkFilter);
             }
         };
 
@@ -146,18 +139,14 @@ sap.ui.define([
                 return this.getSemanticObjectsLocal();
             }
 
-            return AppRuntimeService.postMessageToFLP(
-                "sap.ushell.services.Navigation.getSemanticObjects"
-            );
+            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.getSemanticObjects");
         };
 
         this.isNavigationSupported = function (aTargets, oComponent, bCheckInOuterShellOnly) {
             var fnCheckInShell = function (aTargetsTmp) {
-                return AppRuntimeService.postMessageToFLP(
-                    "sap.ushell.services.Navigation.isNavigationSupported", {
-                        aTargets: aTargetsTmp
-                    }
-                );
+                return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.isNavigationSupported", {
+                    aTargets: aTargetsTmp
+                });
             };
 
             if (bCheckInOuterShellOnly === true) {
@@ -187,8 +176,7 @@ sap.ui.define([
 
         this.getAppState = function (oAppComponent, sAppStateKey) {
             //ready also for scube
-            return AppRuntimeService.postMessageToFLP(
-                "sap.ushell.services.Navigation.getAppState", {
+            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.getAppState", {
                     sAppStateKey: sAppStateKey
                 }).then(function (oState) {
                 return Container.getServiceAsync("AppState").then(function (AppStateService) {
@@ -213,18 +201,15 @@ sap.ui.define([
                 return this.resolveIntentLocal(sHashFragment);
             }
 
-            return AppRuntimeService.postMessageToFLP(
-                "sap.ushell.services.Navigation.resolveIntent", {
-                    sHashFragment: sHashFragment
-                });
+            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.resolveIntent", {
+                sHashFragment: sHashFragment
+            });
         };
 
         this.isUrlSupported = function (sUrl) {
-            return AppRuntimeService.postMessageToFLP(
-                "sap.ushell.services.Navigation.isUrlSupported", {
-                    sUrl: sUrl
-                }
-            );
+            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.isUrlSupported", {
+                sUrl: sUrl
+            });
         };
     }
 

package/src/main/js/sap/ushell/appRuntime/ui5/services/ReferenceResolver.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ReferenceResolver}.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppRuntimeService"

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellNavigation.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ShellNavigation}.
  *
- * @version 1.134.1
+ * @version 1.136.0
  * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} for Navigation instead.
  */
 sap.ui.define([
@@ -57,30 +57,25 @@ sap.ui.define([
                             oArgs.params["sap-remote-system"] = AppRuntimeContext.getRemoteSystemId();
                             oArgs.target.semanticObject = "Shell";
                             oArgs.target.action = "startIntent";
-                            return AppRuntimeService.sendMessageToOuterShell(
-                                "sap.ushell.services.CrossApplicationNavigation.toExternal", {
-                                    oArgs: oArgs
-                                });
-                        }
-
-                        AppRuntimeService.sendMessageToOuterShell(
-                            "sap.ushell.services.CrossApplicationNavigation.toExternal", {
+                            return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
                                 oArgs: oArgs
                             });
+                        }
+
+                        AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
+                            oArgs: oArgs
+                        });
                     });
                 });
-
             } else {
-                AppRuntimeService.sendMessageToOuterShell(
-                    "sap.ushell.services.CrossApplicationNavigation.toExternal", {
-                        oArgs: oArgs
-                    });
+                AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
+                    oArgs: oArgs
+                });
             }
         };
 
         this.toAppHash = function (sAppHash, bWriteHistory) {
-            AppRuntimeService.sendMessageToOuterShell(
-                "sap.ushell.services.ShellNavigationInternal.toExternal", {
+            AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.ShellNavigationInternal.toExternal", {
                 sAppHash: sAppHash,
                 bWriteHistory: bWriteHistory
             });

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellNavigationInternal.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ShellNavigationInternal}.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ushell/services/ShellNavigationInternal",
@@ -57,23 +57,19 @@ sap.ui.define([
                             oArgs.target.action = "startIntent";
                         }
 
-                        AppRuntimeService.sendMessageToOuterShell(
-                            "sap.ushell.services.CrossApplicationNavigation.toExternal", {
-                                oArgs: oArgs
-                            });
+                        AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
+                            oArgs: oArgs
+                        });
                     });
                 });
-
             }
-            AppRuntimeService.sendMessageToOuterShell(
-                "sap.ushell.services.CrossApplicationNavigation.toExternal", {
-                    oArgs: oArgs
-                });
+            AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
+                oArgs: oArgs
+            });
         };
 
         this.toAppHash = function (sAppHash, bWriteHistory) {
-            AppRuntimeService.sendMessageToOuterShell(
-                "sap.ushell.services.ShellNavigationInternal.toExternal", {
+            AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.ShellNavigationInternal.toExternal", {
                 sAppHash: sAppHash,
                 bWriteHistory: bWriteHistory
             });

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellUIService.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.ui5service.ShellUIService}.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",
@@ -42,17 +42,15 @@ sap.ui.define([
      * @private
      */
     var ShellUIServiceProxy = ShellUIService.extend("sap.ushell.appRuntime.services.ShellUIService", {
-
         setTitle: function (sTitle, oAdditionalInformation) {
             if (!sTitle) {
                 return;
             }
             sLastSetTitle = sTitle;
-            AppRuntimeService.postMessageToFLP(
-                "sap.ushell.services.ShellUIService.setTitle", {
-                    sTitle: sTitle,
-                    oAdditionalInformation: oAdditionalInformation
-                });
+            AppRuntimeService.postMessageToFLP("sap.ushell.services.ShellUIService.setTitle", {
+                sTitle: sTitle,
+                oAdditionalInformation: oAdditionalInformation
+            });
         },
 
         getTitle: function () {
@@ -61,19 +59,17 @@ sap.ui.define([
 
         setHierarchy: function (aHierarchyLevels) {
             return AppRuntimeContext.checkIntentsConversionForScube(aHierarchyLevels).then(function (aNewHierarchyLevels) {
-                return AppRuntimeService.postMessageToFLP(
-                    "sap.ushell.services.ShellUIService.setHierarchy", {
-                        aHierarchyLevels: aNewHierarchyLevels
-                    });
+                return AppRuntimeService.postMessageToFLP("sap.ushell.services.ShellUIService.setHierarchy", {
+                    aHierarchyLevels: aNewHierarchyLevels
+                });
             });
         },
 
         setRelatedApps: function (aRelatedApps) {
             return AppRuntimeContext.checkIntentsConversionForScube(aRelatedApps).then(function (aNewRelatedApps) {
-                return AppRuntimeService.postMessageToFLP(
-                    "sap.ushell.services.ShellUIService.setRelatedApps", {
-                        aRelatedApps: aNewRelatedApps
-                    });
+                return AppRuntimeService.postMessageToFLP("sap.ushell.services.ShellUIService.setRelatedApps", {
+                    aRelatedApps: aNewRelatedApps
+                });
             });
         },
 
@@ -99,12 +95,11 @@ sap.ui.define([
             }
 
             fnBackNavigationCallback = fnCallback;
-            AppRuntimeService.postMessageToFLP(
-                "sap.ushell.ui5service.ShellUIService.setBackNavigation", {
-                    callbackMessage: {
-                        service: "sap.ushell.appRuntime.handleBackNavigation"
-                    }
-                });
+            AppRuntimeService.postMessageToFLP("sap.ushell.ui5service.ShellUIService.setBackNavigation", {
+                callbackMessage: {
+                    service: "sap.ushell.appRuntime.handleBackNavigation"
+                }
+            });
         },
 
         _getBackNavigationCallback: function () {

package/src/main/js/sap/ushell/appRuntime/ui5/services/UserDefaultParameters.js

@@ -19,10 +19,9 @@ sap.ui.define([
          * @returns {Promise} A promise that resolves with the return value from the postMessage call.
          */
         this.getValue = function (sParameterName) {
-            return AppRuntimeService.sendMessageToOuterShell(
-                "sap.ushell.services.UserDefaultParameters.getValue", {
-                    sParameterName: sParameterName
-                });
+            return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.UserDefaultParameters.getValue", {
+                sParameterName: sParameterName
+            });
         };
     }
 

package/src/main/js/sap/ushell/appRuntime/ui5/services/UserInfo.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.UserInfo}.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ushell/services/UserInfo",

package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/Ui5ComponentLoaderAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the application runtime platform
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/logger.js

@@ -45,7 +45,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/state.js

@@ -71,7 +71,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ushell/bootstrap/SchedulingAgent/logger",

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5datetimeformat.js

@@ -4,7 +4,7 @@
  * @fileOverview Configure the UI5Settings for Date and Time Format for the 'CDM'
  *               platform.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/base/i18n/Formatting",

package/src/main/js/sap/ushell/bootstrap/common/common.create.configcontract.core.js

@@ -7,19 +7,19 @@ sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/ushell/bootstrap/common/common.debug.mode",
     "sap/base/util/deepExtend"
-], function (
+], (
     ObjectPath,
     oDebugMode,
     deepExtend
-) {
+) => {
     "use strict";
 
-    var oDefaultConfigValues = {};
-    var oSearchParams = new URLSearchParams(document.location.search);
+    const oDefaultConfigValues = {};
+    const oSearchParams = new URLSearchParams(document.location.search);
 
     // eslint-disable-next-line complexity
     function createConfigContract (oMergedSapUshellConfig) {
-        var oGetConfigValueMemory = {};
+        const oGetConfigValueMemory = {};
 
         /**
          * Retrieves the value from "oMergedSapUshellConfig" relative to the given a path.
@@ -31,15 +31,15 @@ sap.ui.define([
          * @private
          */
         function getValueFromConfig (oMemory, sPath) {
-            var aPathParts = sPath.split("/");
-            var sParentPath = aPathParts.slice(0, aPathParts.length - 1).join("/");
-            var sLastPart = aPathParts.pop();
+            const aPathParts = sPath.split("/");
+            const sParentPath = aPathParts.slice(0, aPathParts.length - 1).join("/");
+            const sLastPart = aPathParts.pop();
 
             if (oMemory.hasOwnProperty(sParentPath)) {
                 return oMemory[sParentPath][sLastPart];
             }
 
-            var oDeepObject = aPathParts.reduce(function (oObject, sPathPart) {
+            const oDeepObject = aPathParts.reduce((oObject, sPathPart) => {
                 if (!oObject || !oObject.hasOwnProperty(sPathPart)) {
                     return {};
                 }
@@ -59,7 +59,7 @@ sap.ui.define([
          * @returns {string|boolean|int|object} the found configuration value or the default value
          */
         function getConfigValue (sPath, oDefaultValue) {
-            var oSegment = getValueFromConfig(oGetConfigValueMemory, sPath);
+            const oSegment = getValueFromConfig(oGetConfigValueMemory, sPath);
             oDefaultConfigValues[sPath] = oDefaultValue;
             return (oSegment !== undefined) ? oSegment : oDefaultValue;
         }
@@ -67,8 +67,8 @@ sap.ui.define([
         // do not render background shapes in Spaces mode
         // "enableBackGroundShapes" has default value of "false" in Spaces FLP and "true" in Classic FLP
         function getEnableBackGroundShapes () {
-            var sPath = "renderers/fiori2/componentData/config/enableBackGroundShapes";
-            var bEnableShapes = !!getValueFromConfig(oGetConfigValueMemory, sPath);
+            const sPath = "renderers/fiori2/componentData/config/enableBackGroundShapes";
+            let bEnableShapes = !!getValueFromConfig(oGetConfigValueMemory, sPath);
             if (bEnableShapes) {
                 bEnableShapes = !getConfigValue("ushell/spaces/enabled", false);
             }
@@ -84,9 +84,9 @@ sap.ui.define([
 
         function getHomeUri () {
             // "homeUri" might change during runtime; see "HeaderManager"
-            var homeUri = getConfigValue("renderers/fiori2/componentData/config/rootIntent", "");
+            let homeUri = getConfigValue("renderers/fiori2/componentData/config/rootIntent", "");
             if (homeUri) {
-                homeUri = "#" + homeUri;
+                homeUri = `#${homeUri}`;
             }
             return homeUri;
         }
@@ -97,8 +97,8 @@ sap.ui.define([
         }
 
         // "Easy Access Menu" values, allowing for individual read and making the logic clearer
-        var bEnableEasyAccess = getConfigValue("renderers/fiori2/componentData/config/applications/Shell-home/enableEasyAccess", true);
-        var oEasyAccessMenu = {
+        const bEnableEasyAccess = getConfigValue("renderers/fiori2/componentData/config/applications/Shell-home/enableEasyAccess", true);
+        const oEasyAccessMenu = {
             enableEasyAccessOnTablet: getConfigValue("renderers/fiori2/componentData/config/applications/Shell-home/enableEasyAccessUserMenuOnTablet", false),
             enableEasyAccessSAPMenu: getConfigValue("renderers/fiori2/componentData/config/applications/Shell-home/enableEasyAccessSAPMenu", bEnableEasyAccess),
             enableEasyAccessSAPMenuSearch: getConfigValue("renderers/fiori2/componentData/config/applications/Shell-home/enableEasyAccessSAPMenuSearch", true),
@@ -120,7 +120,7 @@ sap.ui.define([
          */
         function enableEasyAccessSearchLogic (sMenu) {
             if (bEnableEasyAccess === true) {
-                return oEasyAccessMenu[sMenu] ? oEasyAccessMenu[sMenu + "Search"] : false;
+                return oEasyAccessMenu[sMenu] ? oEasyAccessMenu[`${sMenu}Search`] : false;
             }
             return false;
         }
@@ -135,7 +135,7 @@ sap.ui.define([
                 return [];
             }
 
-            return sCsv.split(",").map(function (entry) {
+            return sCsv.split(",").map((entry) => {
                 return entry.trim();
             });
         }
@@ -170,7 +170,11 @@ sap.ui.define([
         function getDefaultSideNavigationConfig () {
             const oConfig = {};
             ObjectPath.set("spaces.enabled", true, oConfig);
-            if (getConfigValue("ushell/menu/position") !== "Side") {
+
+            if (getConfigValue("ushell/menu/position") === "Side") {
+                ObjectPath.set("spaces.selectable", false, oConfig);
+            } else {
+                ObjectPath.set("spaces.selectable", true, oConfig);
                 ObjectPath.set("favorites.enabled", true, oConfig);
             }
 
@@ -191,18 +195,41 @@ sap.ui.define([
         function getDefaultFixedSideNavigationConfig () {
             const oConfig = {};
             if (getConfigValue("ushell/menu/position") !== "Side") {
-                ObjectPath.set("spaces.personalization.enabled", true, oConfig);
+                ObjectPath.set("spaces.personalization.enabled", getMenuPersonalizationEnabled(), oConfig);
             }
 
             return JSON.stringify(oConfig);
         }
 
-        var oConfigDefinition = {
+        /**
+         * Gets the side navigation enabled state.
+         *
+         * @returns {boolean} whether the side navigation is enabled
+         */
+        function getSideNavigationEnabled () {
+            return getConfigValue("ushell/sideNavigation/enabled", false) || getConfigValue("ushell/menu/position") === "Side";
+        }
+
+        /**
+         * Gets the menu personalization enabled state.
+         *
+         * @returns {boolean} whether the personalization is enabled
+         */
+        function getMenuPersonalizationEnabled () {
+            return getConfigValue("ushell/menu/personalization/enabled", false);
+        }
+
+        const oConfigDefinition = {
             core: { // the unified shell core
                 site: {
-                    siteId: getConfigValue("ushell/site/siteId", null)
+                    siteId: getConfigValue("ushell/site/siteId", null),
+                    sapCdmVersion: getConfigValue("ushell/site/sapCdmVersion", null)
                 },
                 extension: {
+                    dap: {
+                        pluginName: getConfigValue("ushell/extension/dap/pluginName", "DAP_PLUGIN"),
+                        enabled: getConfigValue("ushell/extension/dap/enabled", true)
+                    },
                     enableHelp: getConfigValue("renderers/fiori2/componentData/config/enableHelp", false),
                     SupportTicket: getConfigValue("services/SupportTicket/config/enabled", false)
                 },
@@ -217,7 +244,6 @@ sap.ui.define([
                     }
                 },
                 navigation: {
-                    enableAppLifeCycleFallback: getConfigValue("ushell/navigation/enableAppLifeCycleFallback", false),
                     enableInPlaceForClassicUIs: {
                         GUI: getConfigValue("services/ClientSideTargetResolution/config/enableInPlaceForClassicUIs/GUI", false),
                         WDA: getConfigValue("services/ClientSideTargetResolution/config/enableInPlaceForClassicUIs/WDA", false),
@@ -259,7 +285,7 @@ sap.ui.define([
                             addCoreResourcesComplement: false
                         })
                     ),
-                    contentApiUrl: getConfigValue("ushell/workPages/contentApiUrl", "/cep/graphql"),
+                    contentApiUrl: getConfigValue("ushell/workPages/contentApiUrl", "/cep/content"),
                     tileCard: getConfigValue("ushell/workPages/tileCard", !!oSearchParams.get("sap-ushell-tilecard")),
                     customTileCard: getConfigValue("ushell/workPages/customTileCard", !!oSearchParams.get("sap-ushell-customtilecard")),
                     myHome: {
@@ -270,33 +296,41 @@ sap.ui.define([
                     contentFinderStandalone: getConfigValue("core/workPages/contentFinderStandalone", true)
                         && getConfigValue("ushell/workPages/enabled", false)
                 },
+                shellBar: {
+                    enabled: getConfigValue("ushell/shellBar/enabled", false)
+                },
                 homeApp: {
                     // the homeApp is currently only supposed to work for Spaces
                     enabled: getHomeAppEnabled(),
                     component: getConfigValue("ushell/homeApp/component", {})
                 },
                 sideNavigation: {
-                    enabled: getConfigValue("ushell/sideNavigation/enabled", false) || getConfigValue("ushell/menu/position") === "Side",
+                    enabled: getSideNavigationEnabled(),
                     mode: getConfigValue("ushell/sideNavigation/mode", "Docked"), // possible values are "Docked" or "Popover"
                     navigationListProvider: {
                         modulePath: getConfigValue("ushell/sideNavigation/navigationListProvider/modulePath", getConfigValue("ushell/menu/position") === "Side" ?
-                        "sap/ushell/components/shell/SideNavigation/modules/SpacesNavigationListProvider" : "sap/ushell/components/shell/SideNavigation/modules/GenericNavigationListProvider"),
+                            "sap/ushell/components/shell/SideNavigation/modules/SpacesNavigationListProvider" : "sap/ushell/components/shell/SideNavigation/modules/GenericNavigationListProvider"),
                         configuration: getConfigValue("ushell/sideNavigation/navigationListProvider/configuration", getDefaultSideNavigationConfig())
                     },
                     fixedNavigationListProvider: {
                         modulePath: getConfigValue("ushell/sideNavigation/fixedNavigationListProvider/modulePath", getConfigValue("ushell/menu/position") === "Side" ?
-                        "" : "sap/ushell/components/shell/SideNavigation/modules/GenericFixedNavigationListProvider"),
+                            "" : "sap/ushell/components/shell/SideNavigation/modules/GenericFixedNavigationListProvider"),
                         configuration: getConfigValue("ushell/sideNavigation/fixedNavigationListProvider/configuration", getDefaultFixedSideNavigationConfig())
                     }
                 },
+                notifications: {
+                    enabled: getConfigValue("ushell/notifications/enabled", false)
+                },
                 menu: { // Menu Bar
                     // The menu bar is enabled for Spaces by default, unless it is disabled explicitly
-                    enabled: (getConfigValue("ushell/spaces/enabled", false) &&
+                    enabled: (
+                        getConfigValue("ushell/spaces/enabled", false) &&
                         getConfigValue("ushell/menu/enabled") !== false &&
-                        !(getConfigValue("ushell/sideNavigation/enabled") || getConfigValue("ushell/menu/position") === "Side")) ||
+                        !getSideNavigationEnabled()) ||
                         getConfigValue("ushell/menu/enabled", false),
                     personalization: {
-                        enabled: getConfigValue("ushell/menu/personalization/enabled", false)
+                        enabled: getMenuPersonalizationEnabled(),
+                        showNavigationBarMenuButton: getConfigValue("ushell/menu/personalization/showNavigationBarMenuButton", getMenuPersonalizationEnabled() && !getSideNavigationEnabled())
                     },
                     visibleInAllStates: getConfigValue("ushell/menu/visibleInAllStates", false)
                 },
@@ -407,12 +441,7 @@ sap.ui.define([
                             account: "sap-icon://account"
                         },
                         showRecentActivity: true
-                    },
-                    // TODO:
-                    // This will check will be removed once we are good to set the new entry as default for the cdm platform
-                    // And only the cdmUserLanguageAndRegionEntry will be used.
-                    // BLI Item to track this: https://jira.tools.sap/browse/FLPCOREANDUX-10542
-                    cdmUserLanguageAndSettingsView: getConfigValue("ushell/settings/cdmUserLanguageAndSettingsView", false)
+                    }
                 },
                 state: {
                     shellMode: getConfigValue("renderers/fiori2/componentData/config/appState", "") // only used as initial value

package/src/main/js/sap/ushell/bootstrap/common/common.override.registermodulepath.js

@@ -17,7 +17,7 @@ sap.ui.define([
 
     function overrideRegisterModulePath () {
         /**
-         * @deprecated As of version 1.96
+         * @deprecated since 1.96
          * @private
          */
         (function () {