@sapui5/sap.ushell 1.124.1 → 1.125.0

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

@@ -8,7 +8,6 @@ sap.ui.define([
     "sap/base/Log",
     "sap/base/util/ObjectPath",
     "sap/base/util/uid",
-    "sap/base/util/UriParameters",
     "sap/ui/Device",
     "sap/ui/core/Element",
     "sap/ui/core/EventBus",
@@ -18,14 +17,12 @@ sap.ui.define([
     "sap/ushell/utils/UrlParsing",
     "sap/ushell/utils/objectOperations",
     "sap/ushell/utils/type",
-    "sap/ui/core/Configuration",
     "sap/ushell/renderer/History"
     //"sap/ushell/resources" --> cannot be declared here currently: utils is used very early - before core boot, but resources uses UI5 core.
 ], function (
     Log,
     ObjectPath,
-    UI5Uid,
-    UriParameters,
+    uid,
     Device,
     Element,
     EventBus,
@@ -35,7 +32,6 @@ sap.ui.define([
     urlParsing,
     ushellObjectOperations,
     ushellType,
-    Configuration,
     History
 ) {
     "use strict";
@@ -111,9 +107,10 @@ sap.ui.define([
      * @private
      */
     utils.getLocalSystemInSidFormat = function () {
-        var oSystem = sap.ushell.Container.getLogonSystem(),
-            sSystemName = oSystem.getName(),
-            sSystemClient = oSystem.getClient();
+        const oContainer = sap.ui.require("sap/ushell/Container");
+        var oSystem = oContainer.getLogonSystem();
+        var sSystemName = oSystem.getName();
+        var sSystemClient = oSystem.getClient();
 
         return "sid(" + sSystemName + "." + sSystemClient + ")";
     };
@@ -306,7 +303,7 @@ sap.ui.define([
      * @private
      */
     utils._getUid = function () {
-        return UI5Uid();
+        return uid();
     };
 
     /**
@@ -476,6 +473,7 @@ sap.ui.define([
      * Determines whether the given application type is to be embedded in an iframe (like GUI or NWBC-wrapped WDA applications).
      *
      * @param {string} sApplicationType The type of the application.
+     * @param {boolean} bWDA Whether the application is a WDA application.
      * @returns {boolean} Whether the ApplicationType is to be rendered embedded into an iframe
      *   and should be able to communicate via postMessage like GUI or WDA applications.
      * @private
@@ -645,7 +643,7 @@ sap.ui.define([
      * @param {string} sVersion - version as string
      * @returns {string} version - major version is returned
      */
-    function _extractUi5Version(sVersion) {
+    function _extractUi5Version (sVersion) {
         // reggex explained in jsdoc
         var oMatch = /\d+(\.\d+){0,2}/.exec(sVersion);
         if (oMatch && oMatch[0]) {
@@ -792,7 +790,7 @@ sap.ui.define([
      * @returns {boolean} true, false, or undefined.
      */
     utils.getParameterValueBoolean = function (sParameterName, sParams) {
-        var oUriParameters = UriParameters.fromQuery(sParams || window.location.search),
+        var oUriParameters = new URLSearchParams(sParams || window.location.search),
             aArr = oUriParameters.getAll(sParameterName),
             aTruthy = ["true", "x"],
             aFalsy = ["false", ""],
@@ -1243,40 +1241,44 @@ sap.ui.define([
      * when an error occurs during the navigation.
      */
     utils.toExternalWithParameters = function (semanticObject, action, parameters) {
-        return Promise.all([
-            sap.ushell.Container.getServiceAsync("URLParsing"),
-            sap.ushell.Container.getServiceAsync("Navigation")
-        ]).then(function (aResults) {
-            var oURLParsingService = aResults[0];
-            var oNavigationService = aResults[1];
-            var oNavigationArguments = {};
-
-            // if "&/" is contained in the action, we need to split it into the action and the appSpecificRoute property,
-            // so that it can be appended after the very end of the url after the application parameters.
-            var aActionParts = action.split("&/");
-            if (aActionParts.length > 1) {
-                oNavigationArguments.appSpecificRoute = "&/" + aActionParts[1];
-            }
+        return new Promise(function (resolve) {
+            sap.ui.require(["sap/ushell/Container"], function (Container) {
+                return Promise.all([
+                    Container.getServiceAsync("URLParsing"),
+                    Container.getServiceAsync("Navigation")
+                ]).then(function (aResults) {
+                    var oURLParsingService = aResults[0];
+                    var oNavigationService = aResults[1];
+                    var oNavigationArguments = {};
+
+                    // if "&/" is contained in the action, we need to split it into the action and the appSpecificRoute property,
+                    // so that it can be appended after the very end of the url after the application parameters.
+                    var aActionParts = action.split("&/");
+                    if (aActionParts.length > 1) {
+                        oNavigationArguments.appSpecificRoute = "&/" + aActionParts[1];
+                    }
 
-            oNavigationArguments.target = {
-                semanticObject: semanticObject,
-                action: aActionParts[0]
-            };
+                    oNavigationArguments.target = {
+                        semanticObject: semanticObject,
+                        action: aActionParts[0]
+                    };
+
+                    // building the parameters object to the navigation action
+                    // preparing the navigation parameters according to the notification's data
+                    if (parameters && parameters.length > 0) {
+                        oNavigationArguments.params = {};
+                        parameters.forEach(function (oParameter) {
+                            oNavigationArguments.params[oParameter.Key] = oParameter.Value;
+                        });
+                    }
 
-            // building the parameters object to the navigation action
-            // preparing the navigation parameters according to the notification's data
-            if (parameters && parameters.length > 0) {
-                oNavigationArguments.params = {};
-                parameters.forEach(function (oParameter) {
-                    oNavigationArguments.params[oParameter.Key] = oParameter.Value;
+                    // navigate
+                    resolve(oNavigationService.navigate({
+                        target: {
+                            shellHash: oURLParsingService.constructShellHash(oNavigationArguments)
+                        }
+                    }));
                 });
-            }
-
-            // navigate
-            return oNavigationService.navigate({
-                target: {
-                    shellHash: oURLParsingService.constructShellHash(oNavigationArguments)
-                }
             });
         });
     };
@@ -1529,20 +1531,23 @@ sap.ui.define([
      * @since 1.102.0
      */
     utils._getUserSettingPersContainer = function () {
-        return sap.ushell.Container.getServiceAsync("PersonalizationV2").then(function (oPersonalizationService) {
-            var oPersId = {
-                container: "sap.ushell.usersettings.personalization",
-                item: "data"
-            };
-
-            var oScope = {
-                validity: "Infinity",
-                keyCategory: oPersonalizationService.KeyCategory.GENERATED_KEY,
-                writeFrequency: oPersonalizationService.WriteFrequency.HIGH,
-                clientStorageAllowed: false
-            };
-
-            return oPersonalizationService.getPersonalizer(oPersId, oScope);
+        return new Promise(function (resolve) {
+            sap.ui.require(["sap/ushell/Container"], function (Container) {
+                return Container.getServiceAsync("PersonalizationV2").then(function (oPersonalizationService) {
+                    var oPersId = {
+                        container: "sap.ushell.usersettings.personalization",
+                        item: "data"
+                    };
+
+                    var oScope = {
+                        validity: "Infinity",
+                        keyCategory: oPersonalizationService.KeyCategory.GENERATED_KEY,
+                        writeFrequency: oPersonalizationService.WriteFrequency.HIGH,
+                        clientStorageAllowed: false
+                    };
+                    resolve(oPersonalizationService.getPersonalizer(oPersId, oScope));
+                });
+            });
         });
     };
 
@@ -1694,7 +1699,7 @@ sap.ui.define([
      * @since 1.119.0
      */
     utils.getThemingParameters = async function (aNames) {
-        const vParameterMap = await new Promise((resolve, reject) => {
+        const vResolvedParameterMap = await new Promise((resolve, reject) => {
             sap.ui.require(["sap/ui/core/theming/Parameters"], (ThemingParameters) => {
                 const vParameterMap = ThemingParameters.get({
                     name: aNames,
@@ -1705,14 +1710,14 @@ sap.ui.define([
                 }
             });
         });
+
         return aNames.map((sName) => {
             // If you request only one parameter as array and the parameter is already loaded,
             // the return value is not a map, it is the value.
-            if (typeof vParameterMap === "string") {
-                return vParameterMap;
+            if (typeof vResolvedParameterMap === "string") {
+                return vResolvedParameterMap;
             }
-            return vParameterMap[sName];
-
+            return vResolvedParameterMap[sName];
         });
     };
 
@@ -1729,14 +1734,14 @@ sap.ui.define([
      * @returns {boolean} whether the application is in a cold start state
      */
     utils.isColdStart = function () {
-        var oRenderer = sap.ushell.Container.getRendererInternal("fiori2");
+        var oContainer = sap.ui.require("sap/ushell/Container");
+        var oRenderer = oContainer.getRendererInternal("fiori2");
         var bNoCoreViewNavigated = !oRenderer || !oRenderer.getCurrentCoreView();
         if (History.getHistoryLength() <= 1 && bNoCoreViewNavigated) {
             return true;
         }
         return false;
-
     };
 
     return utils;
-}, /* bExport= */ false);
+});

package/src/test/js/sap/ushell/bootstrap/sandbox.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  *
- * @version 1.124.1
+ * @version 1.125.0
  */
 
 (function () {
@@ -28,17 +28,15 @@
         return new Promise(function (resolve) {
 
             sap.ui.require([
-                "sap/base/util/UriParameters",
                 "sap/base/Log",
                 "sap/base/util/ObjectPath",
                 "sap/ushell/bootstrap/common/common.util",
                 "sap/ushell/Container"
             ], function (
-                UriParameters,
                 Log,
                 ObjectPath,
-                commonUtils
-                /* Container - necessary for sap.ushell.bootstrap */
+                commonUtils,
+                Container
             ) {
                 /*
                  * Function copied from boottask.js
@@ -274,8 +272,8 @@
                  *
                  */
                 function bootstrap (fnBootstrapCallback) {
-                    const aConfigFiles = UriParameters.fromURL(window.location.href).get("sap-ushell-sandbox-config", true);
-                    const sCustomRenderer = UriParameters.fromURL(window.location.href).get("sap-ushell-sandbox-renderer");
+                    const aConfigFiles = new URLSearchParams(window.location.search).getAll("sap-ushell-sandbox-config");
+                    const sCustomRenderer = new URLSearchParams(window.location.search).get("sap-ushell-sandbox-renderer");
 
                     sap.ui.loader.config({
                         paths: {
@@ -339,7 +337,7 @@
                         });
                     }
 
-                    sap.ushell.bootstrap("local").done(fnBootstrapCallback);
+                    Container.init("local").then(fnBootstrapCallback);
                 }
 
                 // Attach private functions which should be testable to the public namespace

package/src/main/js/sap/ushell/ui/ContentNodeSelector.control.xml

@@ -1,26 +0,0 @@
-<core:FragmentDefinition xmlns:core="sap.ui.core" xmlns="sap.m">
-    <MultiInput
-        id="multiInput"
-        ariaLabelledBy="ContentNodeLabel"
-        valueHelpRequest="._showValueHelp"
-        suggestionRows="{path: '_internal>/suggestions', templateShareable: false}"
-        tokenUpdate="._onTokenUpdate"
-        required="true">
-        <suggestionColumns>
-            <Column>
-                <Label text="{= ${_internal>/isSpaces} ? ${_i18n>contentNodeSelectorPage} : ${_i18n>contentNodeSelectorHomepageGroup}}"/>
-            </Column>
-            <Column visible="{_internal>/isSpaces}">
-                <Label text="{_i18n>contentNodeSelectorSpace}"/>
-            </Column>
-        </suggestionColumns>
-        <suggestionRows>
-            <ColumnListItem>
-                <cells>
-                    <Label text="{_internal>label}"/>
-                    <Label text="{= ${_internal>spaceTitles}.join(', ')}" visible="{_internal>/isSpaces}"/>
-                </cells>
-            </ColumnListItem>
-        </suggestionRows>
-    </MultiInput>
-</core:FragmentDefinition>