@sapui5/sap.ushell 1.131.0 → 1.132.0

package/src/main/js/sap/ushell/appRuntime/ui5/services/Extension/Item.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Defines a generic interface for extension items in ShellAreas.
  *
- * @version 1.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppRuntimeService"

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.Extension}.
  *
- * @version 1.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/base/util/isPlainObject",

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.FrameBoundExtension}.
  *
- * @version 1.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
 ], function (

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.LaunchPage}.
  *
- * @version 1.131.0
+ * @version 1.132.0
  * @deprecated since 1.120. This service has been deprecated as it only works for the classic homepage.
  */
 sap.ui.define([

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

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

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.NavTargetResolution}.
  *
- * @version 1.131.0
+ * @version 1.132.0
  * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} for Navigation instead.
  */
 sap.ui.define([

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

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

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.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/ushell/services/Navigation",

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.131.0
+ * @version 1.132.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.131.0
+ * @version 1.132.0
  * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} for Navigation instead.
  */
 sap.ui.define([

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.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/ushell/services/ShellNavigationInternal",

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

@@ -3,9 +3,10 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.ui5service.ShellUIService}.
  *
- * @version 1.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
+    "sap/ui/core/EventBus",
     "sap/ui/core/service/ServiceFactoryRegistry",
     "sap/ui/core/service/ServiceFactory",
     "sap/ushell/ui5service/ShellUIService",
@@ -14,6 +15,7 @@ sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppRuntimeContext",
     "sap/ui/thirdparty/jquery"
 ], function (
+    EventBus,
     ServiceFactoryRegistry,
     ServiceFactory,
     ShellUIService,
@@ -111,6 +113,16 @@ sap.ui.define([
         }
     });
 
+    /**
+     * Resets the local title variable to undefined.
+     */
+    ShellUIServiceProxy._resetTitle = function () {
+        sLastSetTitle = undefined;
+    };
+
+    // reset last title locally to undefined after an app was closed
+    EventBus.getInstance().subscribe("sap.ushell", "appClosed", ShellUIServiceProxy._resetTitle);
+
     // Register this service with the generic factory
     ServiceFactoryRegistry.register(
         "sap.ushell.ui5service.ShellUIService",

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.131.0
+ * @version 1.132.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.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/appRuntime/ui5/style.css

@@ -0,0 +1,48 @@
+body {
+    background-color:#636363;
+    height: 100%;
+    width: 100%;
+}
+
+.apprtBIcenter {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    margin-top: -50px;
+    margin-left: -100px;
+    width: 200px;
+    height: 100px;
+}
+
+.apprtBIcir {
+    height: 30px;
+    width:30px;
+    border-radius:50%;
+    transform: scale(0);
+    background-color:#0854a0;
+    animation: apprtBIscaling 1.8s ease-in-out infinite;
+    display: inline-block;
+    margin:.1rem;
+}
+
+.apprtBIcir:nth-child(0) {
+    animation-delay:0s;
+}
+
+.apprtBIcir:nth-child(1) {
+    animation-delay:0.2s;
+}
+
+.apprtBIcir:nth-child(2) {
+    animation-delay:0.4s;
+}
+
+.apprtBIcir:nth-child(3) {
+    animation-delay:0.6s;
+}
+
+@keyframes apprtBIscaling {
+    0%, 100% {transform: scale(0.2);}
+    40% {transform: scale(1);}
+    50% {transform: scale(1);}
+}

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/LoadingConfiguration.json

@@ -20,6 +20,10 @@
                 {
                     "LoadingStep": "MenuBar",
                     "canBeLoadedAsync": true
+                },
+                {
+                    "LoadingStep": "SideNavigation",
+                    "canBeLoadedAsync": true
                 }
             ],
             "maxWaitInMs": 0

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/StepConfiguration.json

@@ -54,6 +54,26 @@
         "userCanTrigger": false,
         "canBeInterrupted": false
     },
+    "SideNavigation": {
+       "loadingMode": "byComponentCreate",
+
+        "byComponentCreate": {
+            "enabled": true,
+            "ui5ComponentOptions": {
+                "name": "sap.ushell.components.shell.SideNavigation",
+                "manifest": true
+            },
+            "url": "sap/ushell/components/shell/SideNavigation"
+        },
+        "configSwitch": [
+            {
+                "path":"/core/menu/position",
+                "assertionValue": "Side"
+            }
+        ],
+        "userCanTrigger": false,
+        "canBeInterrupted": false
+    },
     "Notifications": {
         "loadingMode": "byComponentCreate",
 

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

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

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

@@ -71,13 +71,19 @@
  * }, false);
  * </pre>
  *
