@sapui5/sap.ushell 1.121.1 → 1.122.0

package/src/main/js/sap/ushell/components/applicationIntegration/application/PostMessageAPI.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview defines the post message API for all applications running in iframe within the shell
- * @version 1.121.1
+ * @version 1.122.0
  * @private
  */
 sap.ui.define([
@@ -454,7 +454,7 @@ sap.ui.define([
                 getShellGroupTiles: {
                     executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
+                        Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
                             oLaunchPageService.getTilesByGroupId(oServiceParams.oMessageData.body.groupId).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
@@ -1021,7 +1021,14 @@ sap.ui.define([
                         var sSystemAlias = oServiceParams.oContainer.getSystemAlias();
                         if (sSystemAlias === null || sSystemAlias === undefined) {
                             sSystemAlias = "";
+                        } else {
+                            const underscoreCount = (sSystemAlias.match(/_/g) || []).length;
+                            if (underscoreCount >= 2) {
+                                const secondUnderscoreIndex = sSystemAlias.indexOf('_', sSystemAlias.indexOf('_') + 1);
+                                sSystemAlias = sSystemAlias.substring(secondUnderscoreIndex + 1);
+                            }
                         }
+
                         return sSystemAlias;
                     }
                 },
@@ -1263,7 +1270,7 @@ sap.ui.define([
                 getDistinctSemanticObjects: {
                     executeServiceCallFn: () => {
                         var oDeferred = new jQuery.Deferred();
-                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+                        Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavTargetResolutionService) {
                             oNavTargetResolutionService.getDistinctSemanticObjects().then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
@@ -1272,7 +1279,7 @@ sap.ui.define([
                 expandCompactHash: {
                     executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+                        Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavTargetResolutionService) {
                             oNavTargetResolutionService.expandCompactHash(oServiceParams.oMessageData.body.sHashFragment).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
@@ -1281,7 +1288,7 @@ sap.ui.define([
                 resolveHashFragment: {
                     executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+                        Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavTargetResolutionService) {
                             oNavTargetResolutionService.resolveHashFragment(oServiceParams.oMessageData.body.sHashFragment).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
@@ -1290,7 +1297,7 @@ sap.ui.define([
                 isIntentSupported: {
                     executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+                        Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavTargetResolutionService) {
                             oNavTargetResolutionService.isIntentSupported(oServiceParams.oMessageData.body.aIntents).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
@@ -1299,7 +1306,7 @@ sap.ui.define([
                 isNavigationSupported: {
                     executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+                        Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavTargetResolutionService) {
                             oNavTargetResolutionService.isNavigationSupported(oServiceParams.oMessageData.body.aIntents).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
@@ -1307,6 +1314,55 @@ sap.ui.define([
                 }
             }
         },
+        "sap.ushell.services.NavTargetResolutionInternal": {
+            oServiceCalls: {
+                getDistinctSemanticObjects: {
+                    executeServiceCallFn: () => {
+                        var oDeferred = new jQuery.Deferred();
+                        Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavigationTargetResolutionService) {
+                            oNavigationTargetResolutionService.getDistinctSemanticObjects().then(oDeferred.resolve, oDeferred.reject);
+                        });
+                        return oDeferred.promise();
+                    }
+                },
+                expandCompactHash: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        var oDeferred = new jQuery.Deferred();
+                        Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavigationTargetResolutionService) {
+                            oNavigationTargetResolutionService.expandCompactHash(oServiceParams.oMessageData.body.sHashFragment).then(oDeferred.resolve, oDeferred.reject);
+                        });
+                        return oDeferred.promise();
+                    }
+                },
+                resolveHashFragment: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        var oDeferred = new jQuery.Deferred();
+                        Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavigationTargetResolutionService) {
+                            oNavigationTargetResolutionService.resolveHashFragment(oServiceParams.oMessageData.body.sHashFragment).then(oDeferred.resolve, oDeferred.reject);
+                        });
+                        return oDeferred.promise();
+                    }
+                },
+                isIntentSupported: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        var oDeferred = new jQuery.Deferred();
+                        Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavigationTargetResolutionService) {
+                            oNavigationTargetResolutionService.isIntentSupported(oServiceParams.oMessageData.body.aIntents).then(oDeferred.resolve, oDeferred.reject);
+                        });
+                        return oDeferred.promise();
+                    }
+                },
+                isNavigationSupported: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        var oDeferred = new jQuery.Deferred();
+                        Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavigationTargetResolutionService) {
+                            oNavigationTargetResolutionService.isNavigationSupported(oServiceParams.oMessageData.body.aIntents).then(oDeferred.resolve, oDeferred.reject);
+                        });
+                        return oDeferred.promise();
+                    }
+                }
+            }
+        },
         "sap.ushell.services.Renderer": {
             oServiceCalls: {
                 addHeaderItem: {
@@ -1482,7 +1538,7 @@ sap.ui.define([
                 getGroupsForBookmarks: {
                     executeServiceCallFn: () => {
                         var oDeferred = new jQuery.Deferred();
-                        Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
+                        Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
                             oLaunchPageService.getGroupsForBookmarks().then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();

package/src/main/js/sap/ushell/components/applicationIntegration/configuration/AppMeta.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/base/util/extend",
@@ -34,9 +35,9 @@ sap.ui.define([
     Theming,
     Container
 ) {
-"use strict";
+    "use strict";
 
-    function AppMeta () {
+    function AppMeta() {
         var isTitleChanged;
         var isHierarchyChanged;
         var sRootIntent;
@@ -54,17 +55,15 @@ sap.ui.define([
             var oHierarchy = [];
             var sCurrentStateName = Config.last("/core/shell/model/currentState/stateName");
 
-            //If we navigate for a page with state == app add home to it
-            if (sCurrentStateName && ((sCurrentStateName === "app" || sCurrentStateName === "embedded") /*|| sCurrentStateName === "home"*/)) {
-                //add home entry to hierarchy
-                oHierarchy = [
-                    {
-                        icon: "sap-icon://home",
-                        title: resources.i18n.getText("actionHomePage"),
-                        // Intent is set to root directly to avoid multiple hash changes.
-                        intent: sRootIntent ? "#" + sRootIntent : "#"
-                    }
-                ];
+            // if we navigate for a page with state == app add home to it
+            if (sCurrentStateName && ((sCurrentStateName === "app" || sCurrentStateName === "embedded") /* || sCurrentStateName === "home" */)) {
+                // add home entry to hierarchy
+                oHierarchy.push({
+                    icon: "sap-icon://home",
+                    title: resources.i18n.getText("actionHomePage"),
+                    // Intent is set to root directly to avoid multiple hash changes.
+                    intent: sRootIntent ? "#" + sRootIntent : "#"
+                });
 
                 // In spaces mode, additionally add the origin page as a step into the hierarchy.
                 // The page info is set in PageRuntime.controller as custom data of the root control there during navigation to the page.
@@ -94,16 +93,16 @@ sap.ui.define([
 
         this.onHierarchyChange = function (oEvent) {
             isHierarchyChanged = true;
-            var aHierarchy = oEvent.getParameters().data,
-                aExtendedHierarchy = [],
-                sCurrentStateName = Config.last("/core/shell/model/currentState/stateName");
+            var aHierarchy = oEvent.getParameters().data;
+            var aExtendedHierarchy = [];
+            var sCurrentStateName = Config.last("/core/shell/model/currentState/stateName");
 
             if (!aHierarchy) {
                 aHierarchy = [];
             }
             // we take the default value and save it with the data received
             var oHierarchyDefaultValue = this.getHierarchyDefaultValue();
-            //We have to copy the passed array and its objects to prevent direct properties access.
+            // we have to copy the passed array and its objects to prevent direct properties access.
             aHierarchy.forEach(function (oItem, index) {
                 aExtendedHierarchy[index] = extend({}, oItem);
             });
@@ -117,8 +116,8 @@ sap.ui.define([
 
         this.onRelatedAppsChange = function (oEvent) {
             isRelatedAppsChanged = true;
-            var oRelatedApps = oEvent.getParameters().data,
-                sCurrentStateName = Config.last("/core/shell/model/currentState/stateName");
+            var oRelatedApps = oEvent.getParameters().data;
+            var sCurrentStateName = Config.last("/core/shell/model/currentState/stateName");
 
             if (!oRelatedApps) {
                 oRelatedApps = [];
@@ -157,43 +156,41 @@ sap.ui.define([
         };
 
         /**
-         * Helper function to get the favIcon image URL based on a given theme parameter.
+         * Helper function to get the favicon image URL based on a given theme parameter.
          */
-        this._getFavIcon = async function () {
-            let [sFavIcon] = await ushellUtils.getThemingParameters(["sapUiShellFavicon"]);
-            let bCustomFavIcon = false;
-            if (sFavIcon) { // custom theme favicon
-                var match = /url[\s]*\('?"?([^'")]*)'?"?\)/.exec(sFavIcon);
+        this._getFavicon = async function () {
+            let [sFavicon] = await ushellUtils.getThemingParameters(["sapUiShellFavicon"]);
+            let bCustomFavicon = false;
+            if (sFavicon) { // custom theme favicon
+                var match = /url[\s]*\('?"?([^'")]*)'?"?\)/.exec(sFavicon);
                 if (match) {
-                    sFavIcon = match[1];
-                    bCustomFavIcon = true;
-                } else if (sFavIcon === "''" || sFavIcon === "none") {
-                    sFavIcon = null;
+                    sFavicon = match[1];
+                    bCustomFavicon = true;
+                } else if (sFavicon === "''" || sFavicon === "none") {
+                    sFavicon = null;
                 }
             }
 
             var sConfigFavicon = Config.last("/core/shell/favIcon");
-            if (sConfigFavicon && (sFavIcon === null || sFavIcon === undefined)) { // configuration favicon
-                sFavIcon = sConfigFavicon;
-                bCustomFavIcon = true;
+            if (sConfigFavicon && (sFavicon === null || sFavicon === undefined)) { // configuration favicon
+                sFavicon = sConfigFavicon;
+                bCustomFavicon = true;
             }
 
-            if (!sFavIcon) { // default favicon
+            if (!sFavicon) { // default favicon
                 var sModulePath = sap.ui.require.toUrl("sap/ushell");
-                sFavIcon = sModulePath + "/themes/base/img/launchpad_favicon.ico";
+                sFavicon = sModulePath + "/themes/base/img/launchpad_favicon.ico";
             }
 
             return {
-                favIcon: sFavIcon,
-                customFavIcon: bCustomFavIcon
+                favicon: sFavicon,
+                isCustomFavicon: bCustomFavicon
             };
-
         };
 
         this.getAppIcon = function () {
-            var sIcon = "sap-icon://folder",
-                appMetaData = AppConfiguration.getMetadata();
-
+            var sIcon = "sap-icon://folder";
+            var appMetaData = AppConfiguration.getMetadata();
             if (appMetaData && appMetaData.icon) {
                 sIcon = appMetaData.icon;
             }
@@ -201,56 +198,49 @@ sap.ui.define([
         };
 
         this.setAppIcons = function () {
-            //Performance Debug
+            // performance debug
             Measurement.start("FLP:ShellController.setAppIcons", "setValues", "FLP");
-            function onThemeChanged () {
-                this.setValues();
-            }
-            Theming.attachApplied(onThemeChanged.bind(this));
+            Theming.attachApplied(() => this.setValues());
 
             Measurement.end("FLP:ShellController.setAppIcons");
         };
 
         this.setValues = async function () {
             var sModulePath = sap.ui.require.toUrl("sap/ushell");
-            var sLaunchIconPhone = sModulePath + "/themes/base/img/launchicons/57_iPhone_Desktop_Launch.png";
-            var sLaunchIconPhone2 = sModulePath + "/themes/base/img/launchicons/114_iPhone-Retina_Web_Clip.png";
-            var sLaunchIconTablet = sModulePath + "/themes/base/img/launchicons/72_iPad_Desktop_Launch.png";
-            var sLaunchIconTablet2 = sModulePath + "/themes/base/img/launchicons/144_iPad_Retina_Web_Clip.png";
-            var oDefaultFavIcon = await this._getFavIcon();
-            var sFavIcon = oDefaultFavIcon.favIcon;
-
-            if (oDefaultFavIcon.customFavIcon) {
+            var oDefaultFavicon = await this._getFavicon();
+            var sFavicon = oDefaultFavicon.favicon;
+
+            if (oDefaultFavicon.isCustomFavicon) {
                 Mobile.setIcons({
-                    phone: sFavIcon,
-                    "phone@2": sFavIcon,
-                    tablet: sFavIcon,
-                    "tablet@2": sFavIcon,
-                    favicon: sFavIcon,
+                    phone: sFavicon,
+                    "phone@2": sFavicon,
+                    tablet: sFavicon,
+                    "tablet@2": sFavicon,
+                    favicon: sFavicon,
                     precomposed: false
                 });
             } else {
                 Mobile.setIcons({
-                    phone: sLaunchIconPhone,
-                    "phone@2": sLaunchIconPhone2,
-                    tablet: sLaunchIconTablet,
-                    "tablet@2": sLaunchIconTablet2,
-                    favicon: sFavIcon,
+                    phone: sModulePath + "/themes/base/img/launchicons/phone-icon_120x120.png",
+                    "phone@2": sModulePath + "/themes/base/img/launchicons/phone-retina_180x180.png",
+                    tablet: sModulePath + "/themes/base/img/launchicons/tablet-icon_152x152.png",
+                    "tablet@2": sModulePath + "/themes/base/img/launchicons/tablet-retina_167x167.png",
+                    favicon: sFavicon,
                     precomposed: false
                 });
             }
         };
 
-        //The priority order is (from left to right): UserInfo, application metadata, device type
+        // the priority order is (from left to right): UserInfo, application metadata, device type
         this._applyContentDensityByPriority = function (isCompact, isUserChange) {
             return new Promise(function (resolve) {
                 Container.getServiceAsync("UserInfo").then(function (userInfoService) {
                     var appMetaData;
                     if (isCompact === undefined) {
-                        //in case non of the below conditions is relevant, then cannot determine cozy or compact
+                        // in case non of the below conditions is relevant, then cannot determine cozy or compact
                         if (Device.system.combi) {
-                            var oUser = userInfoService.getUser(),
-                                sContentDensity = "autoDetect";
+                            var oUser = userInfoService.getUser();
+                            var sContentDensity = "autoDetect";
                             // if oUser doesn't exist - then default is auto detect
                             if (oUser) {
                                 sContentDensity = oUser.getContentDensity();
@@ -262,10 +252,10 @@ sap.ui.define([
                                 case "compact":
                                     isCompact = true;
                                     break;
-                                default: //autoDetect
+                                default: // autoDetect
                                     appMetaData = AppConfiguration.getMetadata();
                                     // Compact == true , Cozy == false
-                                    // All other cases - go to Cozy
+                                    // all other cases - go to Cozy
                                     if (appMetaData.compactContentDensity && !appMetaData.cozyContentDensity) {
                                         isCompact = true;
                                     } else {
@@ -290,13 +280,13 @@ sap.ui.define([
 
         this._applyContentDensityClass = function (isCompact, isUserChange) {
             return new Promise(function (resolve) {
-                function setClasses (compact) {
+                function setClasses(compact) {
                     document.body.classList.toggle("sapUiSizeCompact", compact);
                     document.body.classList.toggle("sapUiSizeCozy", !compact);
 
                     if (isUserChange === true) {
                         sap.ui.require(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"], function (PostMessageUtils) {
-                            PostMessageUtils.postMessageToMultipleIframes("sap.ushell.appRuntime", "uiDensityChange", {isTouch: (compact ? "0" : "1")});
+                            PostMessageUtils.postMessageToMultipleIframes("sap.ushell.appRuntime", "uiDensityChange", { isTouch: (compact ? "0" : "1") });
                         });
                     }
                     resolve();
@@ -327,33 +317,27 @@ sap.ui.define([
         };
 
         this.getTitleDefaultValue = function () {
-            var sTitle = "",
-                appMetaData = AppConfiguration.getMetadata();
-
+            var sTitle = "";
+            var appMetaData = AppConfiguration.getMetadata();
             if (appMetaData && appMetaData.title) {
                 sTitle = appMetaData.title;
             }
             return sTitle;
         };
 
-        this.create = function () {
-        };
+        this.create = function () { };
 
         this.restore = function () {
             this._applyContentDensityByPriority();
             this.setAppIcons();
         };
 
-        this.store = function (oInMeta) {
-        };
-
+        this.store = function (oInMeta) { };
 
         this.destroy = function (oInMeta) {
-            //handle destroy of the services
+            // handle destroy of the services
         };
-
     }
 
-
     return new AppMeta();
 }, /* bExport= */ true);

package/src/main/js/sap/ushell/components/applicationIntegration/elements/model.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/components/applicationIntegration/relatedServices/RelatedServices.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the services for the different applications.
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/components/applicationIntegration/relatedShellElements/RelatedShellElements.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the related shell elements of the different applications.
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/AdvancedFormatters.js

@@ -2,8 +2,8 @@
 
 sap.ui.define([
   "sap/ui/core/theming/Parameters",
-  "sap/ui/core/Core"
-], function (ThemeParameters, Core) {
+  "sap/ui/core/Theming"
+], function (ThemeParameters, Theming) {
 
   "use strict";
 
@@ -13,7 +13,7 @@ sap.ui.define([
       name: ["sapUiAccent2", "sapUiAccentBackgroundColor2", "sapUiAccent10", "sapUiAccentBackgroundColor10", "sapUiFontFamily"]
     });
   }
-  Core.attachThemeChanged(getThemeParameters);
+  Theming.attachApplied(getThemeParameters);
   getThemeParameters();
 
   var sCalendarSvg = [

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/appendStyleVars.js

@@ -2,8 +2,8 @@
 
 sap.ui.define([
   "sap/ui/core/theming/Parameters",
-  "sap/ui/core/Core"
-], function (ThemeParameters, Core) {
+  "sap/ui/core/Theming"
+], function (ThemeParameters, Theming) {
 
   "use strict";
 
@@ -32,7 +32,7 @@ sap.ui.define([
     }
   }
 
-  Core.attachThemeChanged(function () {
+  Theming.attachApplied(function () {
     // remove old css vars
     for (var i = 0; i < aAllParams.length; i++) {
       document.body.style.removeProperty("--" + aAllParams[i]);

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/controls/categories/Event.js

@@ -7,7 +7,7 @@ sap.ui.define(
     "sap/m/FlexBox",
     "sap/m/Avatar",
     "sap/m/ObjectIdentifier",
-    "sap/ui/core/Core",
+    "sap/ui/core/Theming",
     "sap/ui/core/theming/Parameters",
     "sap/ui/core/format/DateFormat"
   ],
@@ -18,7 +18,7 @@ sap.ui.define(
     FlexBox,
     Avatar,
     ObjectIdentifier,
-    Core,
+    Theming,
     ThemeParameters,
     DateFormat
   ) {
@@ -35,7 +35,7 @@ sap.ui.define(
           "sapUiFontFamily"]
       });
     }
-    Core.attachThemeChanged(getThemeParameters);
+    Theming.attachApplied(getThemeParameters);
     getThemeParameters();
 
 

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.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -820,11 +820,11 @@ sap.ui.define([
     }
 
     /**
-     * Amends the NavTargetResolution response with theme, sap-ushell-version, accessibility and post parameters if present.
+     * Amends the NavTargetResolutionInternal response with theme, sap-ushell-version, accessibility and post parameters if present.
      * Theme and accessibility information is only added for the NWBC application type.
      *
      * @param {string} sUrl
-     *   Already resolved url (NavTargetResolution response)
+     *   Already resolved url (NavTargetResolutionInternal response)
      * @param {string} sUrlApplicationType
      *   The application type of <code>sUrl</code>
      * @param {string} sTargetNavigationMode
@@ -1475,7 +1475,7 @@ sap.ui.define([
             }
         },
 
-        invalidate: function() {
+        invalidate: function () {
             if (this.getDomRef()) {
                 //always prevent re-rendering of application container once it's rendered
                 return this;

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.121.1
+ * @version 1.122.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/contentFinder/controller/AppSearch.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file AppSearch controller for AppSearch view
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "./ContentFinderDialog.controller",
@@ -226,16 +226,23 @@ sap.ui.define([
          * @param {string} sTitle The app title.
          * @param {string} sSubtitle The app subtitle.
          * @param {boolean} bAdded Flag indicating if the app has already been added to the cell.
+         * @param {string} sFioriIdLabel The app title.
+         * @param {string} sAppId The app subtitle.
+         * @param {string} sInformationLabel The information label
+         * @param {string} sInfo The app information
+         * @param {string} sFieldEmpty The field empty text
          * @since 1.115.0
          * @returns {string} The description.
          */
-        formatAppBoxAccDescription: function (sTitle, sSubtitle, bAdded) {
-            var aDescriptions = [];
-
+        formatAppBoxAccDescription: function (sTitle, sSubtitle, bAdded, sFioriIdLabel, sAppId, sInformationLabel, sInfo, sFieldEmpty) {
+            let aDescriptions = [];
             if (sTitle) { aDescriptions.push(sTitle); }
             if (sSubtitle) { aDescriptions.push(sSubtitle); }
             if (bAdded) { aDescriptions.push(this.oResourceBundle.getText("ContentFinder.AppSearch.Message.AlreadyUsed")); }
-
+            if (sFioriIdLabel) { aDescriptions.push(sFioriIdLabel); }
+            if (sAppId) { aDescriptions.push(sAppId); } else if (sFieldEmpty) { aDescriptions.push(sFieldEmpty); }
+            if (sInformationLabel) { aDescriptions.push(sInformationLabel); }
+            if (sInfo) { aDescriptions.push(sInfo); } else if (sFieldEmpty) { aDescriptions.push(sFieldEmpty); }
             return aDescriptions.join(" . ");
         }
     });

package/src/main/js/sap/ushell/components/contentFinder/controller/ContentFinderDialog.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog root view
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "../model/formatter",

package/src/main/js/sap/ushell/components/contentFinder/controller/WidgetGallery.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for WidgetGallery view
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "./ContentFinderDialog.controller"

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinder",
         "applicationVersion": {
-            "version": "1.121.1"
+            "version": "1.122.0"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

package/src/main/js/sap/ushell/components/contentFinder/resources/resources.properties

@@ -57,4 +57,4 @@ ContentFinder.AppSearch.Text.FieldEmpty=Not available
 #XBUT
 ContentFinder.AppSearch.Button.Preview=Preview
 #XMSG
-ContentFinder.AppSearch.Message.AlreadyUsed=Already Used
+ContentFinder.AppSearch.Message.Select=Select {0}