@sapui5/sap.ushell 1.130.1 → 1.131.1

package/src/main/js/sap/ushell/components/cepsearchresult/app/cards/searchresultwidget/i18n/i18n_da.properties

@@ -12,11 +12,11 @@ CARD.List.RowStatus={0}-{1} af {2}
 
 CARD.Config.Yes=Ja
 CARD.Config.No=Nej
-CARD.Config.HeaderSettings=Indstillinger for toplinie
-CARD.Config.HeaderType.Lbl=Toplinietype
-CARD.Config.HeaderType.Default=Standardtoplinie
-CARD.Config.HeaderType.Custom=Brugerdefineret toplinie
-CARD.Config.HeaderType.None=Ingen toplinie
+CARD.Config.HeaderSettings=Indstillinger for toplinje
+CARD.Config.HeaderType.Lbl=Toplinjetype
+CARD.Config.HeaderType.Default=Standardtoplinje
+CARD.Config.HeaderType.Custom=Brugerdefineret toplinje
+CARD.Config.HeaderType.None=Ingen toplinje
 CARD.Config.Header.Title.Lbl=Titel
 CARD.Config.Header.Title.Desc=Bruger ($count) eller ($searchText) i teksten til at inkludere de tilh\u00F8rende v\u00E6rdier.
 CARD.Config.Header.SubTitle.Lbl=Beskrivelse
@@ -25,7 +25,7 @@ CARD.Config.Header.Icon.Lbl=Ikon
 CARD.Config.Header.IconColor.Lbl=Ikonfarve
 CARD.Config.Header.IconShape.Lbl=Ikonform
 CARD.Config.Header.Nav.Lbl=Naviger til s\u00F8geapplikation
-CARD.Config.Header.Nav.Desc=Ved klik p\u00E5 toplinie navigeres til s\u00F8geapplikation
+CARD.Config.Header.Nav.Desc=Ved klik p\u00E5 toplinje navigeres til s\u00F8geapplikation
 CARD.Config.ContentSettings=Indholdsindstillinger
 CARD.Config.Content.SearchTerm.Lbl=S\u00F8getekst
 CARD.Config.Content.Category.Lbl=Kategori
@@ -33,7 +33,7 @@ CARD.Config.Content.View.Lbl=Kategori
 CARD.Config.Content.PageSize.Lbl=Poster pr. side
 CARD.Config.Content.Highlight.Lbl=Fremh\u00E6v resultater
 CARD.Config.Content.Highlight.Desc=Fremh\u00E6v den s\u00F8gte tekst inden for resultaterne.