- * @version 1.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/ushell/bootstrap/SchedulingAgent/logger",
     "sap/base/util/now",
-    "sap/base/util/deepClone"
-], function (logger, fnNow, fnClone) {
+    "sap/base/util/deepClone",
+    "sap/base/Log"
+], function (
+    logger,
+    fnNow,
+    fnClone,
+    Log
+) {
     "use strict";
 
     // #region ===== IDs =====
@@ -430,7 +436,7 @@ sap.ui.define([
          * @protected
          */
         dump: function () {
-            console.log(JSON.parse(JSON.stringify(this.oState)));
+            Log.debug(JSON.parse(JSON.stringify(this.oState)));
             var oStateCopy = fnClone(this.oState);
             return oStateCopy;
         },

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.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/base/i18n/Formatting",

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

@@ -49,6 +49,12 @@ sap.ui.define([
             return oDeepObject[sLastPart];
         }
 
+        /**
+         * Retrieves the value from the configuration object or returns the default value.
+         * @param {string} sPath the path to the configuration value
+         * @param {string|boolean|int|object} oDefaultValue default value if the configuration value is not found
+         * @returns {string|boolean|int|object} the found configuration value or the default value
+         */
         function getConfigValue (sPath, oDefaultValue) {
             var oSegment = getValueFromConfig(oGetConfigValueMemory, sPath);
             oDefaultConfigValues[sPath] = oDefaultValue;
@@ -222,7 +228,8 @@ sap.ui.define([
                     runtimeSwitcher: getConfigValue("ushell/workPages/runtimeSwitcher",
                         getConfigValue("ushell/spaces/myHome/myHomePageId", null) === null),
                     contentFinderStandalone: getConfigValue("core/workPages/contentFinderStandalone", true)
-                        && getConfigValue("ushell/workPages/enabled", false)
+                        && getConfigValue("ushell/workPages/enabled", false),
+                    enableSmartBusiness: getConfigValue("ushell/workPages/enableSmartBusiness", true)
                 },
                 homeApp: {
                     // the homeApp is currently only supposed to work for Spaces
@@ -237,8 +244,10 @@ sap.ui.define([
                     personalization: {
                         enabled: getConfigValue("ushell/menu/personalization/enabled", false)
                     },
+                    position: getConfigValue("ushell/menu/position", "Top"),
                     visibleInAllStates: getConfigValue("ushell/menu/visibleInAllStates", false)
                 },
+                menuQueryAvailable: getConfigValue("ushell/menuQueryAvailable", false),
                 darkMode: {
                     enabled: getConfigValue("ushell/darkMode/enabled", false),
                     supportedThemes: getConfigValue("ushell/darkMode/supportedThemes", [{
@@ -422,6 +431,7 @@ sap.ui.define([
                 uiTracer: {
                     enabled: getConfigValue("services/UITracer/config/enabled", false)
                 }
+
             }
         };
 

package/src/main/js/sap/ushell/bootstrap/sandbox2/sandboxConfig.json

@@ -118,8 +118,7 @@
                         "sapDateFormat": "1",
                         "theme": "sap_horizon",
                         "sapTimeFormat": "0",
-                        "timeZone": "CET",
-                        "contentDensity": "cozy"
+                        "timeZone": "CET"
                     }
                 }
             }

package/src/main/js/sap/ushell/bootstrap/sandbox2.js

@@ -7,7 +7,7 @@
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  * This is the version that creates spaces/pages runtime environment.
  *
- * @version 1.131.0
+ * @version 1.132.0
  */
 
 (function () {

package/src/main/js/sap/ushell/components/MessagingHelper.js

@@ -17,12 +17,12 @@ sap.ui.define([
      * Return translated text.
      * @param {string} sMsgId
      *      Id of the text that is to be translated.
-     * @param {Array<*>} aParams
-     *      Array of parameters to be included in the resulted string instead of place holders.
+     * @param {any} vParams parameters to be included in the resulted string instead of place holders.
      *
      * @returns {string} Translated text
      */
-    function getLocalizedText (sMsgId, aParams) {
+    function getLocalizedText (sMsgId, vParams) {
+        const aParams = Array.isArray(vParams) ? vParams : [vParams];
         return resources.i18n.getText(sMsgId, aParams);
     }
 

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

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

package/src/main/js/sap/ushell/components/applicationIntegration/AppLifeCycle.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/ui/Device",
@@ -247,12 +247,12 @@ sap.ui.define([
                 if (BlueBoxHandler.isStatefulContainer(oStorageEntry.container)) {
                     await BlueBoxHandler.statefulDestroyApp(oStorageEntry.container, sStorageAppId);
 
-                // Return v1, v2 keepAlive to pool
+                    // Return v1, v2 keepAlive to pool
                 } else if (oStorageEntry.container.getIsKeepAlive() && BlueBoxHandler.isReusableContainer(oStorageEntry.container)) {
                     BlueBoxHandler.returnUnusedKeepAliveContainer(oStorageEntry.container);
                     await this._handleExitStateful(oStorageEntry.container, false);
 
-                // embedded keep alive
+                    // embedded keep alive
                 } else {
                     this._removeApplicationContainerFromViewPort(sStorageAppId);
                     BlueBoxHandler.deleteBlueBoxByContainer(oStorageEntry.container);
@@ -374,7 +374,7 @@ sap.ui.define([
             if (BlueBoxHandler.isStatefulContainer(oOldApplicationContainer)) {
                 await this._handleExitStateful(oOldApplicationContainer, bNavigationToFlpComponent);
 
-            //STATELESS
+                //STATELESS
             } else if (oOldStorageEntry) {
                 // Back Navigation Case
                 if (RelatedServices.isBackNavigation() && !bNavigationToFlpComponent) {
@@ -535,8 +535,6 @@ sap.ui.define([
 
                 await this._handleExitApplication(oApplicationContainer, bNavigationToFlpComponent, true);
             }
-
-            RelatedServices.resetBackNavigationFlag();
         };
 
         /**
@@ -814,7 +812,12 @@ sap.ui.define([
                         this._removeApplicationContainerFromViewPort(oApplicationContainer.getId());
                         oApplicationContainer.destroy();
                     }
-                } else if (oResolvedHashFragment.applicationType === "URL" || oResolvedHashFragment.applicationType === "TR" || oResolvedHashFragment.applicationType === "NWBC") {
+                }
+                if (oResolvedHashFragment.applicationType === "URL"
+                    || oResolvedHashFragment.applicationType === "TR"
+                    || oResolvedHashFragment.applicationType === "NWBC"
+                    || oResolvedHashFragment.applicationType === "WDA"
+                ) {
                     //Temporary fix - fix duplicate app container id in cFLP
                     //explanation: in cFLP, there might be a case where there are
                     // two apps with the same Semantic object + Action, but from different
@@ -1698,7 +1701,7 @@ sap.ui.define([
          * @returns {object} The app container.
          */
         this._createApplicationContainer = async function (sAppId, oParsedShellHash, oResolvedHashFragment) {
-            const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment);
+            const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment, oResolvedHashFragment?.sFixedShellHash);
             const bFullWidth = this._isFullWidth(oResolvedHashFragment);
 
             /*
@@ -1779,9 +1782,9 @@ sap.ui.define([
 
             } else if (bComponentLoaded || !sTargetUi5ComponentName) { // non UI5 Application
                 if ((
-                        oResolvedHashFragment.applicationType === "URL"
-                        || ushellUtils.isSAPLegacyApplicationType(oResolvedHashFragment.applicationType)
-                    )
+                    oResolvedHashFragment.applicationType === "URL"
+                    || ushellUtils.isSAPLegacyApplicationType(oResolvedHashFragment.applicationType)
+                )
                     && oInMemoryApplicationInstance.destroyApplication
                     && oInMemoryApplicationInstance.appId
                 ) {

package/src/main/js/sap/ushell/components/applicationIntegration/application/Application.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxHandler.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.131.0
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/base/util/Deferred",

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxesCache.js

@@ -1,8 +1,9 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
-    "sap/ui/thirdparty/URI",
     "sap/base/Log"
-], function (URI, Log) {
+], function (
+    Log
+) {
     "use strict";
 
     class BlueBoxesCache {
@@ -189,67 +190,43 @@ sap.ui.define([
          * @private
          */
         getKeyFromUrl (sUrl) {
-            var oUri,
-                sOrigin,
-                oParams,
+            let sOrigin,
                 sIframeHint = "",
                 sUI5Version = "",
                 sKeepAlive = "",
                 sUI5Async = "",
                 sFESR = "",
-                sTestUniqueId = "",
-                oRes = {
-                    sKey: "",
-                    sOrigin: "",
-                    sIframeHint: "",
-                    sUI5Version: "",
-                    sKeepAlive: "",
-                    sUI5Async: "",
-                    sFESR: ""
-                };
-
-            //special cases
-            if (sUrl === undefined || sUrl === "" || sUrl === "../") {
-                const sKey = sUrl;
-                return sKey;
-            }
+                sTestUniqueId = "";
 
             try {
-                oUri = new URI(sUrl);
-                if (sUrl.charAt(0) === "/") {
-                    sOrigin = window.location.origin;
-                } else {
-                    sOrigin = oUri.origin();
-                }
-                if (sOrigin === undefined || sOrigin === "") {
-                    sOrigin = oUri.path();
-                    if (sOrigin === undefined || sOrigin === "") {
-                        sOrigin = sUrl;
+                const oURL = new URL(sUrl, this._getWindowLocationHref());
+                sOrigin = oURL.origin;
+                if (oURL.port === "") {
+                    if (oURL.protocol === "https:") {
+                        sOrigin = sOrigin + ":443";
+                    } else if (oURL.protocol === "http:") {
+                        sOrigin = sOrigin + ":80";
                     }
                 }
-                oParams = oUri.query(true);
-                if (oParams.hasOwnProperty("sap-iframe-hint")) {
-                    oRes.sIframeHint = oParams["sap-iframe-hint"];
-                    sIframeHint = "@hint:" + oRes.sIframeHint;
+
+                const oSearchParams = oURL.searchParams;
+                if (oSearchParams.has("sap-iframe-hint")) {
+                    sIframeHint = "@hint:" + oSearchParams.get("sap-iframe-hint");
                 }
-                if (oParams.hasOwnProperty("sap-ui-version")) {
-                    oRes.sUI5Version = oParams["sap-ui-version"];
-                    sUI5Version = "@uiver:" + oRes.sUI5Version;
+                if (oSearchParams.has("sap-ui-version")) {
+                    sUI5Version = "@uiver:" + oSearchParams.get("sap-ui-version");
                 }
-                if ((sIframeHint === "@hint:GUI" || sIframeHint === "@hint:WDA" || sIframeHint === "@hint:WCF") && oParams.hasOwnProperty("sap-keep-alive")) {
-                    oRes.sKeepAlive = oParams["sap-keep-alive"];
-                    sKeepAlive = "@ka:" + oRes.sKeepAlive + "-" + sUrl;
+                if ((sIframeHint === "@hint:GUI" || sIframeHint === "@hint:WDA" || sIframeHint === "@hint:WCF") && oSearchParams.has("sap-keep-alive")) {
+                    sKeepAlive = "@ka:" + oSearchParams.get("sap-keep-alive") + "-" + sUrl;
                 }
-                if (oParams.hasOwnProperty("sap-async-loading") && oParams["sap-async-loading"] !== "true") {
-                    oRes.sUI5Async = oParams["sap-async-loading"];
-                    sUI5Async = "@async:" + oRes.sUI5Async;
+                if (oSearchParams.has("sap-async-loading") && oSearchParams.get("sap-async-loading") !== "true") {
+                    sUI5Async = "@async:" + oSearchParams.get("sap-async-loading");
                 }
-                if (oParams.hasOwnProperty("sap-enable-fesr") && oParams["sap-enable-fesr"] !== "false") {
-                    oRes.sFESR = oParams["sap-enable-fesr"];
-                    sFESR = "@fesr:" + oRes.sFESR;
+                if (oSearchParams.has("sap-enable-fesr") && oSearchParams.get("sap-enable-fesr") !== "false") {
+                    sFESR = "@fesr:" + oSearchParams.get("sap-enable-fesr");
                 }
-                if (oParams.hasOwnProperty("sap-testcflp-iframeid")) {
-                    sTestUniqueId = "@testid:" + oParams["sap-testcflp-iframeid"];
+                if (oSearchParams.has("sap-testcflp-iframeid")) {
+                    sTestUniqueId = "@testid:" + oSearchParams.get("sap-testcflp-iframeid");
                 }
             } catch (ex) {
                 Log.error(
@@ -259,11 +236,15 @@ sap.ui.define([
                 sOrigin = sUrl;
             }
 
-            const sKey = sOrigin + sIframeHint + sUI5Version + sKeepAlive + sUI5Async + sFESR + sTestUniqueId;
+            const sKey = sOrigin.toLowerCase() + sIframeHint + sUI5Version + sKeepAlive + sUI5Async + sFESR + sTestUniqueId;
 
             return sKey;
         }
 
+        _getWindowLocationHref () {
+            return window.location.href;
+        }
+
         _getStorageForDebug () {
             return {
                 oCacheStorage: this.#oActiveApplicationContainers,
@@ -273,4 +254,4 @@ sap.ui.define([
     }
 
     return new BlueBoxesCache();
-}, /* bExport= */ false);
+});