@sapui5/sap.ushell 1.114.10 → 1.114.12

package/src/main/js/sap/ushell/appRuntime/ui5/AppRuntime.js

@@ -325,9 +325,11 @@ sap.ui.define([
 
                 if (oTarget && oTarget.tagName === "A" && oTarget.href && oTarget.href.indexOf("#") > 0) {
                     if (oTarget.target === "_blank") {
-                        var sNewURL = _that.rebuildNewAppUrl(oTarget.href, sFLPURL);
-                        if (sNewURL !== oTarget.href) {
-                            WindowUtils.openURL(sNewURL);
+                        var sTargetUrlSplit = oTarget.href.split("#");
+                        if (sTargetUrlSplit[0].length === 0 || sTargetUrlSplit[0] === document.URL.split("#")[0]) {
+                            _that.rebuildNewAppUrl(oTarget.href, sFLPURL).then(function (sNewURL) {
+                                WindowUtils.openURL(sNewURL);
+                            });
                             //We're returning false to determine that the default browser behaviour should NOT take place
                             // and we will be the one to handle the opening of the link (with 'window.open').
                             event.preventDefault();
@@ -364,13 +366,24 @@ sap.ui.define([
          * @private
          */
         this.rebuildNewAppUrl = function (sTargetUrl, sFLPUrl) {
-            var sTargetUrlSplit = sTargetUrl.split("#");
-            //Check if the destination URL equals to the IFrame URL
-            if (sTargetUrlSplit[0].length === 0 || sTargetUrlSplit[0] === document.URL.split("#")[0]) {
-                //Replace the Iframe URL with the FLP URL or Add it before the #
-                return sFLPUrl + "#" + sTargetUrlSplit[1];
-            }
-            return sTargetUrl;
+            return new Promise(function (fnResolve) {
+                var sTargetUrlSplit = sTargetUrl.split("#");
+                //Check if the destination URL equals to the IFrame URL
+                if (sTargetUrlSplit[0].length === 0 || sTargetUrlSplit[0] === document.URL.split("#")[0]) {
+                    //Replace the Iframe URL with the FLP URL or Add it before the #
+                    if (AppRuntimeContext.getIsScube()) {
+                        AppRuntimeContext.checkIntentsConversionForScube([{
+                            intent: "#" + sTargetUrlSplit[1]
+                        }]).then(function (aResult) {
+                            fnResolve(sFLPUrl + aResult[0].intent);
+                        });
+                    } else {
+                        fnResolve(sFLPUrl + "#" + sTargetUrlSplit[1]);
+                    }
+                    return;
+                }
+                fnResolve(sTargetUrl);
+            });
         };
 
         /**
@@ -669,23 +682,8 @@ sap.ui.define([
                                 false,
                                 undefined
                             );
-                            var oCurrentApp = oAppLifeCycleService.getCurrentApplication();
-                            oCurrentApp.getInfo(["appFrameworkVersion", "appSupportInfo", "appId", "appVersion"]).then(function (oAppInfo) {
-                                for (var sParameter in oAppInfo) {
-                                    if (oAppInfo[sParameter] === undefined || oAppInfo[sParameter] === "") {
-                                        delete (oAppInfo[sParameter]);
-                                    }
-                                }
-                                oAppInfo.appFrameworkId = "UI5";
-                                oAppInfo.technicalAppComponentId = oAppProperties.ui5ComponentName;
-                                if (typeof sAppTitle === "string") {
-                                    oAppInfo.appTitle = sAppTitle;
-                                }
-                                AppLifeCycleAgent.setCurrentAppAttributes(oAppInfo);
-                                setTimeout(function () {
-                                    AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.AppLifeCycle.updateCurrentAppInfo", {info: oAppInfo});
-                                }, 500);
-                            });
+
+                            _that.getCurrentAppInfo(oAppLifeCycleService, oURLParameters, oAppProperties, sAppTitle);
                             _that.considerChangingTheDefaultFullWidthVal(oResolutionResultWithComponentHandle);
                             _that.overrideUrlHelperFuncs();
                             fnResolve({
@@ -700,6 +698,41 @@ sap.ui.define([
             });
         };
 
+        /**
+         * @private
+         */
+        this.getCurrentAppInfo = function (oAppLifeCycleService, oURLParameters, oAppProperties, sAppTitle) {
+
+            var aAppInfoParams = [
+                "appFrameworkVersion",
+                "appVersion"
+            ];
+            if (!oURLParameters["sap-startup-params"] || oURLParameters["sap-startup-params"].indexOf("sap-fiori-id") === -1) {
+                aAppInfoParams.push("appId");
+            }
+            if (!oURLParameters["sap-startup-params"] || oURLParameters["sap-startup-params"].indexOf("sap-ach") === -1) {
+                aAppInfoParams.push("appSupportInfo");
+            }
+
+            var oCurrentApp = oAppLifeCycleService.getCurrentApplication();
+            oCurrentApp.getInfo(aAppInfoParams).then(function (oAppInfo) {
+                for (var sParameter in oAppInfo) {
+                    if (oAppInfo[sParameter] === undefined || oAppInfo[sParameter] === "") {
+                        delete (oAppInfo[sParameter]);
+                    }
+                }
+                oAppInfo.appFrameworkId = "UI5";
+                oAppInfo.technicalAppComponentId = oAppProperties.ui5ComponentName;
+                if (typeof sAppTitle === "string") {
+                    oAppInfo.appTitle = sAppTitle;
+                }
+                AppLifeCycleAgent.setCurrentAppAttributes(oAppInfo);
+                setTimeout(function () {
+                    AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.AppLifeCycle.updateCurrentAppInfo", {info: oAppInfo});
+                }, 500);
+            });
+        };
+
         /**
          * @private
          */
@@ -752,8 +785,9 @@ sap.ui.define([
                 URLHelper.redirect = function (sURL, bNewWindow) {
                     if (sURL && bNewWindow === true && sURL.indexOf("#") >= 0) {
                         sap.ushell.Container.getFLPUrlAsync().then(function (sFLPURL) {
-                            var sNewURL = _that.rebuildNewAppUrl(sURL, sFLPURL);
-                            fnOrigURLHelperRedirect.call(URLHelper, sNewURL, bNewWindow);
+                            _that.rebuildNewAppUrl(sURL, sFLPURL).then(function (sNewURL) {
+                                fnOrigURLHelperRedirect.call(URLHelper, sNewURL, bNewWindow);
+                            });
                         });
                     } else {
                         fnOrigURLHelperRedirect.call(URLHelper, sURL, bNewWindow);

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

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

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

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

@@ -71,7 +71,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.114.10
+ * @version 1.114.12
  * @namespace
  */
 sap.ui.define([

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.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.appfinder",
         "applicationVersion": {
-            "version": "1.114.10"
+            "version": "1.114.12"
         },
         "i18n": {
             "bundleUrl": "../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/applicationIntegration/AppLifeCycle.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.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/elements/model",
@@ -651,7 +651,7 @@ sap.ui.define([
                         BlueBoxHandler.removeCapabilities(oTmpAppContainer);
                         this.destroy("application-" + sIntent, oTmpAppContainer);
                         BlueBoxHandler.deleteStateFul(sTmpUrl);
-                        this.removeWebGuiV1StatefulContainer(sTmpUrl);
+                        this.removeWebGuiV1StatefulContainer(oTmpAppContainer);
                     }
                 }
 
@@ -1764,13 +1764,19 @@ sap.ui.define([
         };
 
         this.removeWebGuiV1StatefulContainer = function (oApplicationContainer) {
-            var sUrl = oApplicationContainer.getUrl(),
-                sKey;
-
-            if (sUrl) {
-                sKey = BlueBoxHandler._getBlueBoxCacheKey(sUrl);
-                delete oWebGuiV1StatefulCache[sKey];
+            if (oApplicationContainer && oApplicationContainer.getUrl) {
+                var sUrl = oApplicationContainer.getUrl(),
+                    sKey;
+
+                if (sUrl) {
+                    sKey = BlueBoxHandler._getBlueBoxCacheKey(sUrl);
+                    if (sKey && sKey.length > 0) {
+                        delete oWebGuiV1StatefulCache[sKey];
+                        return true;
+                    }
+                }
             }
+            return false;
         };
 
         /**

package/src/main/js/sap/ushell/components/applicationIntegration/Storage.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.114.10
+ * @version 1.114.12
  */
 sap.ui.define([], function () {
     "use strict";

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.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/ushell/components/container/ApplicationContainer",

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.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/application/BlueBoxesCache",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview defines the post message API for all applications running in iframe within the shell
- * @version 1.114.10
+ * @version 1.114.12
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/components/applicationIntegration/configuration/AppMeta.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.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/base/util/extend",

package/src/main/js/sap/ushell/components/applicationIntegration/elements/model.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/ushell/EventHub",

package/src/main/js/sap/ushell/components/applicationIntegration/relatedServices/RelatedServices.js

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

package/src/main/js/sap/ushell/components/applicationIntegration/relatedShellElements/RelatedShellElements.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the related shell elements of the different applications.
- * @version 1.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/container/ApplicationContainer.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The UI integration's SAPUI5 control which supports application embedding.
- * @version 1.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.114.10
+ * @version 1.114.12
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/contentFinder/controller/AppSearch.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file AppSearch controller for AppSearch view
- * @version 1.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "./ContentFinderDialog.controller",

package/src/main/js/sap/ushell/components/contentFinder/controller/ContentFinderDialog.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog root view
- * @version 1.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "../model/formatter",

package/src/main/js/sap/ushell/components/contentFinder/controller/WidgetGallery.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for WidgetGallery view
- * @version 1.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "./ContentFinderDialog.controller"

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinder",
         "applicationVersion": {
-            "version": "1.114.10"
+            "version": "1.114.12"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

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

@@ -17,7 +17,7 @@ sap.ui.define([
 
         // use inline declaration instead of component.json to save 1 round trip
         metadata: {
-            version: "1.114.10",
+            version: "1.114.12",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m", "sap.ui.vbm", "sap.suite.ui.commons", "sap.ui.layout", "sap.viz"],

package/src/main/js/sap/ushell/components/homepage/ActionMode.js

@@ -18,7 +18,7 @@
  *  - Deactivation handler
  *  - Rendering tile action menu
  *
- * @version 1.114.10
+ * @version 1.114.12
  */
 /**
  * @namespace

package/src/main/js/sap/ushell/components/homepage/DashboardContent.view.js

@@ -5,7 +5,7 @@
  * with a header of type <code>sap.ushell.ui.launchpad.AnchorNavigationBar</code>
  * and content of type <code>sap.ushell.ui.launchpad.DashboardGroupsContainer</code>.
  *
- * @version 1.114.10
+ * @version 1.114.12
  * @name sap.ushell.components.homepage.DashboardContent.view
  * @private
  */

package/src/main/js/sap/ushell/components/homepage/DashboardGroupsBox.js

@@ -6,7 +6,7 @@
  * Exposes the public function <code>createGroupsBox</code>
  * @see sap.ushell.components.homepage.DashboardContent.view
  *
- * @version 1.114.10
+ * @version 1.114.12
  * @name sap.ushell.components.homepage.DashboardGroupsBox
  * @since 1.35.0
  * @private

package/src/main/js/sap/ushell/components/homepage/DashboardUIActions.js

@@ -5,7 +5,7 @@
  * Extends <code>sap.ui.base.Object</code><br>
  * Exposes the public function <code>initializeUIActions</code>
  *
- * @version 1.114.10
+ * @version 1.114.12
  * @name sap.ushell.components.homepage.DashboardUIActions
  * @since 1.35.0
  * @private

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.homepage",
         "applicationVersion": {
-            "version": "1.114.10"
+            "version": "1.114.12"
         },
         "i18n": {
             "bundleUrl": "../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/pages/ActionMode.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ActionMode for the PageRuntime view
  *
- * @version 1.114.10
+ * @version 1.114.12
  */
 
 sap.ui.define([

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

@@ -5,7 +5,7 @@
  * #Shell-home or #Launchpad-openFLPPage if spaces are enabled (/core/spaces/enabled).
  * In the future it should completely replace the classical homepage.
  *
- * @version 1.114.10
+ * @version 1.114.12
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/MyHomeImport.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview MyHome migrate functionality for the PageRuntime view
  *
- * @version 1.114.10
+ * @version 1.114.12
  */
 
 sap.ui.define([

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

@@ -2,7 +2,7 @@
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/ushell/library",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.pages",
         "applicationVersion": {
-            "version": "1.114.10"
+            "version": "1.114.12"
         },
         "i18n": {
             "bundleUrl": "../../renderers/fiori2/resources/resources.properties",

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

@@ -2,7 +2,7 @@
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.114.10
+ * @version 1.114.12
  */
  sap.ui.define([
     "sap/ui/core/mvc/Controller",

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

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

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
         "applicationVersion": {
-            "version": "1.114.10"
+            "version": "1.114.12"
         },
         "i18n": {
             "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/controller/NavigationBarMenu.controller.js

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.114.10
+ * @version 1.114.12
  * @private
  */
 sap.ui.define([

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.NavigationBarMenu",
         "applicationVersion": {
-            "version": "1.114.10"
+            "version": "1.114.12"
         },
         "i18n": {
             "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",

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

@@ -42,7 +42,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.Notifications.Component", {
         metadata: {
-            version: "1.114.10",
+            version: "1.114.12",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]

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

@@ -31,7 +31,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.ProductSwitch.Component", {
 
         metadata: {
-            version: "1.114.10",
+            version: "1.114.12",
             library: "sap.ushell.components.shell.ProductSwitch",
             dependencies: {
                 libs: {

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

@@ -4,7 +4,7 @@
         "id": "sap.ushell.components.shell.Search",
 
         "applicationVersion": {
-            "version": "1.114.10"
+            "version": "1.114.12"
         },
         "i18n": {
             "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",

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

@@ -23,7 +23,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.114.10",
+            version: "1.114.12",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/NavigationSvcSearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.114.10
+ * @version 1.114.12
  */
 sap.ui.define([
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module is the search provider main interface
- * @version 1.114.10
+ * @version 1.114.12
  */
 sap.ui.define([], function () {
     "use strict";

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

@@ -48,7 +48,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.Settings.Component", {
 
         metadata: {
-            version: "1.114.10",
+            version: "1.114.12",
             library: "sap.ushell",
             dependencies: {
                 libs: {

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

@@ -25,7 +25,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserActionsMenu.Component", {
 
         metadata: {
-            version: "1.114.10",
+            version: "1.114.12",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m"]

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

@@ -37,7 +37,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserImage.Component", {
 
         metadata: {
-            version: "1.114.10",
+            version: "1.114.12",
             library: "sap.ushell.components.shell.UserImage",
             dependencies: {
                 libs: {