@sapui5/sap.ushell 1.112.3 → 1.113.0

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

@@ -1,10 +1,10 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The Unified Shell's personalization service, which provides generic read and write access to the currently logged on user's
  * personalization settings for the app currently executed in the shell.
  *
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -116,8 +116,8 @@ sap.ui.define([
      * @private
      */
     Personalization.prototype._configureAppVariantStorage = function (oAppVariantStorageConfig) {
-        var that = this,
-            sDefaultAppVariantAdapter = "sap.ushell.adapters.AppVariantPersonalizationAdapter";
+        var that = this;
+        var sDefaultAppVariantAdapter = "sap.ushell.adapters.AppVariantPersonalizationAdapter";
 
         if (!oAppVariantStorageConfig) {
             // default
@@ -128,8 +128,8 @@ sap.ui.define([
             return;
         }
 
-        var sAdapterModuleName = (oAppVariantStorageConfig.adapter && oAppVariantStorageConfig.adapter.module) || sDefaultAppVariantAdapter,
-            sAdapterModulePath = sAdapterModuleName.split(".").join("/");
+        var sAdapterModuleName = (oAppVariantStorageConfig.adapter && oAppVariantStorageConfig.adapter.module) || sDefaultAppVariantAdapter;
+        var sAdapterModulePath = sAdapterModuleName.split(".").join("/");
 
         // lazy load
         var fnCreate = function () {
@@ -201,7 +201,7 @@ sap.ui.define([
      *   oScope.clientStorageAllowed : Defines if storage on client side should be allowed or not<br/>
      *   oScope.shared: Indicates the container is intended to be shared across multiple applications<br/>
      *   E.g. <code> { validity : 30}</code> indicates a validity of the data for 30 minutes.
-     * @param {sap.ui.core.Component} oComponent Since 1.27.0.
+     * @param {sap.ui.core.Component} [oComponent] Since 1.27.0.
      *   SAPUI5 component which uses the personalizer. This allows to associate the stored data with the application.
      * @returns {object} {@link sap.ushell.services.Personalizer} which provides generic read and write access to
      *   the currently logged on user's personalization settings.
@@ -367,30 +367,24 @@ sap.ui.define([
     };
 
     Personalization.prototype._createContainer = function (sContainerKey, oScope, bCreateEmpty, oComponent) {
-        var that = this,
-            oTransientAdapter,
-            oPersistentAdapter,
-            oChosenAdapter,
-            oAdjustedScope,
-            sPrefixedContainerKey,
-            bUseAppVariantStorage,
-            oDeferred = new jQuery.Deferred();
+        var that = this;
+        var oDeferred = new jQuery.Deferred();
 
         if (typeof sContainerKey !== "string") {
             throw new utils.Error("sContainerKey is not a string: sap.ushell.services.Personalization", " " /* Empty string for missing component information */);
         }
 
-        bUseAppVariantStorage = !!(
+        var bUseAppVariantStorage = !!(
             personalizationUtils.isAppVariant(oComponent)
             && (!oScope || !oScope.shared)
             && this._oAppVariantAdapterWithBackendAdapter
         );
 
         // -- adjust scope
-        oAdjustedScope = personalizationUtils.adjustScope(oScope);
+        var oAdjustedScope = personalizationUtils.adjustScope(oScope);
 
         // -- add prefix
-        sPrefixedContainerKey = personalizationUtils.addContainerPrefix(sContainerKey);
+        var sPrefixedContainerKey = personalizationUtils.addContainerPrefix(sContainerKey);
 
         if (bUseAppVariantStorage) {
             var oManifest = oComponent.getManifestObject();
@@ -403,16 +397,16 @@ sap.ui.define([
         }
 
         // -- choose adapter
-        oPersistentAdapter = bUseAppVariantStorage
+        var oPersistentAdapter = bUseAppVariantStorage
             ? this._oAppVariantAdapterWithBackendAdapter
             : this._oAdapterWithBackendAdapter;
-        oTransientAdapter = that._oAdapterWindowOnly;
+        var oTransientAdapter = that._oAdapterWindowOnly;
 
-        oChosenAdapter = personalizationUtils.pickAdapter(oScope, oTransientAdapter, oPersistentAdapter);
+        var oChosenAdapter = personalizationUtils.pickAdapter(oScope, oTransientAdapter, oPersistentAdapter);
 
         personalizationUtils.loadAdapter(oChosenAdapter).then(function (oLoadedAdapter) {
-            var oLoadPromise,
-                oContextContainer = new ContextContainer(that, oLoadedAdapter, sPrefixedContainerKey, oAdjustedScope, oComponent);
+            var oLoadPromise;
+            var oContextContainer = new ContextContainer(that, oLoadedAdapter, sPrefixedContainerKey, oAdjustedScope, oComponent);
 
             // Historically, a sequence getContainer / load was always called.
 
@@ -461,15 +455,14 @@ sap.ui.define([
      */
     Personalization.prototype.delContainer = function (sContainerKey, oScope) {
         // delete the bag, the adapter container & the container
-        var oDeferred = {},
-            oPrior,
-            sPrefixedContainerKey = "",
-            that = this;
+        var oDeferred = {};
+        var sPrefixedContainerKey = "";
+        var that = this;
         oScope = that._adjustScope(oScope);
         sPrefixedContainerKey = personalizationUtils.addContainerPrefix(sContainerKey);
         oDeferred = new jQuery.Deferred();
 
-        oPrior = that._pendingContainerOperations_cancelAddNext(sContainerKey, null);
+        var oPrior = that._pendingContainerOperations_cancelAddNext(sContainerKey, null);
         oPrior.always(function () {
             that.getContainer(sContainerKey, oScope) // delays to oPrior! registers a new op!
                 .fail(function () {
@@ -503,9 +496,7 @@ sap.ui.define([
 
     // return old promise, add oDeferred as new, if null, retain old!
     Personalization.prototype._pendingContainerOperations_flushAddNext = function (sContainerKey, oDeferred) {
-        var oPendingOpDeferred,
-            fnSave;
-        oPendingOpDeferred = this._oPendingOperationsMap.get(sContainerKey);
+        var oPendingOpDeferred = this._oPendingOperationsMap.get(sContainerKey);
         if (!oPendingOpDeferred) {
             oPendingOpDeferred = new jQuery.Deferred();
             oPendingOpDeferred.resolve();
@@ -519,7 +510,7 @@ sap.ui.define([
         clearTimeout(oPendingOpDeferred._sapTimeoutId); //system function!
         oPendingOpDeferred._sapTimeoutId = undefined;
         if (typeof oPendingOpDeferred._sapFnSave === "function") {
-            fnSave = oPendingOpDeferred._sapFnSave;
+            var fnSave = oPendingOpDeferred._sapFnSave;
             oPendingOpDeferred._sapFnSave = undefined; // function can only be triggered at most one time
             fnSave();
         }
@@ -556,11 +547,11 @@ sap.ui.define([
      * The sole differences are w.r.t. client side handling of the Context data within one session.
      *
      * If you want to use the variant interface, use the following pattern
-     *   <code>
+     * <pre>
      *   getContainer(sContainerKey).done(function(oContainer) {
      *     var variantSetAdapter = new Personalization.VariantSetAdapter(oContainer);
      *   }
-     *   </code>
+     * </pre>
      *
      * Factory method to obtain a personalization container object which is a client-local buffer for personalization data.
      * The Container data is asynchronously read on creation (if present, otherwise an initial object is created).
@@ -597,9 +588,9 @@ sap.ui.define([
      * @since 1.18.0
      */
     Personalization.prototype.getPersonalizationContainer = function (sContainerKey) {
-        var sPrefixedContainerKey = "",
-            oPromiseContainer = {},
-            oDeferred = {};
+        var sPrefixedContainerKey = "";
+        var oPromiseContainer = {};
+        var oDeferred = {};
 
         if (typeof sContainerKey !== "string") {
             throw new utils.Error("sContainerKey is not a string: sap.ushell.services.Personalization", " "); // Empty string for missing component information
@@ -640,9 +631,9 @@ sap.ui.define([
      */
     Personalization.prototype.delPersonalizationContainer = function (sContainerKey) {
         // delete the bag, the adapter container & the container
-        var oDeferred = {},
-            sPrefixedContainerKey = "",
-            that = this;
+        var oDeferred = {};
+        var sPrefixedContainerKey = "";
+        var that = this;
 
         sPrefixedContainerKey = personalizationUtils.addContainerPrefix(sContainerKey);
         oDeferred = new jQuery.Deferred();

package/src/main/js/sap/ushell/services/PluginManager.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 PluginManager service, which allows you to handle the loading of Fiori Launchpad plugins.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -279,12 +279,12 @@ sap.ui.define([
         /**
          * Returns a map of all the plugins which are registered with the PluginManager sorted by supported plugin categories.
          *
-         * <code>
+         * <pre>
          * {
          *   "PluginCategoryA": [oPluginX, oPluginY, oPluginZ],
          *   "PluginCategoryB": [oPluginG]
          * }
-         * </code>
+         * </pre>
          *
          * @returns {object} Map of registered plugins
          * @since 1.38

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

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview resolves references
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -582,7 +582,7 @@ sap.ui.define([
          */
         this._loadDynamicDateRange = function () {
             return sap.ui.getCore()
-            .loadLibrary("sap/ui/unified", {async: true})
+            .loadLibrary("sap.ui.unified", {async: true})
             .then(function () {
                 return new Promise(function (fnResolve) {
                     sap.ui.require(["sap/m/DynamicDateRange"], function (oDynamicDateRange) {
@@ -675,6 +675,7 @@ sap.ui.define([
                         });
                         Log.debug(
                             "Resolving semantic date ranges \n" +
+                            "- OData Version: " + sODataVersion + "\n" +
                             "- URL: " + sUrl + "\n" +
                             "- ignoring references: " + JSON.stringify(aIgnoredReferences, null, 4) + "\n" +
                             "- resolved semantic date ranges: " + JSON.stringify(aResolvedSemanticDateRanges, null, 4) + "\n" +

package/src/main/js/sap/ushell/services/Search.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 search service which provides Enterprise Search via SINA.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/services/SearchCEP.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 Search for myHome.
  *
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/services/SearchableContent.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 the searchable content.
- * @version 1.112.3
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/ushell/Config",
@@ -12,7 +12,8 @@ sap.ui.define([
     "sap/base/util/values",
     "sap/ushell/library",
     "sap/ushell/adapters/cdm/v3/_LaunchPage/readVisualizations",
-    "sap/base/Log"
+    "sap/base/Log",
+    "sap/ushell/utils/UrlParsing"
 ], function (
     Config,
     readApplications,
@@ -21,10 +22,12 @@ sap.ui.define([
     objectValues,
     ushellLibrary,
     readVisualizations,
-    Log
+    Log,
+    urlParsing
 ) {
     "use strict";
 
+    // shortcut for sap.ushell.DisplayFormat
     var DisplayFormat = ushellLibrary.DisplayFormat;
 
     /**
@@ -42,7 +45,7 @@ sap.ui.define([
      * @private
      * @ui5-restricted sap.esh.search.ui
      */
-    var SearchableContent = function () {};
+    var SearchableContent = function () { };
     SearchableContent.COMPONENT_NAME = "sap/ushell/services/SearchableContent";
 
     /**
@@ -93,7 +96,15 @@ sap.ui.define([
                 .then(this._filterGetApps);
         }
         return this._getLaunchPageAppData()
-            .then(this._filterGetApps);
+            .then(this._filterGetApps)
+            .then(function (aApps) {
+                Log.debug("SearchableContent@getApps in classic mode found " + aApps.length + " apps");
+                return aApps;
+            })
+            .catch(function (oError) {
+                Log.error("SearchableContent@getApps in classic mode failed", oError);
+                return Promise.reject(oError);
+            });
     };
 
     /**
@@ -241,37 +252,36 @@ sap.ui.define([
      * @private
      */
     SearchableContent.prototype._collectLaunchPageTiles = function () {
-        return new Promise(function (resolve, reject) {
-            this._oLaunchPageService.getCatalogs().then(function (aCatalogs) {
-                var aCatalogTileDeferreds = [];
-                aCatalogs.forEach(function (oCatalog) {
-                    aCatalogTileDeferreds.push(this._oLaunchPageService.getCatalogTiles(oCatalog));
-                }.bind(this));
-
-                var oGroupTileDeferred = this._oLaunchPageService.getGroups().then(function (aGroups) {
-                    var aTiles = [];
-                    aGroups.forEach(function (oGroup) {
-                        Array.prototype.push.apply(aTiles, this._oLaunchPageService.getGroupTiles(oGroup) || []);
-                    }.bind(this));
-                    return aTiles;
-                }.bind(this));
-
-                Promise.all([
-                    Promise.all(aCatalogTileDeferreds),
-                    oGroupTileDeferred
-                ]).then(function (aResults) {
-                    var aCatalogTileResults = aResults[0];
-                    var aGroupTiles = aResults[1];
-                    var aCatalogTiles = [];
-
-                    aCatalogTileResults.forEach(function (aResult) {
-                        Array.prototype.push.apply(aCatalogTiles, aResult);
-                    });
+        var oGroupTilesPromise = this._oLaunchPageService.getGroups().then(function (aGroups) {
+            return aGroups.reduce(function (oTilesPromise, oGroup) {
+                return Promise.all([
+                    oTilesPromise,
+                    this._oLaunchPageService.getGroupTilesForSearch(oGroup)
+                ]).then(function (aTileResults) {
+                    var aTiles = aTileResults[0];
+                    var aGroupTiles = aTileResults[1];
+                    return aTiles.concat(aGroupTiles);
+                });
+            }.bind(this), Promise.resolve([]));
+        }.bind(this));
 
-                    resolve([aCatalogTiles, aGroupTiles]);
+        var oCatalogTilesPromise = this._oLaunchPageService.getCatalogs().then(function (aCatalogs) {
+            return aCatalogs.reduce(function (oTilesPromise, oGroup) {
+                return Promise.all([
+                    oTilesPromise,
+                    this._oLaunchPageService.getCatalogTiles(oGroup)
+                ]).then(function (aTileResults) {
+                    var aTiles = aTileResults[0];
+                    var aCatalogTiles = aTileResults[1];
+                    return aTiles.concat(aCatalogTiles);
                 });
-            }.bind(this));
+            }.bind(this), Promise.resolve([]));
         }.bind(this));
+
+        return Promise.all([
+            oCatalogTilesPromise,
+            oGroupTilesPromise
+        ]);
     };
 
     /**
@@ -282,8 +292,8 @@ sap.ui.define([
      * @private
      */
     SearchableContent.prototype._getPagesAppData = function () {
-        var oAppData,
-            oSite;
+        var oAppData;
+        var oSite;
 
         return sap.ushell.Container.getServiceAsync("CommonDataModel")
             .then(function (oCdmService) {
@@ -292,7 +302,6 @@ sap.ui.define([
                     oCdmService.getApplications(),
                     oCdmService.getVisualizations(),
                     oCdmService.getVizTypes(),
-                    sap.ushell.Container.getServiceAsync("URLParsing"),
                     sap.ushell.Container.getServiceAsync("ClientSideTargetResolution")
                 ]);
             })
@@ -301,8 +310,7 @@ sap.ui.define([
                 var oApplications = aResult[1];
                 var oVisualizations = aResult[2];
                 var oVizTypes = aResult[3];
-                var oUrlParsingService = aResult[4];
-                var oCSTRService = aResult[5];
+                var oCSTRService = aResult[4];
 
                 oSite = {
                     applications: oApplications,
@@ -311,9 +319,9 @@ sap.ui.define([
                 };
                 oAppData = {};
 
-                this._applyCdmVisualizations(oSite, oAppData, oUrlParsingService);
-                this._applyCdmPages(oSite, aPages, oAppData, oUrlParsingService);
-                return this._filterAppDataByIntent(oAppData, oUrlParsingService, oCSTRService);
+                this._applyCdmVisualizations(oSite, oAppData);
+                this._applyCdmPages(oSite, aPages, oAppData);
+                return this._filterAppDataByIntent(oAppData, oCSTRService);
             }.bind(this))
             .then(function () {
                 this._applyCdmApplications(oSite, oAppData);
@@ -326,16 +334,15 @@ sap.ui.define([
      * Manipulates the map of appData by filtering the entries out which don't have a valid intent
      * or aren't urls
      * @param {object} oAppData The map of appData
-     * @param {object} oUrlParsingService The URLParsing service
      * @param {object} oCSTRService The ClientSideTargetResolution service
      * @returns {Promise<void>} Promise which resolves after the filtering is done
      *
      * @since 1.78.0
      * @private
      */
-    SearchableContent.prototype._filterAppDataByIntent = function (oAppData, oUrlParsingService, oCSTRService) {
+    SearchableContent.prototype._filterAppDataByIntent = function (oAppData, oCSTRService) {
         var aIntentTargetPromises = Object.keys(oAppData).map(function (sIntent) {
-            return oUrlParsingService.isIntentUrlAsync(sIntent)
+            return urlParsing.isIntentUrlAsync(sIntent)
                 .then(function (bIsIntent) {
                     return bIsIntent ? sIntent : null;
                 });
@@ -385,7 +392,6 @@ sap.ui.define([
                     oAppData[sKey] = this._buildAppDataFromAppAndInbound(oApp, oInbound);
                     oAppData[sKey].visualizations = aVisualizations;
                     oAppData[sKey].target = aVisualizations[0].target;
-
                 } else {
                     oAppData[sKey] = this._buildAppDataFromViz(aVisualizations[0]);
                     oAppData[sKey].visualizations = aVisualizations;
@@ -401,12 +407,11 @@ sap.ui.define([
      * Manipulates the map of appData by adding visualizations from the cdm site
      * @param {object} oSite The cdm site containing at least applications and visualizations
      * @param {object} oAppData The map of appData
-     * @param {object} oUrlParsingService The URLParsing service
      *
      * @since 1.78.0
      * @private
      */
-    SearchableContent.prototype._applyCdmVisualizations = function (oSite, oAppData, oUrlParsingService) {
+    SearchableContent.prototype._applyCdmVisualizations = function (oSite, oAppData) {
         Object.keys(oSite.visualizations).forEach(function (sKey) {
             try {
                 var oVizReference = {
@@ -415,7 +420,7 @@ sap.ui.define([
                     // some tiles might only support standardWide and not standard. this is handled by getVizData
                     displayFormatHint: DisplayFormat.Standard
                 };
-                var oVizData = readUtils.getVizData(oSite, oVizReference, oUrlParsingService);
+                var oVizData = readUtils.getVizData(oSite, oVizReference /*, oSystemContext*/);
                 this._changeVizType(oVizData);
 
                 var sTarget = oVizData.targetURL;
@@ -443,17 +448,15 @@ sap.ui.define([
      * @param {object} oSite The cdm site containing at least applications and visualizations
      * @param {object[]} aPages The list of pages
      * @param {object} oAppData The map of appData
-     * @param {object} oUrlParsingService The URLParsing service
      *
      * @since 1.77.0
      * @private
      */
-    SearchableContent.prototype._applyCdmPages = function (oSite, aPages, oAppData, oUrlParsingService) {
+    SearchableContent.prototype._applyCdmPages = function (oSite, aPages, oAppData) {
         aPages.forEach(function (oPage) {
             var aVizReferences = readPages.getVisualizationReferences(oPage);
             aVizReferences.forEach(function (oVizReference) {
                 try {
-
                     // the search should display only standard tiles if possible, never flat tiles or links
                     // some tiles might only support standardWide and not standard. this is handled by getVizData
                     if (oVizReference.displayFormatHint && oVizReference.displayFormatHint !== DisplayFormat.Standard) {
@@ -463,7 +466,7 @@ sap.ui.define([
                         oVizReference.displayFormatHint = DisplayFormat.Standard;
                     }
 
-                    var oVizData = readUtils.getVizData(oSite, oVizReference, oUrlParsingService);
+                    var oVizData = readUtils.getVizData(oSite, oVizReference /*, oSystemContext*/);
                     this._changeVizType(oVizData);
 
                     var sTarget = oVizData.targetURL;
@@ -508,7 +511,6 @@ sap.ui.define([
         }
     };
 
-
     /**
      * Constructs an appData object based on an application and inbound
      * @param {object} oApp An application
@@ -567,7 +569,6 @@ sap.ui.define([
         // Filter all tiles that cannot be launched due to a missing target
         if (this._oLaunchPageService.getCatalogTileTargetURL(oLaunchPageTile) &&
             this._oLaunchPageService.isTileIntentSupported(oLaunchPageTile)) {
-
             oVizData = {
                 id: this._oLaunchPageService.getTileId(oLaunchPageTile)
                     || this._oLaunchPageService.getCatalogTileId(oLaunchPageTile),

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview Shell Navigation Service.