@sapui5/sap.ushell 1.126.0 → 1.127.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell",
-    "version": "1.126.0",
+    "version": "1.127.0",
     "description": "SAPUI5 Library sap.ushell",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [

package/src/main/js/sap/ushell/.library

@@ -2,7 +2,7 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell</name>
     <vendor>SAP SE</vendor>
-    <version>1.126.0</version>
+    <version>1.127.0</version>
     <copyright>Copyright (c) 2009-2023 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell</documentation>
 

package/src/main/js/sap/ushell/Fiori20Adapter.js

@@ -5,7 +5,7 @@
  *
  * The Fiori20 adapter automatically re-styles old (Fiori 1) applications to match Fiori2 design requirements.
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/ui/base/Object",

package/src/main/js/sap/ushell/Fiori20AdapterTest.js

@@ -4,7 +4,7 @@
  * @fileOverview The purpose Fiori20AdapterTest in this file is to decide whether to load the Fiori20Adapter at all.
  * This file is kept small in size on purpose as it is always required in productive code even when Fiori 2 adaptation is not required.
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/NWBCInterface.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview NWBCInterface for NWBC client
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/ushell/EventHub",

package/src/main/js/sap/ushell/SessionHandler.js

@@ -279,7 +279,7 @@ sap.ui.define([
             EventBus.getInstance().publish("launchpad", "sessionTimeout");
             if (this.oConfig.enableAutomaticSignout === true) {
                 Log.debug("SessionHandler.handleSessionOver :: Automatic signout gets initiated", "", "SessionHandler");
-                this.logout();
+                Container.defaultLogout();
             } else {
                 Log.debug("SessionHandler.handleSessionOver :: Session expired dialog gets opened", "", "SessionHandler");
                 this.createSessionExpiredDialog().open();
@@ -620,7 +620,7 @@ sap.ui.define([
                 this.oSignOutButton = new Button({
                     text: oResources.i18n.getText("logoutBtn_title"),
                     tooltip: oResources.i18n.getText("logoutBtn_tooltip"),
-                    press: this.logout.bind(this)
+                    press: Container.defaultLogout.bind(Container)
                 });
                 this.oSessionKeepAliveDialog.setEndButton(this.oSignOutButton);
             }

package/src/main/js/sap/ushell/TechnicalParameters.js

@@ -42,7 +42,7 @@
  * parameters. If the application tries to access an internal parameter (e.g.,
  * sap-ui-app-id-hint) via the API, the application receives an error message.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor.js

@@ -26,7 +26,7 @@
  * The language to define parameters in the URL Template parameter set contains a minimal set of conditionals,
  * logical operators, and functions that allow to define the parameter set with a certain degree of control.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/Ui5NativeServiceFactory.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Ui5 Native Service Factory
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/Ui5ServiceFactory.js

@@ -6,7 +6,7 @@
  * Exposes methods to create a UI5 Service Factory for a specific Unified Shell
  * Service.
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/User.js

@@ -374,15 +374,15 @@ sap.ui.define([
             // change current display theme
             oCurrentTheme = oTheme;
 
-            if (oTheme.suppliedRoot) {
-                Core.applyTheme(oTheme.theme, oTheme.suppliedRoot + "/UI5/");
-                // the supplied path is the first choice
+            const _applyTheme = Core["applyTheme"];
+            if (!_applyTheme) { // ui5 v.2
+                sap.ui.require("sap/ui/core/Theming").setTheme(oTheme.theme);
+            } else if (oTheme.suppliedRoot) { // Keep the legacy code until Workzone/cFLP adds all theme roots to sap-ui-config correctly
+                _applyTheme(oTheme.theme, oTheme.suppliedRoot + "/UI5/"); // the supplied path is the first choice
             } else if (oTheme.path) {
-                Core.applyTheme(oTheme.theme, oTheme.path + "/UI5/");
-                // second choice is the amended path
+                _applyTheme(oTheme.theme, oTheme.path + "/UI5/"); // second choice is the amended path
             } else {
-                Core.applyTheme(oTheme.theme);
-                // sap_ theme from the front-end server
+                _applyTheme(oTheme.theme); // sap_ theme from the front-end server
             }
 
             // send a message the Iframe to change its theme

package/src/main/js/sap/ushell/UserActivityLog.js

@@ -33,7 +33,8 @@ sap.ui.define([
     "sap/ushell/ui/launchpad/Tile",
     "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing",
-    "sap/ushell/Container"
+    "sap/ushell/Container",
+    "sap/ushell/state/StateManager"
 ], function (
     Log,
     extend,
@@ -42,9 +43,10 @@ sap.ui.define([
     hasher,
     EventHub,
     Tile,
-    utils,
+    ushellUtils,
     urlParsing,
-    Container
+    Container,
+    StateManager
 ) {
     "use strict";
 
@@ -173,7 +175,7 @@ sap.ui.define([
                 shellState: this._getShellState(),
                 navigationData: this._getLastNavActionFromStorage(),
                 userLog: this.getLog(),
-                formFactor: utils.getFormFactor()
+                formFactor: ushellUtils.getFormFactor()
             };
         },
 
@@ -431,15 +433,8 @@ sap.ui.define([
          * @private
          */
         _getShellState: function () {
-            var oViewPortContainer = Element.getElementById("viewPortContainer");
-            var sResult = "";
-
-            if (oViewPortContainer !== undefined) {
-                var oModel = oViewPortContainer.getModel();
-                sResult = oModel.getProperty("/currentState/stateName");
-            }
-
-            return sResult;
+            const sShellMode = StateManager.getShellMode() || "default";
+            return `${sShellMode}-${StateManager.getLaunchpadState()}`;
         },
 
         /**

package/src/main/js/sap/ushell/_Config/utils.js

@@ -225,6 +225,24 @@ sap.ui.define([
             oFlpConfigChannel.emit(oIdentification.contractPart, oBaseObject);
         };
 
+        oModel.getProperty = function (sPath, vMaybeBindingContext) {
+            const sFullPath = constructFullPath(sPath, vMaybeBindingContext, vPropertyToPrefixMapping);
+            const oIdentification = identifyContractParts(sFullPath, oChannelContract);
+
+            return oFlpConfigChannel.last(oIdentification.contractPart);
+        };
+
+        oModel.getData = function (vMaybeBindingContext) {
+            if (typeof vPropertyToPrefixMapping === "string") {
+                return oModel.getProperty("/", vMaybeBindingContext);
+            }
+
+            return Object.keys(vPropertyToPrefixMapping).reduce((oResult, sKey) => {
+                oResult[sKey] = this.getProperty(`/${sKey}`, vMaybeBindingContext);
+                return oResult;
+            }, {});
+        };
+
         return oModel;
     }
 

package/src/main/js/sap/ushell/_URLTemplateProcessor/DefinitionParameterSetBuilder.js

@@ -4,7 +4,7 @@
  * @fileOverview Methods to build the set of parameters used by the URL template.
  *
  *
- * @version 1.126.0
+ * @version 1.127.0
  *
  * @private
  *

package/src/main/js/sap/ushell/_URLTemplateProcessor/DependencyGraph.js

@@ -8,7 +8,7 @@
  * The proper order of evaluation can be determined by creating and visiting a graph that represents parameters and depending parameters
  * as nodes. This graph can be also used to detect cyclic references in the parameter set definition.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/_URLTemplateProcessor/Functions.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Methods to parse and execute functions defined for the URL Template parameter language.
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/_URLTemplateProcessor/Resolvers.js

@@ -5,7 +5,7 @@
  * For a given context (e.g. the reference to a site, the application section from the site, parameters added during runtime, etc),
  * this module can be used to find the values associated to given URL Template parameter names.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/_URLTemplateProcessor/TemplateParameterParser.js

@@ -34,7 +34,7 @@
  *     }
  *   }
  *   </pre>
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/_URLTemplateProcessor/utils.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Utility functions for modules of <code>URLTemplateProcessor</code>.
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/ClientSideTargetResolutionAdapter.js

@@ -9,7 +9,7 @@
  * <li>provide the resolveHashFragment function, a fallback method called by ClientSideTargetResolution service.</li>
  * </ul>
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/base/util/Version",

package/src/main/js/sap/ushell/adapters/cdm/CommonDataModelAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's sap.ushell.adapters.cdm.CommonDataModelAdapter for the 'CDM'
  *               platform.
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/adapters/cdm/ConfigurationDefaultsAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The ConfigurationDefaults adapter for the CDM platform.
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/ushell/bootstrap/cdm/cdm.constants",

package/src/main/js/sap/ushell/adapters/cdm/ContainerAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell"s container adapter for the Common Data Model (CDM) platform.
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -12,7 +12,9 @@ sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ushell/System",
     "sap/ushell/User",
-    "sap/ushell/utils"
+    "sap/ushell/utils",
+    "sap/ushell/Container",
+    "sap/ushell/resources"
 ], function (
     Log,
     extend,
@@ -21,7 +23,9 @@ sap.ui.define([
     jQuery,
     System,
     User,
-    oUtils
+    ushellUtils,
+    Container,
+    resources
 ) {
 
     "use strict";
@@ -296,12 +300,12 @@ sap.ui.define([
             }
 
             // This is the logout from the logon system (FES).
-            if (oUtils.hasNativeLogoutCapability()) {
+            if (ushellUtils.hasNativeLogoutCapability()) {
                 sFullLogOffUrl = (new URI(this._getLogoutUrl()))
                     .absoluteTo(this.getCurrentUrl())
                     .search("") // NOTE: remove query parameters
                     .toString();
-                oUtils.getPrivateEpcm().doLogOff(sFullLogOffUrl);
+                ushellUtils.getPrivateEpcm().doLogOff(sFullLogOffUrl);
             } else {
                 // Do a redirect to the corresponding logout URL
                 return this.logoutRedirect();
@@ -318,7 +322,7 @@ sap.ui.define([
          * @private
          */
         this.logoutRedirect = function () {
-            // adjust the URL, e. g. by applying sap-client or base URL
+            // adjust the URL, e.g. by applying sap-client or base URL
             var sCurrentLogout = oSystem.adjustUrl(this._getLogoutUrl()),
                 oDeferred = new jQuery.Deferred(),
                 that = this;
@@ -350,13 +354,28 @@ sap.ui.define([
                             }
                         });
                     },
-                    error: function () {
+                    error: function (oXhr) {
                         Log.error("fetching X-CSRF-Token for logout via POST failed for system: " + oSystem.getAlias(),
                             undefined, "sap.ushell.adapters.cdm.ContainerAdapter::logoutRedirect");
-                        oDeferred.resolve();
+
+                        // Unauthorized, no need to log off
+                        if (oXhr.status === 401) {
+                            ushellUtils.reload();
+                            oDeferred.resolve();
+                            return;
+                        }
+
+                        // All other errors should be shown in an error dialog
+                        Container.getServiceAsync("MessageInternal").then(function (oMessageService) {
+                            oMessageService.show(
+                                oMessageService.Type.ERROR,
+                                resources.i18n.getText("LogoutFailed"),
+                                { callback: ushellUtils.reload }
+                            );
+                            oDeferred.resolve();
+                        });
                     }
                 });
-
             } else {
                 Log.info("performing logout from system via GET (redirect)", undefined, "sap.ushell.adapters.cdm.ContainerAdapter::logoutRedirect");
                 this._setDocumentLocation(sCurrentLogout);

package/src/main/js/sap/ushell/adapters/cdm/LaunchPageAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's LaunchPageAdapter for the
  *               'CDM' platform - Version 2 (V2)
  * @deprecated since 1.100
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/_LaunchPage/readHome",

package/src/main/js/sap/ushell/adapters/cdm/PagesCommonDataModelAdapter.js

@@ -5,7 +5,7 @@
  * It combines the page data, tile data, navigation data and personalization into a CDM 3.1 site.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -32,7 +32,7 @@ sap.ui.define([
     var PagesCommonDataModelAdapter = function () {
         this._oCDMPagesRequests = {};
         this._oUnstableVisualizations = {};
-        this._sComponent = "sap/ushell/adapters/cdm/PagesCommonDataModelAdapter";
+        this._sComponent = "sap.ushell.adapters.cdm.PagesCommonDataModelAdapter";
 
         this.oSitePromise = new Promise(function (resolve, reject) {
             this.fnSiteResolve = resolve;
@@ -273,7 +273,8 @@ sap.ui.define([
                     aVizOrder.splice(aVizOrder.indexOf(oViz.id), 1);
 
                     if (bVisualizationMissing) {
-                        Log.error("Tile " + oViz.id + " with vizId " + oViz.vizId + " has no matching visualization. As the tile cannot be used to start an app it is removed from the page.");
+                        Log.error(`Tile '${oViz.id}' with vizId '${oViz.vizId}' has no matching visualization. As the tile cannot be used to start an app it is removed from the page.`,
+                            null, this._sComponent);
                     }
 
                     continue;

package/src/main/js/sap/ushell/adapters/cdm/PersonalizationAdapter.js

@@ -5,7 +5,7 @@
  *
  *
  * The CDM personalization adapter can be used to store data in the RA@ABAP platform.
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/_Personalization/internals",

package/src/main/js/sap/ushell/adapters/cdm/PersonalizationV2Adapter.js

@@ -5,7 +5,7 @@
  *
  *
  * The CDM personalization adapter can be used to store data in the RA@ABAP platform.
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "./PersonalizationAdapter"

package/src/main/js/sap/ushell/adapters/cdm/Ui5ComponentLoaderAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the CDM platform
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/modifyHome.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Helper of modifying the home page data for the 'CDM' platform.
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/readCatalogs.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Helper of accessing catalog data for the 'CDM' platform.
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/readHome.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper of accessing Home Page data for the 'CDM' platform.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/uri.transform.js

@@ -4,7 +4,7 @@
  * @fileOverview Transforms relative URIs as used e.g. for data sources in the
  * manifest.json
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI"

package/src/main/js/sap/ushell/adapters/cdm/util/AppForInbound.js

@@ -5,7 +5,7 @@
  * Creates CDM site entries for apps with the provided data.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/util/cdmSiteUtils.js

@@ -5,7 +5,7 @@
  * Creates CDM site entities with the provided data.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/AdapterBase.js

@@ -4,7 +4,7 @@
  * @fileOverview The Base of Unified Shell's LaunchPageAdapter for the 'CDM' platform - Version 3 (V3)
  *   and StaticGroupsContainer for Featured Group
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/v3/_LaunchPage/readHome",

package/src/main/js/sap/ushell/adapters/cdm/v3/FlpLaunchPageAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's LaunchPageAdapter for the
  *               'CDM' platform - Version 3 (V3)
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/v3/_LaunchPage/readHome",

package/src/main/js/sap/ushell/adapters/cdm/v3/LaunchPageAdapter.js

@@ -5,7 +5,7 @@
  *               'CDM' platform - Version 3 (V3)
  *
  * @deprecated since 1.100
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/v3/FlpLaunchPageAdapter"

package/src/main/js/sap/ushell/adapters/cdm/v3/StaticGroupsAdapter.js

@@ -3,7 +3,7 @@
  * @fileOverview The Unified Shell's LaunchPageAdapter for the
  *               'CDM' platform - Version 3 (V3)
  *
- * @version 1.126.0
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/v3/AdapterBase"

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readApplications.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper for accessing application data for the 'CDM' platform.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readCatalogs.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Helper for accessing catalog data for the 'CDM' platform.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define( [

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readHome.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Helper for accessing Home Page data for the 'CDM' platform.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readPages.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper for accessing pages data for the 'CDM' platform.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readUtils.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper for accessing the read utils for the 'CDM' platform.
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readVisualizations.js

@@ -4,7 +4,7 @@
  *
  * TODO: Simplify function names
  *
- * @version 1.126.0
+ * @version 1.127.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/utilsCdm.js

@@ -401,9 +401,10 @@ sap.ui.define([
      * Constructs a hash string from the given inbound.
      *
      * @param {object} oInbound oInbound structure as specified in App Descriptor schema
+     * @param {string} [sAppId] The application id of the app the inbound belongs to
      * @returns {string} The constructed hash without leading '#' or undefined if not successful
      */
-    utilsCdm.toHashFromInbound = function (oInbound) {
+    utilsCdm.toHashFromInbound = function (oInbound, sAppId) {
         var oShellHash = {
             target: {
                 semanticObject: oInbound.semanticObject,
@@ -412,6 +413,10 @@ sap.ui.define([
             params: {}
         };
 
+        if (sAppId) {
+            oShellHash.params["sap-ui-app-id-hint"] = sAppId;
+        }
+
         var oParams = ObjectPath.get("signature.parameters", oInbound) || {};
         Object.keys(oParams).forEach(function (sKey) {
             if (oParams[sKey].filter && Object.prototype.hasOwnProperty.call(oParams[sKey].filter, "value") &&

package/src/main/js/sap/ushell/adapters/cep/NavTargetResolutionAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileoverview The NavTargetResolution adapter for SAP MyHome used in FioriLaunchpad.CEP.MyHome
- * @version 1.126.0
+ * @version 1.127.0
  * @deprecated since 1.120
  * @private
  */