@sapui5/sap.ushell 1.136.3 → 1.138.1

package/src/main/js/sap/ushell/bootstrap/common/common.read.ushell.config.from.url.js

@@ -9,7 +9,7 @@
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/ObjectPath"
-], function (Log, ObjectPath) {
+], (Log, ObjectPath) => {
     "use strict";
 
     /*
@@ -17,7 +17,7 @@ sap.ui.define([
      *     - "a/b/c": [] --> a/b/c cannot be overwritten at all
      *     - "a/b/c": [ 1, 2 ] --> a/b/c cannot be overwritten with the values 1 or 2 but with any other value like 3
      */
-    var oBlockList = {
+    const oBlockList = {
         "renderers/fiori2/componentData/config/enablePersonalization": [true], // switch off only
 
         // Session handling
@@ -44,14 +44,14 @@ sap.ui.define([
     };
 
     function isBlockListed (oConsideredBlockList, oEntry) {
-        var sFullPropertyPath = "";
+        let sFullPropertyPath = "";
 
         if (oEntry.namespace) {
-            sFullPropertyPath = oEntry.namespace + "/";
+            sFullPropertyPath = `${oEntry.namespace}/`;
         }
         sFullPropertyPath += oEntry.propertyName;
 
-        var aBlockListEntry = oConsideredBlockList[sFullPropertyPath];
+        const aBlockListEntry = oConsideredBlockList[sFullPropertyPath];
         if (!aBlockListEntry) {
             return false;
         }
@@ -61,7 +61,7 @@ sap.ui.define([
                 return true;
             }
             // check if the value is on the value block list
-            for (var i = 0; i < aBlockListEntry.length; i++) {
+            for (let i = 0; i < aBlockListEntry.length; i++) {
                 if (aBlockListEntry[i] === oEntry.value) {
                     return true;
                 }
@@ -70,12 +70,10 @@ sap.ui.define([
             return false;
         }
 
-        throw new Error('Block list entry "' + sFullPropertyPath + '" has an unknown type');
+        throw new Error(`Block list entry "${sFullPropertyPath}" has an unknown type`);
     }
 
     function parseValue (sValue) {
-        var nTempNumber;
-
         // booleans
         if (sValue === "false") {
             return false;
@@ -85,7 +83,7 @@ sap.ui.define([
         }
 
         // numbers
-        nTempNumber = Number.parseFloat(sValue);
+        const nTempNumber = Number.parseFloat(sValue);
         if (!Number.isNaN(nTempNumber)) {
             return nTempNumber;
         }
@@ -103,46 +101,45 @@ sap.ui.define([
      *   ushell/companyLogo/url:data\:image/png;base64\,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==
      */
     function getConfigFromWindowLocation (oWindowLocation) {
-        var aParsedQueryParamValue;
-        var oFinalConfig = {};
+        const oFinalConfig = {};
         // to conform with the specification of the query string ("application/x-www-form-urlencoded")
         // see: https://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.1
-        var sQueryString = oWindowLocation.search.replaceAll("+", " ");
+        const sQueryString = oWindowLocation.search.replaceAll("+", " ");
 
         // find the parameter value
-        aParsedQueryParamValue = /[?&]sap-ushell-xx-overwrite-config=([^&]*)(&|$)/.exec(sQueryString);
+        const aParsedQueryParamValue = /[?&]sap-ushell-xx-overwrite-config=([^&]*)(&|$)/.exec(sQueryString);
         if (aParsedQueryParamValue === null) {
             return {};
         }
 
         // commas (",") can be used to overwrite multiple "parameter:value" pairs at the same time
         // the negative lookbehind is to allow commas to be escaped with a backslash ("\")
-        var aOverwrittenEntryCandidates = decodeURIComponent(aParsedQueryParamValue[1])
+        const aOverwrittenEntryCandidates = decodeURIComponent(aParsedQueryParamValue[1])
             .split(/(?<!\\),/)
             .map((sOverwrittenEntryCandidate) => sOverwrittenEntryCandidate.replaceAll("\\,", ","));
 
-        var aOverwrittenEntries = aOverwrittenEntryCandidates.reduce(function (aEntries, sCandidate) {
+        const aOverwrittenEntries = aOverwrittenEntryCandidates.reduce((aEntries, sCandidate) => {
             // a colon (":") is used to separate each parameter from its value within each "parameter:value" pair
             // the negative lookbehind is to allow colons to be escaped with a backslash ("\")
-            var aParts = sCandidate
+            const aParts = sCandidate
                 .split(/(?<!\\):/)
                 .map((sPart) => sPart.replaceAll("\\:", ":"));
 
             // namespaces may contain a leading "/" (e.g. for "sap-ui-debug")
-            var aNamespaceParts = /^\/?(.*)\/([^/]*)$/.exec(aParts[0]);
+            const aNamespaceParts = /^\/?(.*)\/([^/]*)$/.exec(aParts[0]);
             if (aNamespaceParts === null) {
-                Log.warning('Ignoring invalid parameter for "sap-ushell-xx-overwrite-config": "' + aParts[0] + '"');
+                Log.warning(`Ignoring invalid parameter for "sap-ushell-xx-overwrite-config": "${aParts[0]}"`);
                 return aEntries;
             }
 
-            var oEntry = {
+            const oEntry = {
                 namespace: aNamespaceParts[1],
                 propertyName: aNamespaceParts[2],
                 value: parseValue(aParts[1])
             };
 
             if (isBlockListed(oBlockList, oEntry)) {
-                Log.warning('Ignoring restricted parameter for "sap-ushell-xx-overwrite-config": "' + aParts[0] + '"');
+                Log.warning(`Ignoring restricted parameter for "sap-ushell-xx-overwrite-config": "${aParts[0]}"`);
                 return aEntries;
             }
 
@@ -151,10 +148,10 @@ sap.ui.define([
         }, []);
 
         // convert entries to config
-        aOverwrittenEntries.forEach(function (oOverwrite) {
-            var vValue = oOverwrite.value;
-            var sNamespace = oOverwrite.namespace.replace(/\//g, ".");
-            var oNamespace = ObjectPath.get(sNamespace, oFinalConfig);
+        aOverwrittenEntries.forEach((oOverwrite) => {
+            const vValue = oOverwrite.value;
+            const sNamespace = oOverwrite.namespace.replace(/\//g, ".");
+            let oNamespace = ObjectPath.get(sNamespace, oFinalConfig);
 
             if (oNamespace === undefined) {
                 // create namespace as not existing yet

package/src/main/js/sap/ushell/bootstrap/common/common.util.js

@@ -6,10 +6,10 @@
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/ObjectPath"
-], function (
+], (
     Log,
     ObjectPath
-) {
+) => {
     "use strict";
 
     const OBJECT_PROTOTYPE_KEYS = Object.getOwnPropertyNames(Object.prototype);
@@ -24,10 +24,10 @@ sap.ui.define([
      */
     function deepFreeze (o) {
         Object.keys(o)
-            .filter(function (sProperty) {
+            .filter((sProperty) => {
                 return typeof o[sProperty] === "object";
             })
-            .forEach(function (sProperty) {
+            .forEach((sProperty) => {
                 o[sProperty] = deepFreeze(o[sProperty]);
             });
 
@@ -45,7 +45,7 @@ sap.ui.define([
      */
     function getLocationOrigin () {
         // location.origin might not be supported by all browsers
-        return location.protocol + "//" + location.host;
+        return `${location.protocol}//${location.host}`;
     }
 
     /**
@@ -59,7 +59,7 @@ sap.ui.define([
      */
     function ensureTrailingSlash (sPath) {
         if ((typeof sPath === "string") && sPath.charAt(sPath.length - 1) !== "/") {
-            return sPath + "/";
+            return `${sPath}/`;
         }
         return sPath;
     }
@@ -84,15 +84,13 @@ sap.ui.define([
      * @private
      */
     function mergeConfig (oMutatedBaseConfig, oConfigToMerge, bCloneConfigToMerge) {
-        var oActualConfigToMerge;
-
         if (!oConfigToMerge) {
             return;
         }
 
-        oActualConfigToMerge = bCloneConfigToMerge ? JSON.parse(JSON.stringify(oConfigToMerge)) : oConfigToMerge;
+        const oActualConfigToMerge = bCloneConfigToMerge ? JSON.parse(JSON.stringify(oConfigToMerge)) : oConfigToMerge;
 
-        Object.keys(oActualConfigToMerge).forEach(function (sKey) {
+        Object.keys(oActualConfigToMerge).forEach((sKey) => {
             // Prevent overriding of object prototype properties to avoid prototype pollution attacks
             if (OBJECT_PROTOTYPE_KEYS.includes(sKey)) {
                 return;
@@ -115,8 +113,8 @@ sap.ui.define([
      * @private
      */
     function isSapStatisticsSet (sQueryToTest) {
-        var sWindowLocationSearch = sQueryToTest || window.location.search,
-            bSapStatistics = /sap-statistics=(true|x|X)/.test(sWindowLocationSearch);
+        const sWindowLocationSearch = sQueryToTest || window.location.search;
+        let bSapStatistics = /sap-statistics=(true|x|X)/.test(sWindowLocationSearch);
         if (!bSapStatistics) {
             try {
                 // UI5's config cannot be used here, so check local storage

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

@@ -65,7 +65,8 @@ sap.ui.define([
          * 3. Applications from oConfig.services.ClientSideTargetResolution.adapter.config.inbounds
          * 4. Groups and tiles from oConfig.services.LaunchPage.adapter.config.groups (a new section is created for each group)
          *
-         * @param {object} oConfig The current ushell configuration
+         * @param {object} oConfig the current ushell configuration.
+         * @returns {object} the extended ushell configuration.
         */
         _addAppsToSite: function (oConfig) {
             const oApplicationConfig = {};
@@ -209,7 +210,7 @@ sap.ui.define([
                         "sap.flp": {
                             "target": {
                                 "type": "URL",
-                                "url": "#" + sKey
+                                "url": `#${sKey}`
                             }
                         }
                     }
@@ -224,7 +225,7 @@ sap.ui.define([
             // generate applications and tiles from oConfig.applications and add them to the site
             const oApplications = ObjectPath.get("applications", oConfig) || {};
             for (const [sAppKey, oApplication] of Object.entries(oApplications)) {
-                const sVizId = "custom_viz_" + sAppKey;
+                const sVizId = `custom_viz_${sAppKey}`;
                 const oSection = oSiteData.pages.page1.payload.sections.APPS; // predefined section for custom apps
                 oSiteData.applications[sAppKey] = createApp(oApplication, sAppKey);
                 oSiteData.visualizations[sAppKey] = createViz(oApplication, sAppKey);
@@ -248,14 +249,14 @@ sap.ui.define([
             const oClientTargetApps = JSON.parse(JSON.stringify(ObjectPath.get("services.ClientSideTargetResolution.adapter.config.inbounds", oConfig) || {}));
             ObjectPath.set("services.ClientSideTargetResolution.adapter.config.inbounds", oClientTargetApps, oApplicationConfig);
             for (const oInbound of Object.values(oClientTargetApps)) {
-                oSiteData.applications[oInbound.semanticObject + "-" + oInbound.action] = createAppFromInbound(oInbound);
+                oSiteData.applications[`${oInbound.semanticObject}-${oInbound.action}`] = createAppFromInbound(oInbound);
             }
 
             // generate sections and tiles from the LaunchPage adapter config and add them to the site
             const aGroups = JSON.parse(JSON.stringify(ObjectPath.get("services.LaunchPage.adapter.config.groups", oConfig) || []));
             ObjectPath.set("services.LaunchPage.adapter.config.groups", aGroups, oApplicationConfig);
             aGroups.forEach((oGroup, index) => {
-                const sGroupId = oGroup.id || "GROUP_" + index;
+                const sGroupId = oGroup.id || `GROUP_${index}`;
                 const oPage = oSiteData.pages.page1; // predefined page
                 oPage.payload.layout.sectionOrder.splice(index + 1, 0, sGroupId); // insert groups between my home and sample apps
                 oPage.payload.sections[sGroupId] = {
@@ -266,7 +267,7 @@ sap.ui.define([
                 };
                 const oSection = oPage.payload.sections[sGroupId];
                 (oGroup.tiles || []).forEach((oTile, tileIndex) => {
-                    const sTileId = oTile.id || sGroupId + "_tile_" + tileIndex;
+                    const sTileId = oTile.id || `${sGroupId}_tile_${tileIndex}`;
                     oSection.layout.vizOrder.push(sTileId);
 
                     /* eslint-disable quote-props */
@@ -349,7 +350,7 @@ sap.ui.define([
          * @param {object} oUshellConfig The current ushell configuration
          */
         _applyJsonApplicationConfig: async function (sUrlPrefix, oUshellConfig) {
-            const sUrl = /\.json/i.test(sUrlPrefix) ? sUrlPrefix : sUrlPrefix + ".json";
+            const sUrl = /\.json/i.test(sUrlPrefix) ? sUrlPrefix : `${sUrlPrefix}.json`;
             const oAppConfig = await this._loadJSON(sUrl);
             if (oAppConfig) {
                 const oDefaultApplicationMigration = commonUtils.getV2ServiceMigrationConfig(oAppConfig);
@@ -367,7 +368,7 @@ sap.ui.define([
          */
         _getBootstrapScriptPath: function () {
             const oBootstrapScript = window.document.getElementById("sap-ushell-bootstrap");
-            const sBootstrapScriptPath = oBootstrapScript.src.split("?")[0].split("/").slice(0, -1).join("/") + "/";
+            const sBootstrapScriptPath = `${oBootstrapScript.src.split("?")[0].split("/").slice(0, -1).join("/")}/`;
             return sBootstrapScriptPath;
         },
 
@@ -378,8 +379,8 @@ sap.ui.define([
         bootstrap: async function () {
             const aConfigFiles = new URLSearchParams(window.location.search).getAll("sap-ushell-sandbox-config");
             const sBootstrapPath = this._getBootstrapScriptPath(); // default config files are located in the sandbox2 subfolder
-            const sDefaultConfigUrl = sBootstrapPath + "./sandbox2/sandboxConfig.json";
-            const sDefaultSiteUrl = sBootstrapPath + "./sandbox2/sandboxSite.json";
+            const sDefaultConfigUrl = `${sBootstrapPath}./sandbox2/sandboxConfig.json`;
+            const sDefaultSiteUrl = `${sBootstrapPath}./sandbox2/sandboxSite.json`;
 
             // if one or more configuration files are specified explicitly via URL parameter, read them;
             // otherwise, /appconfig/fioriSandboxConfig.json is the convention for WebIDE developers

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

@@ -8,7 +8,7 @@ sap.ui.define([
     "use strict";
 
     return {
-        //async run to ensure to be ready for the next phase
+        // async run to ensure to be ready for the next phase
         async run () {
             return sandbox.bootstrap();
         }

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

@@ -71,30 +71,14 @@
                             ],
                             "ranges": {
                                 "theme": {
-                                    "sap_belize": {
-                                        "displayName": "SAP Belize",
-                                        "themeRoot": ""
-                                    },
-                                    "sap_fiori_3": {
-                                        "displayName": "SAP Quartz",
-                                        "themeRoot": ""
-                                    },
-                                    "sap_horizon": {
-                                        "displayName": "SAP Morning Horizon",
-                                        "themeRoot": ""
-                                    },
-                                    "sap_horizon_dark": {
-                                        "displayName": "SAP Evening Horizon",
-                                        "themeRoot": ""
-                                    },
-                                    "sap_horizon_hcb": {
-                                        "displayName": "SAP HCB (SAP Horizon)",
-                                        "themeRoot": ""
-                                    },
-                                    "sap_horizon_hcw": {
-                                        "displayName": "SAP HCW (SAP Horizon)",
-                                        "themeRoot": ""
-                                    }
+                                    "sap_horizon": { "displayName": "SAP Morning Horizon", "themeRoot": "" },
+                                    "sap_horizon_dark": { "displayName": "SAP Evening Horizon", "themeRoot": "" },
+                                    "sap_horizon_hcb": { "displayName": "SAP High Contrast Black (SAP Horizon)", "themeRoot": "" },
+                                    "sap_horizon_hcw": { "displayName": "SAP High Contrast White (SAP Horizon)", "themeRoot": "" },
+                                    "sap_fiori_3": { "displayName": "SAP Quartz Light", "themeRoot": "" },
+                                    "sap_fiori_3_dark": { "displayName": "SAP Quartz Dark", "themeRoot": "" },
+                                    "sap_fiori_3_hcb": { "displayName": "SAP Quartz High Contrast Black", "themeRoot": "" },
+                                    "sap_fiori_3_hcw": { "displayName": "SAP Quartz High Contrast White", "themeRoot": "" }
                                 }
                             }
                         },

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.136.3
+ * @version 1.138.1
  */
 
 (function () {
@@ -18,25 +18,26 @@
      * @deprecated since 1.120
      */
     if (true) {
-        window["sap-ui-config"] = {
-            "xx-bootTask": function (fnCallback) {
-                init().then(() => {
-                    fnCallback();
-                });
-            }
-        };
-
         function init () {
-            return new Promise(function (resolve) {
+            return new Promise((resolve) => {
                 sap.ui.require([
                     "sap/ushell/bootstrap/sandbox2/sandbox"
-                ], function (
+                ], (
                     sandbox
-                ) {
+                ) => {
                     sandbox.bootstrap().then(resolve);
                 });
             });
         }
+
+        window["sap-ui-config"] = {
+            "xx-bootTask": function (fnCallback) {
+                init().then(() => {
+                    fnCallback();
+                });
+            }
+        };
+
         return;
     }
 
@@ -47,5 +48,4 @@
         window["sap-ui-config"] = {};
     }
     globalThis["sap-ui-config"].bootManifest = "sap/ushell/bootstrap/sandbox2/sandboxBoot.json";
-
 }());

package/src/main/js/sap/ushell/bootstrap/ui5loader-config.js

@@ -6,21 +6,21 @@
 (function () {
     "use strict";
 
-    var ui5loader = window.sap && window.sap.ui && window.sap.ui.loader;
+    const ui5loader = window.sap && window.sap.ui && window.sap.ui.loader;
 
     if (!ui5loader) {
         throw new Error("FLP bootstrap: ui5loader is needed, but could not be found");
     }
 
-    var oConfig = {
+    const oConfig = {
         // async: false | true could be set here to control the loading behavior.
         // By not setting the loading mode here we let the decision to UI5.
         // This also enables that one can via the URL parameter sap-ui-async=[true|false] switch async loading on/off for testing purposes.
-    },
-        oScript = document.getElementById("sap-ui-bootstrap"),
-        oScriptUrl = oScript && oScript.getAttribute("src"),
-        rUrlWithTokenPattern = /^((?:.*\/)?resources\/~\d{14}~\/)/,
-        sBaseUrl;
+    };
+    const oScript = document.getElementById("sap-ui-bootstrap");
+    const oScriptUrl = oScript && oScript.getAttribute("src");
+    const rUrlWithTokenPattern = /^((?:.*\/)?resources\/~\d{14}~\/)/;
+    let sBaseUrl;
 
     if (oScriptUrl && rUrlWithTokenPattern.test(oScriptUrl)) {
         // Because ui5loader calculate the default resource url without token we neeed to set the root path explicitly with token

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

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

package/src/main/js/sap/ushell/components/cards/Card.controller.js

@@ -9,7 +9,7 @@ sap.ui.define([
     "sap/ui/core/mvc/XMLView",
     "sap/ushell/Container"
 ], function (
-    utils,
+    tileUtils,
     manifestPropertyHelper,
     resources,
     Controller,
@@ -97,7 +97,7 @@ sap.ui.define([
                 }.bind(this));
 
                 view.getContent()[0].setTooltip(
-                    utils.getResourceBundleModel().getResourceBundle().getText("edit_configuration.tooltip")
+                    tileUtils.getResourceBundle().getText("edit_configuration.tooltip")
                 );
             }
         },

package/src/main/js/sap/ushell/components/cepsearchresult/app/Component.js

@@ -1,36 +1,63 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 sap.ui.define([
-  "sap/ui/core/UIComponent",
-  "sap/ushell/components/cepsearchresult/app/util/appendStyleVars",
-  "./util/Edition"
-], function (UIComponent, appendStyleVars) {
-  "use strict";
+    "sap/ui/core/UIComponent",
+    "sap/ui/core/mvc/View",
+    "sap/ui/core/mvc/ViewType",
+    "sap/ushell/components/cepsearchresult/app/util/appendStyleVars",
+    "sap/ushell/components/cepsearchresult/app/util/Edition",
+    "sap/ushell/components/cepsearchresult/app/util/resources"
+], (
+    UIComponent,
+    View,
+    ViewType,
+    appendStyleVars,
+    Edition,
+    utilResources
+) => {
+    "use strict";
 
-  appendStyleVars([
-    "_sap_m_IconTabBar_ShellHeaderShadow",
-    "sapUiElementLineHeight",
-    "_sap_m_IconTabBar_HeaderBorderBottom",
-    "_sap_m_IconTabBar_HeaderBackground"
-  ]);
+    appendStyleVars([
+        "_sap_m_IconTabBar_ShellHeaderShadow",
+        "sapUiElementLineHeight",
+        "_sap_m_IconTabBar_HeaderBorderBottom",
+        "_sap_m_IconTabBar_HeaderBackground"
+    ]);
 
-  /**
-   * Component of the Search Result Application.
-   *
-   * @param {string} sId Component id
-   * @param {object} oParams Component parameter
-   *
-   * @class
-   * @extends sap.ui.core.UIComponent
-   *
-   * @private
-   *
-   * @since 1.110.0
-   * @alias sap.ushell.components.cepsearchresult.app.Component
-   */
-  return UIComponent.extend("sap.ushell.components.cepsearchresult.app.Component", /** @lends sap.ushell.components.cepsearchresult.app.Component.prototype */{
-    metadata: {
-      manifest: "json"
-    }
-  });
+    /**
+     * Component of the Search Result Application.
+     *
+     * @param {string} sId Component id
+     * @param {object} oParams Component parameter
+     *
+     * @class
+     * @extends sap.ui.core.UIComponent
+     *
+     * @private
+     *
+     * @since 1.110.0
+     * @alias sap.ushell.components.cepsearchresult.app.Component
+     */
+    return UIComponent.extend("sap.ushell.components.cepsearchresult.app.Component", /** @lends sap.ushell.components.cepsearchresult.app.Component.prototype */{
+        metadata: {
+            manifest: "json",
+            interfaces: ["sap.ui.core.IAsyncContentCreation"]
+        },
+
+        createContent: async function () {
+            this._oResourceBundle = await this.getModel("appI18n").getResourceBundle();
+            await utilResources.awaitResourceBundle();
+
+            return this.runAsOwner(() => {
+                return View.create({
+                    type: ViewType.XML,
+                    viewName: "sap.ushell.components.cepsearchresult.app.Main"
+                });
+            });
+        },
+
+        getResourceBundle: function () {
+            return this._oResourceBundle;
+        }
+    });
 });