-CARD.Config.Content.FooterActions.Lbl=Aktioner for bundlinie
+CARD.Config.Content.FooterActions.Lbl=Aktioner for bundlinje
 CARD.Config.Content.FooterActions.Page=S\u00F8geresultater for sidebladefunktion
 CARD.Config.Content.FooterActions.Navigate=Naviger til s\u00F8geappl. for at se alle resultater
 CARD.Config.Content.FooterActions.None=Ingen aktioner

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.130.1
+ * @version 1.131.1
  */
 sap.ui.define([
     "sap/base/Log",
@@ -32,7 +32,9 @@ sap.ui.define([
     "sap/ushell/utils",
     "sap/ui/thirdparty/hasher",
     "sap/ushell/components/container/IframePOSTUtils",
-    "sap/ushell/Container"
+    "sap/ushell/Container",
+    "sap/ushell/ApplicationType/systemAlias",
+    "sap/ushell/utils/UrlParsing"
 ], function (
     Log,
     deepEqual,
@@ -61,7 +63,9 @@ sap.ui.define([
     ushellUtils,
     hasher,
     IframePOSTUtils,
-    Container
+    Container,
+    systemAlias,
+    UrlParsing
 ) {
     "use strict";
 
@@ -794,9 +798,12 @@ sap.ui.define([
     /**
      * Check if adjustNwbcUrl needs to be called, and if needed - call it
      *
-     * @param {sap.ushell.components.container.ApplicationContainer} oContainer
-     * @param {string} sUrl
+     * @param {sap.ushell.components.container.ApplicationContainer} oContainer Application Container
+     * @param {ApplicationType.enum} sApplicationType Application type
+     * @param {string} sUrl Url that needs to be adjusted
+     * @param {boolean} bForFramelessWindow whether the url is for a frameless window
      *   the base URL
+     * @returns {string} Url what was adjusted
      * @private
      */
     function checkNwbcUrlAdjustment (oContainer, sApplicationType, sUrl, bForFramelessWindow) {
@@ -811,8 +818,7 @@ sap.ui.define([
 
             // add this container to list of NWBC-containing containers
             if (oContainer && bForFramelessWindow === false) {
-                ushellUtils.localStorageSetItem(oContainer.globalDirtyStorageKey,
-                    Container.DirtyState.INITIAL);
+                ushellUtils.localStorageSetItem(oContainer.globalDirtyStorageKey, Container.DirtyState.INITIAL);
             }
         }
 
@@ -829,15 +835,29 @@ sap.ui.define([
      *   The application type of <code>sUrl</code>
      * @param {string} sTargetNavigationMode
      *   The (external) navigation mode to add in the sap-target-navmode parameter
+     * @param {boolean} bReuseSession whether the session should is reused
+     * @param {boolean} bForFramelessWindow whether the url is for a frameless window
      * @returns {string}
      *   Modified url having additional parameters
      * @private
      */
     function adjustNwbcUrl (sUrl, sUrlApplicationType, sTargetNavigationMode, bReuseSession, bForFramelessWindow) {
+
+        // Parameters of the shell specific part to be added for NWBC Url
+        var oShPara = {};
+
         if (bForFramelessWindow === undefined) {
             bForFramelessWindow = false;
         }
         var sTheme;
+
+        function addSearchOrShellParamsToURL (sUrlorHash, oShellParams) {
+            if (sUrlorHash.indexOf("#") === -1) {
+                return UrlParsing.addParamsToUrl(sUrlorHash, oShellParams);
+            }
+            return UrlParsing.addShellParamsToURL(sUrlorHash, oShellParams);
+        }
+
         function getAccessibility () {
             var vUrl = ushellUtils.getParameterValueBoolean("sap-accessibility");
             if (vUrl !== undefined) {
@@ -892,70 +912,62 @@ sap.ui.define([
             return sVal;
         }
 
+
         // force IE to edge mode
-        sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-        sUrl += "sap-ie=edge";
+        oShPara["sap-ie"] = "edge";
 
         sTheme = getTheme();
         if (sTheme) {
-            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-            sUrl += "sap-theme=" + encodeURIComponent(sTheme);
             // note, we do not replace existing parameters
+            oShPara["sap-theme"] = sTheme;
         }
 
         if (getAccessibility()) {
             // propagate accessibility mode
             // Note: This is handled by the WebGUI/WDA framework which expects a value of "X"!
-            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-            sUrl += "sap-accessibility=X";
+            oShPara["sap-accessibility"] = "X";
             // note, we do not replace existing parameters
         }
         if (getStatistics()) {
             // propagate statistics = true
             // Note: This is handled by the IFC handler on ABAP, which expects a value of "true" (not "X")
-            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-            sUrl += "sap-statistics=true";
+            oShPara["sap-statistics"] = "true";
             // note, we do not replace existing parameters
         }
 
         var sDensity = getDensity();
         if (sDensity && sDensity.length > 0) {
-            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-            sUrl += "sap-touch=" + sDensity;
+            oShPara["sap-touch"] = sDensity;
         }
 
         if (bForFramelessWindow === false) {
             if (sTargetNavigationMode) {
-                sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-                sUrl += "sap-target-navmode=" + encodeURIComponent(sTargetNavigationMode);
                 // note, we do not replace existing parameters
             }
 
             if (sUrlApplicationType === "TR" || sUrlApplicationType === "GUI") {
-                sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-                sUrl += "sap-keepclientsession=2";
+                oShPara["sap-keepclientsession"] = "2";
             } else if (bReuseSession) {
-                sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-                sUrl += "sap-keepclientsession=1";
+                oShPara["sap-keepclientsession"] = "1";
             }
 
             var sKey = getInAppState();
             if (sKey && sKey.length > 0) {
-                sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-                sUrl += "sap-iapp-state=" + sKey;
+                oShPara["sap-iapp-state"] = sKey;
             }
 
             var sessionTimeout = 0;
             if (Config.last("/core/shell/sessionTimeoutIntervalInMinutes") > 0) {
                 sessionTimeout = Config.last("/core/shell/sessionTimeoutIntervalInMinutes");
             }
-            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-            sUrl += "sap-ushell-timeout=" + sessionTimeout;
+            oShPara["sap-ushell-timeout"] = sessionTimeout;
+
+            sUrl = addSearchOrShellParamsToURL(sUrl, oShPara);
 
             // The renderer "waits" for the ui5 version to be available
             return ushellUtils.appendSapShellParamSync(sUrl, sUrlApplicationType, sUI5Version);
         }
-        return sUrl;
+        return addSearchOrShellParamsToURL(sUrl, oShPara);
     }
 
     /**
@@ -1150,12 +1162,13 @@ sap.ui.define([
             return;
         }
 
+        var sUrlWithSystemAlias = systemAlias.addSystemAlias(sUrl, oContainer);
         // embed URL via <IFRAME>
         oContainer.fireEvent("applicationConfiguration");
         oRenderManager
             .openStart("iframe", oContainer)
             .accessibilityState(oContainer)
-            .attr("src", sUrl)
+            .attr("src", sUrlWithSystemAlias)
             .attr("title", resources.i18n.getText("AppilcationContainer.IframeTitle"))
             .attr("sap-iframe-idx", ++iIframeIdx)
             .class("sapUShellApplicationContainer")
@@ -1646,6 +1659,63 @@ sap.ui.define([
         return this.oDeferredControlCreation ? this.oDeferredControlCreation.promise() : new jQuery.Deferred().resolve().promise();
     };
 
+    /**
+     * Merges the given capabilities into the existing blue box capabilities.
+     * Existing capabilities are overwritten.
+     * @param {{ service:string, action: string }[]} aNewCapabilities The additional capabilities.
+     * @returns {this} this instance for method chaining
+     *
+     * @since 1.130.0
+     * @private
+     */
+    ApplicationContainer.prototype.addBlueBoxCapabilities = function (aNewCapabilities) {
+        const oCapabilities = this.getBlueBoxCapabilities();
+
+        aNewCapabilities.forEach((oCapability) => {
+            oCapabilities[`${oCapability.service}.${oCapability.action}`.toLowerCase()] = true;
+        });
+        return this;
+    };
+
+    /**
+     * Removes the given capabilities from the existing blue box capabilities.
+     * If no capabilities are provided, all capabilities are removed.
+     * @param {{ service:string, action: string }[]} [aCapabilitiesToRemove] The capabilities to remove.
+     * @returns {this} this instance for method chaining
+     *
+     * @since 1.130.0
+     * @private
+     */
+    ApplicationContainer.prototype.removeBlueBoxCapabilities = function (aCapabilitiesToRemove) {
+        const oCapabilities = this.getBlueBoxCapabilities();
+
+        if (!aCapabilitiesToRemove) {
+            this.setProperty("blueBoxCapabilities", {}, true);
+            return this;
+        }
+
+        aCapabilitiesToRemove.forEach((oCapability) => {
+            delete oCapabilities[`${oCapability.service}.${oCapability.action}`.toLowerCase()];
+        });
+        return this;
+    };
+
+    /**
+     * Checks if this application container supports the given capabilities.
+     * @param {{ service:string, action: string }[]} aRequiredCapabilities The capabilities to check.
+     * @returns {boolean} true if the blue box capabilities contain the given service and action
+     *
+     * @since 1.130.0
+     * @private
+     */
+    ApplicationContainer.prototype.supportsBlueBoxCapabilities = function (aRequiredCapabilities) {
+        const oCapabilities = this.getBlueBoxCapabilities();
+
+        return aRequiredCapabilities.every((oRequiredCapability) => {
+            return oCapabilities[`${oRequiredCapability.service}.${oRequiredCapability.action}`.toLowerCase()];
+        });
+    };
+
     //Attach private functions which should be testable via unit tests to the prototype of the ApplicationContainer
     //to make them available outside for testing.
     ApplicationContainer.prototype._getCommunicationHandlers = getCommunicationHandlers;

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

@@ -10,7 +10,8 @@ sap.ui.define([
     "sap/ushell/utils",
     "sap/ushell/resources",
     "sap/ushell/Config",
-    "sap/ushell/Container"
+    "sap/ushell/Container",
+    "sap/ushell/ApplicationType/systemAlias"
 ], function (
     UriParameters,
     RenderManager,
@@ -19,7 +20,8 @@ sap.ui.define([
     utils,
     resources,
     Config,
-    Container
+    Container,
+    systemAlias
 ) {
     "use strict";
 
@@ -91,17 +93,18 @@ sap.ui.define([
         aAdditionalDataArray.push(oContainer.getSystemAlias());
         aInfoArray.push("system-alias");
 
-        var valStr = "";
-        var obj = {};
+        var sFLPParams = "";
+        var oFLPParams = {};
 
         aInfoArray.forEach(function (item, index) {
             if (aAdditionalDataArray[index] || item === "system-alias") {
-                obj[item] = aAdditionalDataArray[index];
+                oFLPParams[item] = aAdditionalDataArray[index];
             }
         });
 
-        var sapOrigURL = sUrl;
-        valStr = JSON.stringify(obj);
+
+        var sapOrigUrlWithSystemAlias = systemAlias.addSystemAlias(sUrl, oContainer);
+        sFLPParams = JSON.stringify(oFLPParams);
 
         var oIframeUriParams = {};
         if (oContainer.getIframePostAllParams() === true) {
@@ -126,7 +129,7 @@ sap.ui.define([
         oRenderManager
             .voidStart("input")
             .attr("name", "sap-flp-params")
-            .attr("value", valStr)
+            .attr("value", sFLPParams)
             .voidEnd();
 
         if (oContainer.getIframePostAllParams() === true) {
@@ -151,7 +154,7 @@ sap.ui.define([
             .openStart("iframe", oContainer)
             .attr("name", oContainer.getId())
             .accessibilityState(oContainer)
-            .attr("sap-orig-src", sapOrigURL)
+            .attr("sap-orig-src", sapOrigUrlWithSystemAlias)
             .attr("title", resources.i18n.getText("AppilcationContainer.IframeTitle"))
             .attr("sap-iframe-idx", iIframeIdx)
             .class("sapUShellApplicationContainer")

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module communicates with the content API graphql service to retrieve catalogs and visualization data for catalogs.
- * @version 1.130.1
+ * @version 1.131.1
  */
 sap.ui.define([
     "sap/base/i18n/Localization",