@sapui5/sap.ushell 1.111.1 → 1.112.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell",
-    "version": "1.111.1",
+    "version": "1.112.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.111.1</version>
+    <version>1.112.0</version>
     <copyright>Copyright (c) 2009-2022 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell</documentation>
 

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

@@ -6,8 +6,9 @@ sap.ui.define([
     "sap/base/util/restricted/_curry",
     "sap/base/util/restricted/_zipObject",
     "sap/ui/VersionInfo",
-    "sap/ushell/Config"
-], function (Log, oAppConfiguration, _curry, _zipObject, VersionInfo, Config) {
+    "sap/ushell/Config",
+    "sap/ushell/TechnicalParameters"
+], function (Log, oAppConfiguration, _curry, _zipObject, VersionInfo, Config, TechnicalParameters) {
     "use strict";
     /*global */
 
@@ -270,6 +271,7 @@ sap.ui.define([
         productName: _curry(getSystemContext)("productName")
     };
 
+
     /**
      * Returns <code>true</code> if the given parameter is a custom property.
      * This is the case when:
@@ -285,6 +287,60 @@ sap.ui.define([
         return !oHandlers[sParameter] && /[.]/.test(sParameter);
     }
 
+    function getAllAppInfo (bValues, oCurrentApplication, oComponentInstance, oApplicationContainer, sApplicationType) {
+        return new Promise(function (fnResolve) {
+            var allAppInfo = {};
+
+            for (var sCustomerAttribute in getCustomAttributes()) {
+                if (bValues) {
+                    allAppInfo[sCustomerAttribute] = getCustomAttributes()[sCustomerAttribute].value;
+                } else {
+                    allAppInfo[sCustomerAttribute] = getCustomAttributes()[sCustomerAttribute];
+                }
+            }
+
+            var arrResults = {},
+            aPromises = [];
+            aPromises.push(_getInfo(["appFrameworkId"], oCurrentApplication)
+                .then(function () {
+                    return _getInfo(Object.keys(oHandlers), oCurrentApplication);
+                }));
+            aPromises.push(TechnicalParameters.getTechnicalParametersAppInfo(oComponentInstance, oApplicationContainer, sApplicationType));
+            Promise.allSettled(aPromises).then(function (aResults) {
+                if (aResults[0].status === "fulfilled") {
+                        for (var handler in aResults[0].value) {
+                            if (aResults[0].value[handler] !== undefined) {
+                                if (bValues) {
+                                    arrResults[handler] = aResults[0].value[handler];
+                                } else {
+                                    arrResults[handler] = {
+                                        value: aResults[0].value[handler]
+                                    };
+                                }
+                            }
+                        }
+                }
+                if (aResults[1].status === "fulfilled") {
+                    for (var sTechnicalParameter in aResults[1].value) {
+                        if (!allAppInfo.hasOwnProperty(sTechnicalParameter)) {
+                            if (aResults[1].value[sTechnicalParameter].value && aResults[1].value[sTechnicalParameter].value[0] !== undefined) {
+                                if (bValues) {
+                                    arrResults[sTechnicalParameter] = aResults[1].value[sTechnicalParameter].value[0];
+                                } else {
+                                    arrResults[sTechnicalParameter] = {
+                                        value: aResults[1].value[sTechnicalParameter].value[0]
+                                    };
+                                }
+                            }
+                        }
+                    }
+                }
+                allAppInfo = Object.assign(arrResults, allAppInfo);
+                fnResolve(allAppInfo);
+            });
+        });
+    }
+
     /**
      * Internal central function to collect the values of the given parameters
      * @param {string[]} aParameters Array of requested parameters
@@ -294,6 +350,9 @@ sap.ui.define([
      */
         function _getInfo (aParameters, oCurrentApplication) {
             var aPromises = aParameters.map(function (sParameter) {
+                if (isAttributeExist(sParameter)) {
+                    return Promise.resolve(getCustomValue(sParameter));
+                }
                 // add handler function in case of custom property
                 if (_isCustom(sParameter)) {
                     oHandlers[sParameter] = _curry(getSystemContext)(sParameter);
@@ -310,6 +369,41 @@ sap.ui.define([
         });
     }
 
+    //object of all app info
+    var oCustomAttribute = {};
+
+    function getCustomAttributes () {
+        return oCustomAttribute;
+    }
+
+    function setCustomAttributes (oAppInfo) {
+        if (oAppInfo === undefined || Object.keys(oAppInfo).length === 0) {
+            oCustomAttribute = {};
+            return;
+        }
+        for (var sParameter in oAppInfo.info) {
+            if (sParameter !== "customProperties") {
+                oCustomAttribute[sParameter] = {
+                    value: oAppInfo.info[sParameter]};
+            }
+        }
+        for (var sCustomProperties in oAppInfo.info.customProperties) {
+            oCustomAttribute[sCustomProperties] = oAppInfo.info.customProperties[sCustomProperties];
+        }
+    }
+
+    function isAttributeExist (sParameterName) {
+        return oCustomAttribute.hasOwnProperty(sParameterName);
+    }
+
+    //function that check if the attribute exist in oCustomAttribute
+    function getCustomValue (sParameterName) {
+        if (isAttributeExist(sParameterName)) {
+            return oCustomAttribute[sParameterName].value;
+        }
+        return undefined;
+    }
+
     /**
      * Interface
      */
@@ -331,7 +425,13 @@ sap.ui.define([
             ).then(function () {
                 return _getInfo(aParameters, oCurrentApplication);
             });
-        }
-
+        },
+        getCustomValue : getCustomValue,
+        isAttributeExist : isAttributeExist,
+        setCustomAttributes : setCustomAttributes,
+        getAllAppInfo : getAllAppInfo
     };
+
+
+
 }, false /* bExport= */);

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

@@ -14,7 +14,8 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/URLTemplateProcessor",
     "sap/ushell/User",
-    "sap/ushell/utils"
+    "sap/ushell/utils",
+    "sap/ui/thirdparty/hasher"
 ], function (
     Log,
     deepExtend,
@@ -29,7 +30,8 @@ sap.ui.define([
     Config,
     URLTemplateProcessor,
     User,
-    oUtils
+    oUtils,
+    hasher
 ) {
     "use strict";
 
@@ -224,7 +226,7 @@ sap.ui.define([
     // extracts the inner app route from the browser hash
     function getInnerAppRoute (oTemplatePayload) {
         var sInnerAppRoute = undefined;
-        var sHashFragment = window.hasher.getHash();
+        var sHashFragment = hasher.getHash() || window.location.hash;
         var indexOfInnerRoute = sHashFragment.lastIndexOf("&/");
         var iOffset = 1; //to avoid the starting "&";
 
@@ -296,12 +298,17 @@ sap.ui.define([
                     sessionTimeout = Config.last("/core/shell/sessionTimeoutIntervalInMinutes");
                 }
 
+                var debugMode = false;
+                if (window["sap-ui-debug"] !== false && window["sap-ui-debug"] !== undefined) {
+                    debugMode = window['sap-ui-debug'];
+                }
+
                 fnResolve({
                     language: sLanguage,
                     logonLanguage: sLogonLanguage,
                     theme: sTheme,
                     themeServiceRoot: themeServiceRoot,
-                    isDebugMode: !!window["sap-ui-debug"],
+                    isDebugMode: debugMode,
                     ui5Version: sUi5Version,
                     contentDensity: sContentDensity,
                     sapPlugins: oPluginsService._getNamesOfPluginsWithAgents(),

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

@@ -1641,23 +1641,6 @@ sap.ui.define([
         });
     }
 
-    /**
-     * Creates and registers ui5services.
-     * The service is created via service factory so that its creation is deferred until the service is used.
-     *
-     * @param {string[]} aServicesToRegister An array of service names to register.
-     * @private
-     */
-    function _registerUi5Services (aServicesToRegister) {
-        aServicesToRegister.forEach(function (sUshellServiceName) {
-            // create registerable factory
-            var oServiceFactory = Ui5NativeServiceFactory.createServiceFactory(sUshellServiceName);
-
-            // register factory to allow UI5 to create the service
-            ServiceFactoryRegistry.register("sap.ushell.ui5service." + sUshellServiceName, oServiceFactory);
-        });
-    }
-
     ObjectPath.create("sap.ushell");
     /**
      * Initializes the Unified Shell Container.
@@ -1738,12 +1721,6 @@ sap.ui.define([
 
         registerInjectableUi5Services(["Configuration"], false);
 
-        _registerUi5Services([
-            "CardNavigation",
-            "CardUserRecents",
-            "CardUserFrequents"
-        ]);
-
         // Waterfall:
         //   1. Create "Container" adapter
         //   2. Load "PluginManager" and "CommonDataModel" services
@@ -1811,15 +1788,6 @@ sap.ui.define([
                 getPlugins.then(function (oCDMSitePlugins) {
                     var oAllPlugins = deepExtend({}, oConfig.bootstrapPlugins, oCDMSitePlugins);
                     oPluginManager.registerPlugins(oAllPlugins);
-                    // S/4 my home
-                    try {
-                        // Additional try/catch as jQuery's catch doesn't always catch all the errors.
-                        oPluginManager.loadPlugins("EarlyLoading").catch(function () {
-                            Log.error("Error loading S/4's my home plugin");
-                        });
-                    } catch (oErr) {
-                        Log.error("Error loading S/4's my home plugin");
-                    }
                 });
             }
 

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.111.1
+ * @version 1.112.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.111.1
+ * @version 1.112.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.111.1
+ * @version 1.112.0
  */
 sap.ui.define([
     "sap/ushell/EventHub",

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

@@ -40,7 +40,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.111.1
+ * @version 1.112.0
  * @private
  */
 sap.ui.define([
@@ -68,7 +68,8 @@ sap.ui.define([
                         fnSuccess(getValueFromContainer(sParameterName, oApplicationContainer));
                     }
                 });
-            }
+            },
+            bExposeAsAppInfo: false
         },
         // Used by the about button to inform the user about the id of the
         // current application.
@@ -83,7 +84,8 @@ sap.ui.define([
                         fnSuccess(getValueFromContainer(sParameterName, oApplicationContainer));
                     }
                 });
-            }
+            },
+            bExposeAsAppInfo: true
         },
         // Used by the RT plugin to determine whether the RT change was made
         // by a key user or by a end-user.
@@ -92,7 +94,8 @@ sap.ui.define([
             isIntentParameter: true,
             getValue: function (sParameterName, oApplicationComponent) {
                 return Promise.resolve().then(getValueFromComponent.bind(null, sParameterName, oApplicationComponent));
-            }
+            },
+            bExposeAsAppInfo: false
         },
         // Used by RTA to determine which control variant id(s) should be
         // selected when the application is loaded.
@@ -101,7 +104,8 @@ sap.ui.define([
             isIntentParameter: false,
             getValue: function (sParameterName, oApplicationComponent) {
                 return Promise.resolve().then(getValueFromComponent.bind(null, sParameterName, oApplicationComponent));
-            }
+            },
+            bExposeAsAppInfo: false
         },
         // Used by RTA to determine draft app which user starts to
         // adapt but don't want to activate immediately.
@@ -110,7 +114,8 @@ sap.ui.define([
             isIntentParameter: true,
             getValue: function (sParameterName, oApplicationComponent) {
                 return Promise.resolve().then(getValueFromComponent.bind(null, sParameterName, oApplicationComponent));
-            }
+            },
+            bExposeAsAppInfo: false
         },
         // Used in CDM 3.0 based FLPs to navigate to specific applications.
         // The parameter should never be passed to the target application, or
@@ -118,7 +123,8 @@ sap.ui.define([
         "sap-ui-app-id-hint": {
             injectFrom: "startupParameter",
             isIntentParameter: true,
-            getValue: denyParameterValue
+            getValue: denyParameterValue,
+            bExposeAsAppInfo: false
         },
         // The application component hierarchy (ACH) will for WDA and SAPGui
         // apps be provided as part of the configuration string of the target
@@ -135,7 +141,8 @@ sap.ui.define([
                         fnSuccess(getValueFromContainer(sParameterName, oApplicationContainer));
                     }
                 });
-            }
+            },
+            bExposeAsAppInfo: true
         },
         // Used by ClientSideTargetResolution to execute a sequence of operations
         // on application startup parameters and selection variants in sap-xapp-state
@@ -143,7 +150,8 @@ sap.ui.define([
         "sap-prelaunch-operations": {
             injectFrom: "inboundParameter",
             isIntentParameter: true,
-            getValue: denyParameterValue
+            getValue: denyParameterValue,
+            bExposeAsAppInfo: false
         },
         // A parameter propagated across programmatic navigations by FLP
         // which indicates the preferred system a target application should
@@ -153,16 +161,38 @@ sap.ui.define([
         "sap-app-origin-hint": {
             injectFrom: "startupParameter",
             isIntentParameter: false,
-            getValue: denyParameterValue
+            getValue: denyParameterValue,
+            bExposeAsAppInfo: false
         },
         // The parameter that allows the navigation to a specific content provider
         "sap-app-origin": {
             injectFrom: "startupParameter",
             isIntentParameter: false,
-            getValue: denyParameterValue
+            getValue: denyParameterValue,
+            bExposeAsAppInfo: false
         }
     };
 
+    function getAppInfoTechnicalParameters (oComponentInstance, oApplicationContainer, sApplicationType) {
+        return new Promise(function (fnResolve) {
+            var aTechnicalParametersAppInfo = getParameters({bExposeAsAppInfo: true}).map(function (oResult) {
+                return oResult.name;
+            });
+            var promises = Object.values(aTechnicalParametersAppInfo).map(function (sParameterAppInfo) {
+                return getParameterValue(sParameterAppInfo, oComponentInstance, oApplicationContainer, sApplicationType);
+            });
+            var oTechnicalAppInfo = {};
+            Promise.allSettled(promises).then(function (values) {
+                Object.keys(aTechnicalParametersAppInfo).forEach(function (key, index) {
+                    if (values[index].status === 'fulfilled') {
+                        oTechnicalAppInfo[aTechnicalParametersAppInfo[key]] = values[index];
+                    }
+                });
+                fnResolve(oTechnicalAppInfo);
+            });
+        });
+        }
+
     /**
      * Helper method to deny access to a technical value
      *
@@ -253,17 +283,16 @@ sap.ui.define([
      * @private
      */
     function getParameterValue (sParameterName, oApplicationComponent, oApplicationContainer, sApplicationType) {
-        if (!oTechnicalParameters[sParameterName]) {
-            return Promise.reject(sParameterName + " is not a known technical parameter");
-        }
+            if (!oTechnicalParameters[sParameterName]) {
+                return Promise.reject(sParameterName + " is not a known technical parameter");
+            }
 
-        return oTechnicalParameters[sParameterName].getValue(
-            sParameterName,
-            oApplicationComponent,
-            oApplicationContainer,
-            sApplicationType);
+            return oTechnicalParameters[sParameterName].getValue(
+                sParameterName,
+                oApplicationComponent,
+                oApplicationContainer,
+                sApplicationType);
     }
-
     /**
      * Takes the filter options and returns the matching technical parameter description.
      *
@@ -340,7 +369,8 @@ sap.ui.define([
         getParameterValueSync: getParameterValueSync,
         getParameters: getParameters,
         getParameterNames: getParameterNames,
-        isTechnicalParameter: isTechnicalParameter
+        isTechnicalParameter: isTechnicalParameter,
+        getTechnicalParametersAppInfo: getAppInfoTechnicalParameters
     };
 
 }, false /* bExport= */);

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.111.1
+ * @version 1.112.0
  * @private
  */
 sap.ui.define([

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Ui5 Native Service Factory
  *
- * @version 1.111.1
+ * @version 1.112.0
  */
 
 /**

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.111.1
+ * @version 1.112.0
  */
 
 /**

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.111.1
+ * @version 1.112.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.111.1
+ * @version 1.112.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.111.1
+ * @version 1.112.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.111.1
+ * @version 1.112.0
  * @private
  */
 sap.ui.define([

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

@@ -34,7 +34,7 @@
  *     }
  *   }
  *   </pre>
- * @version 1.111.1
+ * @version 1.112.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.111.1
+ * @version 1.112.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.111.1
+ * @version 1.112.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.111.1
+ * @version 1.112.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.111.1
+ * @version 1.112.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.111.1
+ * @version 1.112.0
  */
 /**
  * @namespace Default namespace for Unified Shell adapters for the Common Data Model (CDM) platform.