@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/components/pages/controller/PagesAndSpaceId.js

@@ -5,12 +5,11 @@ sap.ui.define([
     "sap/ushell/resources",
     "sap/ushell/Config",
     "sap/ushell/Container"
-], function (hasher, resources, Config, Container) {
+], (hasher, resources, Config, Container) => {
     "use strict";
 
     // todo FLPCOREANDUX-10676: rework i18n for error handling, this conflicts with the usage in the boottask
-    var PagesAndSpaceId = function () {
-    };
+    function PagesAndSpaceId () {}
 
     /**
      * Gets the url parameters and returns the spaceId and pageId of the target page.
@@ -21,7 +20,7 @@ sap.ui.define([
      * @since 1.72.0
      */
     PagesAndSpaceId.prototype.getPageAndSpaceId = function (sShellHash) {
-        return Container.getServiceAsync("URLParsing").then(function (urlParsingService) {
+        return Container.getServiceAsync("URLParsing").then((urlParsingService) => {
             // during boottask the hash gets provided via parameter
             // within the controller it needs to be fetched via the hasher
             if (sShellHash === undefined) {
@@ -37,7 +36,7 @@ sap.ui.define([
             const aSpaceId = oHashPartsParams.spaceId || [];
 
             return this._parsePageAndSpaceId(aPageId, aSpaceId, oIntent);
-        }.bind(this));
+        });
     };
 
     /**
@@ -53,18 +52,18 @@ sap.ui.define([
      * @since 1.72.0
      */
     PagesAndSpaceId.prototype._parsePageAndSpaceId = function (pageId, spaceId, intent) {
-        return new Promise(function (resolve, reject) {
-            this.getUserMyHomeEnablement().then(function () {
+        return new Promise((resolve, reject) => {
+            this.getUserMyHomeEnablement().then(() => {
                 if (pageId.length < 1 && spaceId.length < 1) {
-                    var bIsShellHome = intent.semanticObject === "Shell" && intent.action === "home";
-                    var bIsEmptyIntent = intent.semanticObject === "" && intent.action === "";
+                    const bIsShellHome = intent.semanticObject === "Shell" && intent.action === "home";
+                    const bIsEmptyIntent = intent.semanticObject === "" && intent.action === "";
 
                     if (bIsShellHome || bIsEmptyIntent) {
                         this._getUserDefaultSpaceAndPage()
-                            .then(function (oResult) {
+                            .then((oResult) => {
                                 resolve(oResult);
                             })
-                            .catch(function (sError) {
+                            .catch((sError) => {
                                 reject(sError);
                             });
                         return;
@@ -96,8 +95,8 @@ sap.ui.define([
                     pageId: pageId[0],
                     spaceId: spaceId[0]
                 });
-            }.bind(this));
-        }.bind(this));
+            });
+        });
     };
 
     /**
@@ -107,8 +106,8 @@ sap.ui.define([
      * @private
      */
     PagesAndSpaceId.prototype.getUserMyHomeEnablement = function () {
-        return new Promise(function (resolve, reject) {
-            var bUserMyHome = Container.getUser().getShowMyHome();
+        return new Promise((resolve, reject) => {
+            const bUserMyHome = Container.getUser().getShowMyHome();
             Config.emit("/core/spaces/myHome/userEnabled", bUserMyHome);
             resolve(bUserMyHome);
         });
@@ -130,18 +129,18 @@ sap.ui.define([
      * @since 1.72.0
      */
     PagesAndSpaceId.prototype._getUserDefaultSpaceAndPage = function () {
-        return new Promise(function (resolve, reject) {
-            Promise.all([ Container.getServiceAsync("Menu"), this.getUserMyHomeEnablement()]).then(function (aResults) {
-                var oMenuService = aResults[0];
+        return new Promise((resolve, reject) => {
+            Promise.all([ Container.getServiceAsync("Menu"), this.getUserMyHomeEnablement()]).then((aResults) => {
+                const oMenuService = aResults[0];
 
                 oMenuService.getDefaultSpace()
-                    .then(function (oDefaultSpace) {
+                    .then((oDefaultSpace) => {
                         if (!oDefaultSpace) {
                             reject(resources.i18n.getText("PageRuntime.NoAssignedSpace"));
                             return;
                         }
 
-                        var oDefaultPage = oDefaultSpace && oDefaultSpace.children && oDefaultSpace.children[0];
+                        const oDefaultPage = oDefaultSpace && oDefaultSpace.children && oDefaultSpace.children[0];
 
                         if (!oDefaultPage) {
                             reject(resources.i18n.getText("PageRuntime.NoAssignedPage"));
@@ -154,10 +153,10 @@ sap.ui.define([
                         });
                     });
             })
-            .catch(function (error) {
-                reject(error);
-            });
-        }.bind(this));
+                .catch((error) => {
+                    reject(error);
+                });
+        });
     };
 
     return new PagesAndSpaceId();

package/src/main/js/sap/ushell/components/pages/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.pages",
         "applicationVersion": {
-            "version": "1.138.1"
+            "version": "1.139.0"
         },
         "i18n": {
             "bundleUrl": "../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/runtimeSwitcher/Component.js

@@ -3,7 +3,7 @@
 sap.ui.define([
     "sap/ui/core/UIComponent"
 
-], function (UIComponent) {
+], (UIComponent) => {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.runtimeSwitcher.Component", {

package/src/main/js/sap/ushell/components/runtimeSwitcher/controller/RuntimeSwitcher.controller.js

@@ -1,8 +1,8 @@
-//Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.138.1
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ui/core/mvc/Controller",
@@ -13,7 +13,7 @@ sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/ui/core/Component",
     "sap/ui/core/ComponentContainer"
- ], function (
+], (
     Controller,
     PagesAndSpaceId,
     Config,
@@ -22,7 +22,7 @@ sap.ui.define([
     ObjectPath,
     Component,
     ComponentContainer
- ) {
+) => {
     "use strict";
 
     /**
@@ -53,13 +53,12 @@ sap.ui.define([
                 onBeforeFirstShow: this._onBeforeFirstShowPagesRuntime.bind(this)
             });
 
-            this._oInitPromise = this._handleRouter()
-                .then(function () {
-                    var oRenderer = Container.getRendererInternal();
-                    this.oContainerRouter = oRenderer.getRouter();
-                    this.oContainerRouter.getRoute("home").attachMatched(this._handleRouter, this);
-                    this.oContainerRouter.getRoute("openFLPPage").attachMatched(this._handleRouter, this);
-                }.bind(this));
+            this._oInitPromise = this._handleRouter().then(() => {
+                const oRenderer = Container.getRendererInternal();
+                this.oContainerRouter = oRenderer.getRouter();
+                this.oContainerRouter.getRoute("home").attachMatched(this._handleRouter, this);
+                this.oContainerRouter.getRoute("openFLPPage").attachMatched(this._handleRouter, this);
+            });
         },
 
         /**
@@ -73,95 +72,86 @@ sap.ui.define([
 
         /**
          * Handler for the "onBeforeFirstShow" event of the pages runtime.
-         * @returns {Promise} a promise when the component was created (return value is only used in tests)
+         * @returns {Promise<undefined>} a promise when the component was created (return value is only used in tests)
          * @private
          */
-        _onBeforeFirstShowPagesRuntime: function () {
-            const that = this;
-
-            return Component.create({
+        _onBeforeFirstShowPagesRuntime: async function () {
+            const oComponent = await Component.create({
                 name: "sap.ushell.components.pages",
                 componentData: {
                     navigationDisabled: true
                 },
                 asyncHints: { preloadBundles: ["sap/ushell/preload-bundles/homepage-af-dep.js"] },
                 manifest: true
-            }).then((oComponent) => {
-                const oContainer = that._createComponentContainer({
-                    component: oComponent,
-                    height: "100%",
-                    async: true
-                });
-                oContainer.placeAt(that.byId("pagesRuntime"));
-
-                that.oPageRuntimeComponent = oComponent;
             });
+
+            const oContainer = this._createComponentContainer({
+                component: oComponent,
+                height: "100%",
+                async: true
+            });
+            oContainer.placeAt(this.byId("pagesRuntime"));
+
+            this.oPageRuntimeComponent = oComponent;
         },
 
         /**
          * Handler for the &quot;onBeforeFirstShow&quot; event of the workpages runtime.
-         * @returns {Promise} a promise when the component was created (return value is only used in tests)
+         * @returns {Promise<undefined>} a promise when the component was created (return value is only used in tests)
          * @private
          */
-        _onBeforeFirstShowWorkpageRuntime: function () {
-            const that = this;
+        _onBeforeFirstShowWorkpageRuntime: async function () {
             const oWorkpageComponentProperties = this._getWorkpageComponentProperties();
+            const oComponent = await Component.create(oWorkpageComponentProperties);
+            const oContainer = new this._createComponentContainer({
+                component: oComponent,
+                height: "100%",
+                async: true
+            });
+            oContainer.placeAt(this.byId("workpagesRuntime"));
 
-            return Component.create(oWorkpageComponentProperties).then(function (oComponent) {
-                const oContainer = new that._createComponentContainer({
-                    component: oComponent,
-                    height: "100%",
-                    async: true
-                });
-                oContainer.placeAt(that.byId("workpagesRuntime"));
-
-                that.oWorkPageRuntimeComponent = oComponent;
+            this.oWorkPageRuntimeComponent = oComponent;
 
-                if (typeof (that.oWorkPageRuntimeComponent?.setPageId) === "function" && that._sCurrentPageId) {
-                    that.oWorkPageRuntimeComponent.setPageId(that._sCurrentPageId);
-                    that._sCurrentPageId = undefined;
-                }
-            });
+            if (typeof (this.oWorkPageRuntimeComponent?.setPageId) === "function" && this._sCurrentPageId) {
+                this.oWorkPageRuntimeComponent.setPageId(this._sCurrentPageId);
+                this._sCurrentPageId = undefined;
+            }
         },
 
         /**
          * Decides which component should be loaded/navigated to
-         * @returns {Promise} A promise that resolves when the component is loaded
+         * @returns {Promise<undefined>} A promise that resolves when the component is loaded
          * @private
          */
-        _handleRouter: function () {
-            var sPageId;
+        _handleRouter: async function () {
             // for SAP Start page we always load the pages runtime, no menu service is available
             // simply load the pages runtime with page id and resolve.
             if (Config.last("/core/workPages/myHome/pageId")) {
                 this._toggleToWorkPagesRuntime(Config.last("/core/workPages/myHome/pageId"));
-                return Promise.resolve();
+                return;
             }
-            return Promise.all([
-                PagesAndSpaceId.getPageAndSpaceId(),
-                Container.getServiceAsync("Menu")
-            ])
-                .then(function (aResults) {
-                    var oMenuService;
-                    sPageId = aResults[0] && aResults[0].pageId;
-                    if (!sPageId) {
-                        return Promise.reject("No pageId found");
-                    }
-                    oMenuService = aResults[1];
-                    return oMenuService.isWorkPage(sPageId);
-                })
-                .then(function (bIsWorkPage) {
-                    // allow to force using the workpages runtime via URL parameter
-                    if (bIsWorkPage || new URLSearchParams(window.location.search).get("sap-ushell-rt") === "workpage") {
-                        this._toggleToWorkPagesRuntime(sPageId);
-                    } else {
-                        this._toggleToPagesRuntime();
-                    }
-                }.bind(this))
-                .catch(function () {
-                    // Load pages runtime in error case to show proper error
+
+            try {
+                const oIds = await PagesAndSpaceId.getPageAndSpaceId();
+                const sPageId = oIds.pageId;
+                const oMenuService = await Container.getServiceAsync("Menu");
+
+                if (!sPageId) {
+                    throw new Error("No pageId found");
+                }
+
+                const bIsWorkPage = await oMenuService.isWorkPage(sPageId);
+
+                // allow to force using the workpages runtime via URL parameter
+                if (bIsWorkPage || new URLSearchParams(window.location.search).get("sap-ushell-rt") === "workpage") {
+                    this._toggleToWorkPagesRuntime(sPageId);
+                } else {
                     this._toggleToPagesRuntime();
-                }.bind(this));
+                }
+            } catch (oError) {
+                // Load pages runtime in error case to show proper error
+                this._toggleToPagesRuntime();
+            }
         },
 
         /**

package/src/main/js/sap/ushell/components/runtimeSwitcher/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.runtimeSwitcher",
         "applicationVersion": {
-            "version": "1.138.1"
+            "version": "1.139.0"
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",

package/src/main/js/sap/ushell/components/shell/FloatingContainer/Component.js

@@ -201,7 +201,6 @@ sap.ui.define([
                     this.oModel.setProperty("/containerStyles/left", iLeftPos);
                     this.oModel.setProperty("/containerStyles/top", iTopPos);
                 } else { // initialize dock position to the top corner
-
                     if (this.oModel.getProperty("/dockPosition") === DockPosition.end) {
                         this.oModel.setProperty("/containerStyles/left", 100);
                     } else {
@@ -243,7 +242,6 @@ sap.ui.define([
                 if (this.oModel.getProperty("/dockPosition") === DockPosition.start) {
                     oWrapperDomRef.classList.add("sapUshellContainerDockedStart");
                     oWrapperDomRef.classList.remove("sapUshellContainerDockedEnd");
-
                 } else { // end
                     oWrapperDomRef.classList.add("sapUshellContainerDockedEnd");
                     oWrapperDomRef.classList.remove("sapUshellContainerDockedStart");
@@ -302,7 +300,6 @@ sap.ui.define([
             return ShellModel.getModel().getProperty("/floatingContainer/visible");
         },
 
-
         /**
          * Restores the last known styles of the floating container wrapper.
          * The styles are stored in the model.
@@ -611,7 +608,6 @@ sap.ui.define([
 
             if (bHasWrapper && !bIsDocked) {
                 this._adjustPosition();
-
             }
 
             if (bIsDocked) {
@@ -649,7 +645,6 @@ sap.ui.define([
                 if (this._isDockSupported()) {
                     const sDockPos = this.oModel.getProperty("/dockPosition");
                     this._moveIntoDock(sDockPos);
-
                 } else {
                     this.oModel.setProperty("/docked", false);
                 }

package/src/main/js/sap/ushell/components/shell/FloatingContainer/controls/FloatingContainer.js

@@ -9,11 +9,11 @@ sap.ui.define([
     "sap/ui/core/Control",
     "sap/ui/Device",
     "sap/ushell/library" // css style dependency
-], function (
+], (
     Control,
     Device,
     ushellLibrary
-) {
+) => {
     "use strict";
 
     /**
@@ -28,7 +28,7 @@ sap.ui.define([
      * @since 1.129.0
      * @private
      */
-    var FloatingContainer = Control.extend("sap.ushell.components.shell.FloatingContainer.controls.FloatingContainer", {
+    const FloatingContainer = Control.extend("sap.ushell.components.shell.FloatingContainer.controls.FloatingContainer", {
         metadata: {
             library: "sap.ushell",
             properties: {

package/src/main/js/sap/ushell/components/shell/FloatingContainer/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.FloatingContainer",
         "applicationVersion": {
-            "version": "1.138.1"
+            "version": "1.139.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/MenuBar/Component.js

@@ -5,17 +5,15 @@ sap.ui.define([
     "sap/ui/core/mvc/XMLView",
     "sap/ushell/Config",
     "sap/ushell/Container",
-    "sap/ushell/resources",
-    "sap/ushell/renderer/ShellLayout"
-], function (
+    "sap/ushell/resources"
+], (
     UIComponent,
     ComponentContainer,
     XMLView,
     Config,
     Container,
-    resources,
-    ShellLayout
-) {
+    resources
+) => {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.MenuBar.Component", {
@@ -30,49 +28,23 @@ sap.ui.define([
 
             this.setModel(resources.i18nModel, "i18n");
 
-            this.oMenuModelPromise = Container.getServiceAsync("Menu")
-                .then(function (oMenuService) {
-                    return Promise.all([
-                        oMenuService.isMenuEnabled(),
-                        oMenuService.getMenuModel()
-                    ]);
-                })
-                .then(function (aResults) {
-                    var bMenuEnabled = aResults[0];
-                    var oMenuModel = aResults[1];
+            this.oMenuModelPromise = Container.getServiceAsync("Menu").then(async (oMenuService) => {
+                const bMenuEnabled = await oMenuService.isMenuEnabled();
+                const oMenuModel = await oMenuService.getMenuModel();
 
-                    this.setModel(oMenuModel, "menu");
+                this.setModel(oMenuModel, "menu");
 
-                    if (bMenuEnabled) {
-                        return this.oViewPromise.then(function () {
-                            // wait for the root view to be created, otherwise the view won't render right away
-                            // but only after an invalidation of the component container
-                            var oComponentContainer = new ComponentContainer({
-                                id: "menuBarComponentContainer",
-                                component: this
-                            });
-                            Container.getRendererInternal().setNavigationBar(oComponentContainer);
-                        }.bind(this));
-                    }
-            }.bind(this));
+                if (bMenuEnabled) {
+                    await this.oViewPromise;
 
-            // handle initial state of the side content
-            const bInitialValue = ShellLayout.hasAdjacentSideContentBeforeMain();
-            this._applySideContent(bInitialValue);
-
-            // attach event handler for side content changes
-            ShellLayout.attachAdjacentSideContentBeforeMainChanged(this._handleSideContent, this);
-        },
-
-        _handleSideContent: function (oEvent) {
-            const oParameters = oEvent.getParameters();
-            const bHasAdjacentContentBefore = oParameters.hasAdjacentContentBefore;
-            this._applySideContent(bHasAdjacentContentBefore);
-        },
-
-        _applySideContent: function (bHasAdjacentContentBefore) {
-            this.rootControlLoaded().then((oView) => {
-                oView.toggleStyleClass("sapUshellFixedPadding", bHasAdjacentContentBefore);
+                    // wait for the root view to be created, otherwise the view won't render right away
+                    // but only after an invalidation of the component container
+                    const oComponentContainer = new ComponentContainer({
+                        id: "menuBarComponentContainer",
+                        component: this
+                    });
+                    Container.getRendererInternal().setNavigationBar(oComponentContainer);
+                }
             });
         },
 
@@ -89,10 +61,6 @@ sap.ui.define([
             });
 
             return this.oViewPromise;
-        },
-
-        exit: function () {
-            ShellLayout.detachAdjacentSideContentBeforeMainChanged(this._handleSideContent, this);
         }
     });
 });