@sapui5/sap.ushell 1.112.3 → 1.113.0

package/src/main/js/sap/ushell/services/LaunchPage.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @file The Unified Shell's page builder service providing the data for the Fiori launchpad's classic Homepage.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -141,6 +141,30 @@ sap.ui.define([
             return oDeferred.promise();
         };
 
+        /**
+         * Fetches the group tiles and clones them for the search
+         * This ensures that on ABAP the tiles and in the runtime and the
+         * search are not connected anymore via the common chipInstance
+         *
+         * @param {object} oGroup The group whose tiles are returned
+         *
+         * @see sap.ushell.services.LaunchPage#getGroupTiles
+         *
+         * @returns {Promise<object[]>} The group tiles array
+         * @since 1.113.0
+         * @private
+         *
+         * @alias sap.ushell.services.LaunchPage#getGroupTilesForSearch
+         */
+        this.getGroupTilesForSearch = function (oGroup) {
+            var oAdapter = this._getAdapter(oGroup.contentProvider);
+
+            if (oAdapter.getGroupTileClones) {
+                return oAdapter.getGroupTileClones(oGroup);
+            }
+            return Promise.resolve(this.getGroupTiles(oGroup));
+        };
+
         /**
          * Returns the default group of the user.
          * In case of success, the <code>done</code> function gets an 'anonymous' object representing the default group.
@@ -205,7 +229,7 @@ sap.ui.define([
          * The order of the array is the order of tiles that will be displayed to the user.
          *
          * @param {object} oGroup The group whose tiles are returned
-         * @returns {Array} The group tiles array
+         * @returns {object[]} The group tiles array
          * @public
          * @alias sap.ushell.services.LaunchPage#getGroupTiles
          */
@@ -218,7 +242,7 @@ sap.ui.define([
          * The order of the array is the order of tiles that will be displayed to the user.
          *
          * @param {string} sGroupId the group id
-         * @returns {Array} The group tiles array
+         * @returns {object[]} The group tiles array
          * @private
          */
         this.getTilesByGroupId = function (sGroupId) {
@@ -259,7 +283,7 @@ sap.ui.define([
          * The order of the array is the order in which the links will be displayed to the user.
          *
          * @param {object} oGroup The group whose link tiles are returned
-         * @returns {Array} The array of link tiles
+         * @returns {object[]} The array of link tiles
          * @public
          * @alias sap.ushell.services.LaunchPage#getLinkTiles
          */
@@ -536,8 +560,8 @@ sap.ui.define([
          */
         this.addTile = function (oCatalogTile, oGroup) {
             return this._getAdapter(oGroup.contentProvider).addTile(oCatalogTile, oGroup)
-                .fail(function () {
-                    Log.error("Fail to add Tile: " + that.getCatalogTileId(oCatalogTile));
+                .fail(function (aGroups, vError) {
+                    Log.error("Fail to add Tile: " + that.getCatalogTileId(oCatalogTile), vError, "sap.ushell.services.LaunchPage");
                 });
         };
 
@@ -827,7 +851,7 @@ sap.ui.define([
          * Tile actions should be returned immediately without any additional server access in order to avoid delays in rendering the action list in the browser.
          *
          * @example of a tile actions provider callback:
-         *   <code>
+         * <pre>
          *     function (oTile){
          *       return [
          *         {
@@ -844,7 +868,7 @@ sap.ui.define([
          *         }
          *       ];
          *     }
-         *   </code>
+         * </pre>
          *
          * Use <code>Function.prototype.bind()</code> to determine the callback's <code>this</code> or some of its arguments.
          *
@@ -868,7 +892,7 @@ sap.ui.define([
          * @alias sap.ushell.services.LaunchPage#getTileActions
          *
          * @param {object} oTile the tile to get the actions for
-         * @returns {Array} tile actions
+         * @returns {object[]} tile actions
          */
         this.getTileActions = function (oTile) {
             var aTileActions = [],

package/src/main/js/sap/ushell/services/Menu.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The menu service provides the entries for the menu bar
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/ushell/Config",

package/src/main/js/sap/ushell/services/Message.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The Unified Shell's message service.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/MessageBroker.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview This module exposes API enpoints for Generic Communication
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/ushell/services/_MessageBroker/MessageBrokerEngine"

package/src/main/js/sap/ushell/services/NavTargetResolution.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The NavTargetResolution service.
@@ -322,7 +322,7 @@ sap.ui.define([
          * Do not use this function for developing Fiori applications.
          *
          * @param {object} oArgs
-         *   <code>
+         * <pre>
          *   {
          *     target : {
          *       semanticObject : "semantic object",
@@ -335,7 +335,7 @@ sap.ui.define([
          *       }
          *     }
          *   }
-         *   </code>
+         * </pre>
          * @returns {jQuery.Promise} A jQuery.Promise. Its <code>done()</code> function gets an object. Typically it contains the following information:
          *   <pre>
          *   {
@@ -902,19 +902,19 @@ sap.ui.define([
          * @param {object[]} aIntents the intents (such as <code>["#AnObject-action?A=B&c=e"]</code>) to be checked
          *   with object being instances the oArgs object of toExternal, hrefForExternal etc.
          *   e.g.
-         *   <code>
+         * <pre>
          *   {
          *     target : { semanticObject : "AnObject", action: "action" },
          *     params : { A : "B" }
          *   }
-         *   </code>
+         * </pre>
          *   or e.g.
-         *   <code>
+         * <pre>
          *   {
          *     target : { semanticObject : "AnObject", action: "action" },
          *     params : { A : "B", c : "e" }
          *   }
-         *   </code>
+         * </pre>
          *   or
          *   <code>{ target : { shellHash : "AnObject-action?A=B&c=e" } }</code>
          * @returns {object} A <code>jQuery.Deferred</code> object's promise which is resolved with an array (!) of
@@ -955,7 +955,7 @@ sap.ui.define([
          *   </pre>
          *
          * Example usage:
-         *   <code>
+         * <pre>
          *   this.oCrossAppNav.isNavigationSupported([ ])
          *   .done(function(aResponses) {
          *     if (oResponse[0].supported===true){
@@ -969,7 +969,7 @@ sap.ui.define([
          *     // disable link
          *     // request failed or other fatal error
          *   });
-         *   </code>
+         * </pre>
          *
          * @since 1.32
          * @public
@@ -1009,6 +1009,9 @@ sap.ui.define([
             if (oUsageRecorderConfig.enabled) {
                 var sUsageRecorderEndpoint = oUsageRecorderConfig.serviceUrl || "/navigation/api/v2/record";
                 oHttpClient.post(sUsageRecorderEndpoint, {
+                    headers: {
+                        "content-type": "application/json; charset=utf-8"
+                    },
                     data: {
                         function: sFunctionName,
                         parameters: JSON.stringify(oParameters),

package/src/main/js/sap/ushell/services/NavigationDataProvider.js

@@ -1,10 +1,10 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview
  *
  * <p>This module prepares the navigation data needed by the page dereferencer.</p>
  *
- * @version 1.112.3
+ * @version 1.113.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/services/Notifications.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/PageBuilding.js

@@ -1,9 +1,9 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The Unified Shell's page building service.
  *
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery"

package/src/main/js/sap/ushell/services/PagePersistence.js

@@ -1,10 +1,10 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview
  *
  * <p>This module deals with the page persistence.</p>
  *
- * @version 1.112.3
+ * @version 1.113.0
  */
 
 sap.ui.define([], function () {

package/src/main/js/sap/ushell/services/PageReferencing.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview This module deals with page related referencing and dereferencing.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/ushell/services/_PageReferencing/PageReferencer"

package/src/main/js/sap/ushell/services/Pages.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview This module exposes a model containing the pages hierarchy to its clients.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -50,7 +50,6 @@ sap.ui.define([
     var Pages = function () {
         this.COMPONENT_NAME = "sap/ushell/services/Pages";
         this._oCdmServicePromise = sap.ushell.Container.getServiceAsync("CommonDataModel");
-        this._oURLParsingServicePromise = sap.ushell.Container.getServiceAsync("URLParsing");
         this._oCSTRServicePromise = sap.ushell.Container.getServiceAsync("ClientSideTargetResolution");
         this._oPagesModel = new RestrictedJSONModel({
             pages: []
@@ -467,8 +466,8 @@ sap.ui.define([
      * @private
      */
     Pages.prototype._getSectionIndex = function (sPagePath, sSectionId) {
-        var aSections = this.getModel().getProperty(sPagePath + "/sections") || [],
-            i = 0;
+        var aSections = this.getModel().getProperty(sPagePath + "/sections") || [];
+        var i = 0;
 
         for (; i < aSections.length; i += 1) {
             if (aSections[i].id === sSectionId) {
@@ -486,7 +485,6 @@ sap.ui.define([
      * @param {object} [oAdditionalVizData] Additional visualization data that should overwrite the standard data.
      * @param {object} oApplications A map of all applications.
      * @param {object} oVizTypes The map of vizTypes
-     * @param {object} oURLParsingService The URLParsing service
      * @param {object} oSystemContext The system context
      *
      * @returns {object} The visualization data for the given visualization id.
@@ -495,7 +493,7 @@ sap.ui.define([
      *
      * @private
      */
-    Pages.prototype._getVisualizationData = function (sPageId, sVizId, oVisualizations, oAdditionalVizData, oApplications, oVizTypes, oURLParsingService, oSystemContext) {
+    Pages.prototype._getVisualizationData = function (sPageId, sVizId, oVisualizations, oAdditionalVizData, oApplications, oVizTypes, oSystemContext) {
         var oVisualizationReference = oAdditionalVizData || {
             vizId: sVizId
         };
@@ -505,7 +503,7 @@ sap.ui.define([
             visualizations: oVisualizations,
             vizTypes: oVizTypes
         };
-        var oVizData = readUtils.getVizData(oSite, oVisualizationReference, oURLParsingService, oSystemContext);
+        var oVizData = readUtils.getVizData(oSite, oVisualizationReference, oSystemContext);
         if (!oVizData.id) {
             oVizData.id = this._generateId(sPageId);
         }
@@ -539,19 +537,20 @@ sap.ui.define([
                     this.loadPage(sPageId),
                     oCdmService.getVisualizations(),
                     oCdmService.getApplications(),
-                    oCdmService.getVizTypes(),
-                    this._oURLParsingServicePromise
+                    oCdmService.getVizTypes()
                 ])
                     .catch(function (oError) {
                         Log.error("Pages - addVisualization: Personalization cannot be saved: Failed to load page, get visualizations or get applications.", oError, this.COMPONENT_NAME);
                         return Promise.reject(oError);
                     }.bind(this))
                     .then(function (aResult) {
-                        var sPagePath = aResult[0],
-                            oURLParsingService = aResult[4],
-                            iSectionIndex = this._getSectionIndex(sPagePath, sSectionId),
-                            aSection = this.getModel().getProperty(sPagePath + "/sections") || [],
-                            oVisualizationData = this._getVisualizationData(sPageId, sVizId, aResult[1], null, aResult[2], aResult[3], oURLParsingService);
+                        var sPagePath = aResult[0];
+                        var oVisualizations = aResult[1];
+                        var oApplications = aResult[2];
+                        var oVizTypes = aResult[3];
+                        var iSectionIndex = this._getSectionIndex(sPagePath, sSectionId);
+                        var aSection = this.getModel().getProperty(sPagePath + "/sections") || [];
+                        var oVisualizationData = this._getVisualizationData(sPageId, sVizId, oVisualizations, null, oApplications, oVizTypes);
 
                         if (sDisplayFormatHint) { // save with the same displayFormatHint in case of copy (Add to My Home)
                             oVisualizationData.displayFormatHint = sDisplayFormatHint;
@@ -568,8 +567,8 @@ sap.ui.define([
                         // Add visualization to existing default section, update model & site, save personalization
                         if (iSectionIndex !== undefined || iDefaultSectionIndex !== undefined) {
                             this.setPersonalizationActive(true);
-                            var iSectionPathIndex = iSectionIndex !== undefined ? iSectionIndex : iDefaultSectionIndex || 0,
-                                sVisualizationsPath = sPagePath + "/sections/" + iSectionPathIndex + "/visualizations";
+                            var iSectionPathIndex = iSectionIndex !== undefined ? iSectionIndex : iDefaultSectionIndex || 0;
+                            var sVisualizationsPath = sPagePath + "/sections/" + iSectionPathIndex + "/visualizations";
 
                             this.getModel().getProperty(sVisualizationsPath).push(oVisualizationData);
                             this.getModel().refresh();
@@ -718,9 +717,9 @@ sap.ui.define([
     Pages.prototype.addSection = function (iPageIndex, iSectionIndex, oSectionProperties) {
         this.setPersonalizationActive(true);
 
-        var oSectionReference = oSectionProperties || {},
-            aSections = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/sections"),
-            sPageId = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/id");
+        var oSectionReference = oSectionProperties || {};
+        var aSections = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/sections");
+        var sPageId = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/id");
 
         var oNewSection = {
             id: oSectionReference.id !== undefined ? oSectionReference.id : this._generateId(sPageId),
@@ -759,8 +758,8 @@ sap.ui.define([
                 };
 
                 if (oNewSection.visualizations) {
-                    var i = 0,
-                        oVizData;
+                    var i = 0;
+                    var oVizData;
 
                     for (; i < oNewSection.visualizations.length; i++) {
                         oVizData = oNewSection.visualizations[i];
@@ -1181,15 +1180,13 @@ sap.ui.define([
         ushellUtils.setPerformanceMark(["FLP-Pages-Service-getModelForPage-start[", oPage.id, "]"].join(""));
 
         return Promise.all([
-            this._oCSTRServicePromise,
-            this._oURLParsingServicePromise
+            this._oCSTRServicePromise
         ])
             .catch(function (oError) {
                 return Promise.reject(oError);
             })
             .then(function (aResults) {
                 var oCSTRService = aResults[0];
-                var oURLParsingService = aResults[1];
                 var bEnableHiddenGroup = Config.last("/core/catalog/enableHideGroups");
 
                 return Promise.all(page.payload.layout.sectionOrder.map(function (sSectionId) {
@@ -1206,12 +1203,11 @@ sap.ui.define([
                     oPage.sections.push(oSection);
 
                     return Promise.all(oCDMPageSection.layout.vizOrder.map(function (id) {
-                        var oVisualizationReference = oCDMPageSection.viz[id],
-                            sVizId = oVisualizationReference.vizId;
+                        var oVisualizationReference = oCDMPageSection.viz[id];
+                        var sVizId = oVisualizationReference.vizId;
                         return oCSTRService.getSystemContext(oVisualizationReference.contentProviderId)
                             .then(function (oSystemContext) {
-                                var oVizData = this._getVisualizationData(page.identification.id, sVizId, visualizations,
-                                    oVisualizationReference, applications, vizTypes, oURLParsingService, oSystemContext);
+                                var oVizData = this._getVisualizationData(page.identification.id, sVizId, visualizations, oVisualizationReference, applications, vizTypes, oSystemContext);
                                 // In order to keep the order of the visualizations we have to add them first and remove them later asynchronously
                                 oSection.visualizations.push(oVizData);
 
@@ -1324,7 +1320,7 @@ sap.ui.define([
      * @param {string} [bookmark.serviceUrl]
      *   The URL to a REST or OData service that provides some dynamic information for the bookmark.
      * @param {object} [oParameters.dataSource]
-     *   Metadata for parameter serivceUrl. Mandatory to specify if parameter serviceURL contains semantic date ranges.
+     *   Metadata for parameter serviceUrl. Mandatory to specify if parameter serviceURL contains semantic date ranges.
      *   This does not influence the data source of the app itself.
      * @param {string} [oParameters.dataSource.type]
      *   The type of the serviceURL's service. Only "OData" is supported.
@@ -1379,7 +1375,6 @@ sap.ui.define([
 
                     return Promise.all([
                         this.loadPage(pageId),
-                        this._oURLParsingServicePromise,
                         oVizTypes,
                         oCSTRService.getSystemContext(sContentProviderId)
                     ]);
@@ -1391,9 +1386,8 @@ sap.ui.define([
             }.bind(this))
             .then(function (aResults) {
                 var pagePath = aResults[0];
-                var oURLParsingService = aResults[1];
-                var oVizTypes = aResults[2];
-                var oSystemContext = aResults[3];
+                var oVizTypes = aResults[1];
+                var oSystemContext = aResults[2];
                 // Create visualization data for the model
                 var oVizRef = {
                     id: this._generateId(pageId),
@@ -1403,7 +1397,7 @@ sap.ui.define([
                     icon: bookmark.icon,
                     info: bookmark.info,
                     numberUnit: bookmark.numberUnit,
-                    target: utilsCdm.toTargetFromHash(bookmark.url, oURLParsingService),
+                    target: utilsCdm.toTargetFromHash(bookmark.url),
                     indicatorDataSource: {
                         path: bookmark.serviceUrl,
                         refresh: bookmark.serviceRefreshInterval
@@ -1425,7 +1419,7 @@ sap.ui.define([
                     oVizRef.contentProviderId = sContentProviderId;
                 }
 
-                var oVizData = this._getVisualizationData(pageId, undefined, {}, oVizRef, {}, oVizTypes, oURLParsingService, oSystemContext);
+                var oVizData = this._getVisualizationData(pageId, undefined, {}, oVizRef, {}, oVizTypes, oSystemContext);
 
                 // Find page & section
                 var iPageIndex = parseInt(/pages\/(\d+)/.exec(pagePath)[1], 10);
@@ -1561,9 +1555,9 @@ sap.ui.define([
         // for bookmarks it is sufficient to check the vizReferences as the properties of interest
         // don't come from other CDM entities like app or visualization
         var aVizReferences = [];
-        return this._oURLParsingServicePromise
-            .then(function (oURLParsingService) {
-                var oTarget = utilsCdm.toTargetFromHash(oIdentifier.url, oURLParsingService);
+        return Promise.resolve()
+            .then(function () {
+                var oTarget = utilsCdm.toTargetFromHash(oIdentifier.url);
                 oTarget = readUtils.harmonizeTarget(oTarget);
                 return this._visitVizReferences(function (oVizReference, oSection, oPage) {
                     if (oVizReference.isBookmark &&
@@ -1685,12 +1679,10 @@ sap.ui.define([
         }
         var iUpdateCounter = 0;
         return Promise.all([
-            this._oURLParsingServicePromise,
             this._findBookmarks(oIdentifier)
         ])
             .then(function (aResult) {
-                var oURLParsingService = aResult[0];
-                var aVizReferencesToUpdate = aResult[1];
+                var aVizReferencesToUpdate = aResult[0];
 
                 // the updateVisualization function is not mass capable so we make sure that the
                 // calls are sequentialized so that there can be no race conditions
@@ -1721,7 +1713,7 @@ sap.ui.define([
                                 oVisualizationData.title = oParameters.title;
                             }
                             if (oParameters.url) {
-                                oVisualizationData.target = readUtils.harmonizeTarget(utilsCdm.toTargetFromHash(oParameters.url, oURLParsingService));
+                                oVisualizationData.target = readUtils.harmonizeTarget(utilsCdm.toTargetFromHash(oParameters.url));
                             }
 
                             return this.updateVisualization(iPageIndex, oLocation.sectionIndex, oLocation.vizIndexes[0], oVisualizationData);
@@ -1775,15 +1767,13 @@ sap.ui.define([
                 return Promise.all([
                     oCdmService.getCachedVisualizations(),
                     oCdmService.getApplications(),
-                    oCdmService.getCachedVizTypes(),
-                    this._oURLParsingServicePromise
+                    oCdmService.getCachedVizTypes()
                 ]);
-            }.bind(this))
+            })
             .then(function (aResult) {
                 var oVisualizations = aResult[0];
                 var oApplications = aResult[1];
                 var oVizTypes = aResult[2];
-                var oURLParsingService = aResult[3];
 
                 var oPageModel = this._oPagesModel.getProperty("/pages/" + iPageIndex);
                 var oSectionModel = oPageModel.sections[iSourceSectionIndex];
@@ -1837,8 +1827,7 @@ sap.ui.define([
                 // like the vizType or the _instantiationData
                 extend(oUpdatedVisualization, oChangedProperties);
                 var oVizRef = readUtils.getVizRef(oUpdatedVisualization);
-                oUpdatedVisualization = this._getVisualizationData(oPageModel.id, oVizRef.vizId,
-                    oVisualizations, oVizRef, oApplications, oVizTypes, oURLParsingService);
+                oUpdatedVisualization = this._getVisualizationData(oPageModel.id, oVizRef.vizId, oVisualizations, oVizRef, oApplications, oVizTypes);
                 aSourceSectionVisualizations[iSourceVisualizationIndex] = oUpdatedVisualization;
 
                 this._oPagesModel.refresh();