@sapui5/sap.ushell 1.118.0 → 1.119.2

package/src/main/js/sap/ushell/services/_UserRecents/RecentAppsUsage.js

@@ -2,15 +2,14 @@
 sap.ui.define([
     "./UserRecentsBase",
     "sap/base/Log",
-    "sap/ushell/utils",
-    "sap/ui/thirdparty/jquery"
-], function (UserRecentsBase, Log, utils, jQuery) {
+    "sap/ushell/utils"
+], function (UserRecentsBase, Log, utils) {
     "use strict";
 
     /**
      * User action collector counter of user usage of applications according to the URL hash.
      *
-     * @constructor
+     * @class
      * @private
      */
     var RecentAppsUsage = UserRecentsBase.extend("sap.ushell.services.RecentAppsUsage", {
@@ -31,36 +30,33 @@ sap.ui.define([
      * @private
      */
     RecentAppsUsage.prototype.init = function () {
-        var sCurrentDay = this.getDayFromDateObj(new Date());
-        var bDataLoadedTriggered = false;
-
-        if (this._oInitDeferred === undefined) {
-            this._oInitDeferred = new jQuery.Deferred();
-        }
-
-        // Personalized data not loaded yet
-        if (!bDataLoadedTriggered || sCurrentDay !== this.oAppsUsageData.recentDay) {
-            bDataLoadedTriggered = true;
-
-            // Load data
-            this._load()
-                .done(function (data) {
-                    // Initialize structure from the loaded data, or define new
-                    this.oAppsUsageData = data || {
-                        recentDay: null,
-                        recentAppsUsageMap: {}
-                    };
-
-                    // Update usage
-                    this.calculateInitialUsage(sCurrentDay);
-                    this._oInitDeferred.resolve(this.oAppsUsageData);
-                }.bind(this))
-                .fail(function () {
-                    Log.error("UShell-lib ; RecentAppsUsage ; Load data in Init failed");
-                    this._oInitDeferred.reject();
-                }.bind(this));
-        }
-        return this._oInitDeferred.promise();
+        return new Promise((resolve, reject) => {
+            const sCurrentDay = this.getDayFromDateObj(new Date());
+            let bDataLoadedTriggered = false;
+
+            // Personalized data not loaded yet
+            if (!bDataLoadedTriggered || sCurrentDay !== this.oAppsUsageData.recentDay) {
+                bDataLoadedTriggered = true;
+
+                // Load data
+                this._load()
+                    .then(data => {
+                        // Initialize structure from the loaded data, or define new
+                        this.oAppsUsageData = data || {
+                            recentDay: null,
+                            recentAppsUsageMap: {}
+                        };
+
+                        // Update usage
+                        this.calculateInitialUsage(sCurrentDay);
+                        resolve(this.oAppsUsageData);
+                    })
+                    .catch(() => {
+                        Log.error("UShell-lib ; RecentAppsUsage ; Load data in Init failed");
+                        reject();
+                    });
+            }
+        });
     };
 
     /**
@@ -98,13 +94,13 @@ sap.ui.define([
     RecentAppsUsage.prototype.addAppUsage = function (hash) {
         // Check hash validity
         if (!utils.validHash(hash)) {
-            return (new jQuery.Deferred()).reject("Non valid hash").promise();
+            return Promise.reject("Non valid hash");
         }
 
         return this.init()
-            .done(function () {
+            .then(() => {
                 // Get the data (usage per day) for the given hash
-                var aAppUsageArray = this.oAppsUsageData.recentAppsUsageMap[hash] || [];
+                const aAppUsageArray = this.oAppsUsageData.recentAppsUsageMap[hash] || [];
 
                 // New app that wasn't opened so far. Insert "1" since this is the first time it is opened
                 if (aAppUsageArray.length === 0) {
@@ -115,8 +111,8 @@ sap.ui.define([
                 }
                 this.oAppsUsageData.recentAppsUsageMap[hash] = aAppUsageArray;
                 this.saveAppsUsage(this.oAppsUsageData);
-            }.bind(this))
-            .fail(function () {
+            })
+            .catch(() => {
                 Log.error("Ushell-lib ; addAppUsage ; Initialization falied!");
             });
     };
@@ -125,19 +121,15 @@ sap.ui.define([
      * Summarises and returns the usage per hash and the minimum and maximum values
      */
     RecentAppsUsage.prototype.getAppsUsage = function () {
-        var result;
-        var oDeferred = new jQuery.Deferred();
-
-        this.init()
-            .done(function () {
-                result = this.summarizeUsage();
-                oDeferred.resolve(result);
-            }.bind(this))
-            .fail(function () {
-                oDeferred.reject("Not initialized yet");
-            });
-
-        return oDeferred.promise();
+        return new Promise((resolve, reject) => {
+            this.init()
+                .then(() => {
+                    resolve(this.summarizeUsage());
+                })
+                .catch(() => {
+                    reject("Not initialized yet");
+                });
+        });
     };
 
     RecentAppsUsage.prototype.summarizeUsage = function () {
@@ -157,7 +149,7 @@ sap.ui.define([
                 maxUsage = usageMap[hash];
             }
         }
-        return {usageMap: usageMap, maxUsage: maxUsage, minUsage: minUsage};
+        return { usageMap: usageMap, maxUsage: maxUsage, minUsage: minUsage };
     };
 
     RecentAppsUsage.prototype.addNewDay = function () {
@@ -202,7 +194,7 @@ sap.ui.define([
 
     RecentAppsUsage.prototype.saveAppsUsage = function (obj) {
         return this._save(obj)
-            .fail(function () {
+            .catch(() => {
                 Log.error("Ushell-lib ; saveAppsUsage ; Save action failed");
             });
     };

package/src/main/js/sap/ushell/services/_UserRecents/RecentsList.js

@@ -1,12 +1,11 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
-    "./UserRecentsBase",
-    "sap/ui/thirdparty/jquery"
-], function (UserRecentsBase, jQuery) {
+    "./UserRecentsBase"
+], function (UserRecentsBase) {
     "use strict";
 
     /**
-     * @constructor
+     * @class
      * @private
      */
     var RecentsList = UserRecentsBase.extend("sap.ushell.services.RecentsList");
@@ -48,45 +47,45 @@ sap.ui.define([
     };
 
     RecentsList.prototype.newItem = function (oItem) {
-        var oDeferred = new jQuery.Deferred();
-        var iTimestampNow = Date.now();
-        var bAlreadyIn;
-
-        this._load()
-            .done(function (aLoadedRecents) {
-                this.aRecents = aLoadedRecents || [];
-
-                bAlreadyIn = this._updateIfAlreadyIn(oItem, iTimestampNow);
-                if (!bAlreadyIn) {
-                    this._insertNew(oItem, iTimestampNow);
-                }
-
-                this._save(this.aRecents)
-                    .done(function () {
-                        oDeferred.resolve();
-                    })
-                    .fail(function () {
-                        oDeferred.reject();
-                    });
-            }.bind(this));
-
-        return oDeferred.promise();
+        return new Promise((resolve, reject) => {
+            const iTimestampNow = Date.now();
+            let bAlreadyIn;
+
+            this._load()
+                .then(aLoadedRecents => {
+                    this.aRecents = aLoadedRecents || [];
+
+                    bAlreadyIn = this._updateIfAlreadyIn(oItem, iTimestampNow);
+                    if (!bAlreadyIn) {
+                        this._insertNew(oItem, iTimestampNow);
+                    }
+
+                    this._save(this.aRecents)
+                        .then(() => {
+                            resolve();
+                        })
+                        .catch(errorMessage => {
+                            reject(errorMessage);
+                        });
+                });
+
+        });
     };
 
     RecentsList.prototype.getRecentItems = function () {
-        var oDeferred = new jQuery.Deferred();
-
-        this._load()
-            .done(function (aLoadedRecents) {
-                aLoadedRecents = aLoadedRecents || [];
-                aLoadedRecents.sort(UserRecentsBase._itemSorter);
-                this.aRecents = aLoadedRecents.slice(0, this.iMaxItems);
-                oDeferred.resolve(jQuery.map(this.aRecents, function (oRecentEntry) {
-                    return oRecentEntry.oItem;
-                }));
-            }.bind(this));
-
-        return oDeferred.promise();
+        return new Promise((resolve, reject) => {
+            this._load()
+                .then(aLoadedRecents => {
+                    aLoadedRecents = aLoadedRecents || [];
+                    aLoadedRecents.sort(UserRecentsBase._itemSorter);
+                    this.aRecents = aLoadedRecents.slice(0, this.iMaxItems);
+                    resolve(this.aRecents.map(oRecentEntry => oRecentEntry.oItem
+                    ));
+                })
+                .catch(errorMessage => {
+                    reject(errorMessage);
+                });
+        });
     };
 
     return RecentsList;

package/src/main/js/sap/ushell/services/_UserRecents/UserRecentsBase.js

@@ -1,16 +1,15 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/base/Object",
-    "sap/base/Log",
-    "sap/ui/thirdparty/jquery"
-], function (BaseObject, Log, jQuery) {
+    "sap/base/Log"
+], function (BaseObject, Log) {
     "use strict";
 
     var PERSONALIZATION_CONTAINER = "sap.ushell.services.UserRecents";
 
     /**
      * Base class for all helper classes.
-     * @constructor
+     * @class
      * @private
      */
     var UserRecentsBase = BaseObject.extend("sap.ushell.services.UserRecentsBase", {
@@ -31,41 +30,35 @@ sap.ui.define([
     });
 
     UserRecentsBase.prototype._load = function () {
-        var oDeferred = new jQuery.Deferred();
-
-        this._oPersonalizerPromise
-            .then(function (oPersonalizer) {
-                oPersonalizer.getPersData()
-                    .done(oDeferred.resolve)
-                    .fail(oDeferred.reject);
-            })
-            .catch(function (error) {
-                Log.error("Personalization service does not work:");
-                Log.error(error.name + ": " + error.message);
-
-                oDeferred.reject(error);
-            });
-
-        return oDeferred.promise();
+        return new Promise((resolve, reject) => {
+            this._oPersonalizerPromise
+                .then(oPersonalizer => {
+                    oPersonalizer.getPersData()
+                        .done(resolve)
+                        .fail(reject);
+                })
+                .catch(error => {
+                    Log.error("Personalization service does not work:");
+                    Log.error(error.name + ": " + error.message);
+                    reject(error);
+                });
+        });
     };
 
     UserRecentsBase.prototype._save = function (aList) {
-        var oDeferred = new jQuery.Deferred();
-
-        this._oPersonalizerPromise
-            .then(function (oPersonalizer) {
-                oPersonalizer.setPersData(aList)
-                    .done(oDeferred.resolve)
-                    .fail(oDeferred.reject);
-            })
-            .catch(function (error) {
-                Log.error("Personalization service does not work:");
-                Log.error(error.name + ": " + error.message);
-
-                oDeferred.reject(error);
-            });
-
-        return oDeferred.promise();
+        return new Promise((resolve, reject) => {
+            this._oPersonalizerPromise
+                .then(oPersonalizer => {
+                    oPersonalizer.setPersData(aList)
+                        .done(resolve)
+                        .fail(reject);
+                })
+                .catch(error => {
+                    Log.error("Personalization service does not work:");
+                    Log.error(error.name + ": " + error.message);
+                    reject(error);
+                });
+        });
     };
 
     UserRecentsBase._itemSorter = function (oItem1, oItem2) {

package/src/main/js/sap/ushell/services/_VisualizationInstantiation/VizInstance.js

@@ -51,7 +51,7 @@ sap.ui.define([
     var DisplayFormat = ushellLibrary.DisplayFormat;
 
     /**
-     * @constructor
+     * @class
      */
     var VizInstance = Control.extend("sap.ushell.ui.launchpad.VizInstance", /** @lends sap.ushell.ui.launchpad.VizInstance.prototype*/ {
         metadata: {

package/src/main/js/sap/ushell/services/_VisualizationInstantiation/VizInstanceAbap.js

@@ -17,7 +17,7 @@ sap.ui.define([
     var DisplayFormat = ushellLibrary.DisplayFormat;
 
     /**
-     * @constructor for a VizInstance for ABAP data
+     * @class for a VizInstance for ABAP data
      *
      * @extends sap.ushell.ui.launchpad.VizInstance
      * @name sap.ushell.ui.launchpad.VizInstanceAbap

package/src/main/js/sap/ushell/services/_VisualizationInstantiation/VizInstanceCdm.js

@@ -24,7 +24,7 @@ sap.ui.define([
     var LoadState = mobileLibrary.LoadState;
 
     /**
-     * @constructor for a VizInstance for CDM data
+     * @class for a VizInstance for CDM data
      *
      * @extends sap.ushell.ui.launchpad.VizInstance
      * @name sap.ushell.ui.launchpad.VizInstanceCDM

package/src/main/js/sap/ushell/services/_VisualizationInstantiation/VizInstanceLaunchPage.js

@@ -15,7 +15,7 @@ sap.ui.define([
      * retrieved from the SearchableContent service for the classic homepage.
      * Only functionality that is needed by the search UI is implemented.
      *
-     * @constructor for a VizInstance for Classic Homepage tiles
+     * @class for a VizInstance for Classic Homepage tiles
      *
      * @extends sap.ushell.ui.launchpad.VizInstance
      * @param {object} vizData The visualization entity
@@ -40,24 +40,26 @@ sap.ui.define([
     VizInstanceLaunchPage.prototype.load = function () {
         var oTile = this.getInstantiationData().launchPageTile;
         return sap.ushell.Container.getServiceAsync("LaunchPage")
-            .then(function (oLaunchPageService) {
-                return new Promise(function (resolve, reject) {
+            .then((oLaunchPageService) => {
+                return new Promise((resolve, reject) => {
+                    // The abap platform instantiates CatalogTiles by default as preview true.
+                    const bPreview = this.getPreview();
                     // on a classic homepage there can be different tiles where the data comes from different sources
                     // many of them will be catalog tiles but e.g. bookmarks are group tiles
                     // for catalog tiles
-                    oLaunchPageService.getCatalogTileViewControl(oTile)
+                    oLaunchPageService.getCatalogTileViewControl(oTile, bPreview)
                         .done(resolve)
-                        .fail(function () {
+                        .fail(() => {
                             // for group tiles
                             oLaunchPageService.getTileView(oTile)
                                 .done(resolve)
                                 .fail(reject);
                         });
-                }).then(function (oTileView) {
+                }).then((oTileView) => {
                     this._setDisplayFormatFromTileSize(oTile, oLaunchPageService);
                     this.setContent(oTileView);
-                }.bind(this));
-            }.bind(this));
+                });
+            });
     };
 
     /**

package/src/main/js/sap/ushell/services/_VisualizationInstantiation/VizInstanceLink.js

@@ -48,7 +48,7 @@ sap.ui.define([
      * @extends sap.m.GenericTile
      *
      * @author SAP SE
-     * @version 1.118.0
+     * @version 1.119.2
      * @since 1.84.0
      *
      * @private
@@ -173,7 +173,7 @@ sap.ui.define([
     /**
      * Destroys existing custom TileActions and adds them back.
      * This allows TileActionsProviders to change their tileActions
-     * @returns {Promise<void>} Resolves when the tileActions were added
+     * @returns {Promise<undefined>} Resolves when the tileActions were added
      * @private
      */
     VizInstanceLink.prototype._addCustomTileActions = function () {

package/src/main/js/sap/ushell/services/appstate/LimitedBuffer.js

@@ -11,8 +11,7 @@ sap.ui.define([], function () {
      * Values are added at the "end" of the circular buffer,
      * overwriting present values.
      * Lookup by key is done in reverse order.
-     * @param {integer} iCapacity The capacity
-     * @constructor
+     * @param {int} iCapacity The capacity
      * @class
      * @since 1.28.0
      * @private

package/src/main/js/sap/ushell/services/appstate/Sequentializer.js

@@ -24,7 +24,7 @@ sap.ui.define([
      * (note you may use obj.function.bind(obj, arg1, ...,  argN) to obtain a parameterless function)
      *
      * @param {function} fFn function to add to queue
-     * @return {object} next promise
+     * @returns {object} next promise
      * @private
      */
     Sequentializer.prototype.addToQueue = function (fFn) {

package/src/main/js/sap/ushell/support/plugins/flpConfig/FlpConfigurationPlugin.js

@@ -9,7 +9,7 @@
  * Fiori launchpad in a tree table separated by IconTabFilters for the first level properties of the configuration object.
  * Also it provides a search for last level properties.
  *
- * @version 1.118.0
+ * @version 1.119.2
  */
 sap.ui.define([
     "sap/ui/core/Core",

package/src/main/js/sap/ushell/themes/base/SearchCEP.less

@@ -21,6 +21,14 @@
   overflow: hidden scroll;
 }
 
+.sapUiTheme-sap_fiori_3 .searchCEPlistItemIcon {
+  color: #6a6d70 !important;
+}
+
+.sapUiTheme-sap_belize .searchCEPlistItemIcon {
+  color: #878787 !important;
+}
+
 .sapUshellCEPSearchCenter {
   margin: auto;
 }

package/src/main/js/sap/ushell/themes/base/ShellHeader.less

@@ -317,13 +317,13 @@ html[dir=rtl] .sapUiSizeCompact .sapUshellPopupContainer .sapMSLI {
   font-size: 0.75rem;
 }
 
-/* for size factors, the OpenUI5 phone, tablet, and desktop form factors are used;
-   see "sap.ui.Device.initRangeSet" for the breakpoint definitions. */
+/* for size factors the OpenUI5 phone, tablet, and desktop and LargeDesktop form factors and additionally
+  a shell specific form factor ExtraLargeDesktop are used;
+  see "sap.ui.Device.initRangeSet" for the breakpoint definitions for OpenUi5 and
+  see "sap.ushell.ui.ShellHeader.FLPRangeSet" for the shell specific breakpoint.
+*/
 
-.sapUiMedia-StdExt-LargeDesktop {
-  .sapUshellShellHeader {
-    padding: 0 2.75rem; /* 2.75 + 0.25 of the headbegin/headend === 48px according to the specification */
-  }
+.sapUiMedia-Ushell-ExtraLargeDesktop {
 
   .sapUshellShellHeadBegin,
   .sapUshellShellHeadEnd {
@@ -343,6 +343,12 @@ html[dir=rtl] .sapUiSizeCompact .sapUshellPopupContainer .sapMSLI {
   }
 }
 
+.sapUiMedia-StdExt-LargeDesktop {
+  .sapUshellShellHeader {
+    padding: 0 2.75rem; /* 2.75 + 0.25 of the headbegin/headend === 48px according to the specification */
+  }
+}
+
 .sapUiMedia-Std-Tablet {
   .sapUshellShellHeader {
     .sapUshellShellHeadTitle {

package/src/main/js/sap/ushell/themes/base/WorkPage.less

@@ -17,11 +17,41 @@
   }
 }
 
-.workPageTitle {
-  margin-left: 2.35rem;
-  margin-right: 2.35rem;
+[data-wp-breakpoint="lt-lp-4"],
+[data-wp-breakpoint="lt-sp-4"],
+[data-wp-breakpoint="st-lp-4"],
+[data-wp-breakpoint="st-sp-4"] {
+  .workPageTitle {
+    margin-left: 2.375rem;
+    margin-right: 2.375rem;
+  }
+}
+[data-wp-breakpoint="lt-lp-3"],
+[data-wp-breakpoint="lt-sp-3"],
+[data-wp-breakpoint="st-lp-3"],
+[data-wp-breakpoint="st-sp-3"],
+[data-wp-breakpoint="lt-lp-2"],
+[data-wp-breakpoint="lt-sp-2"],
+[data-wp-breakpoint="st-lp-2"],
+[data-wp-breakpoint="st-sp-2"] {
+  .workPageTitle {
+    margin-left: 2rem;
+    margin-right: 2rem;
+  }
+}
 
-  [data-wp-breakpoint="st-sp-1"] & {
+[data-wp-breakpoint="lt-lp-1"],
+[data-wp-breakpoint="lt-sp-1"],
+[data-wp-breakpoint="st-lp-1"],
+[data-wp-breakpoint="st-sp-1"] {
+  .workPageTitle {
+    margin-left: 1.75rem;
+    margin-right: 1.75rem;
+  }
+}
+
+[data-wp-breakpoint="st-sp-0"] {
+  .workPageTitle {
     margin-left: 0.5rem;
     margin-right: 0.5rem;
   }

package/src/main/js/sap/ushell/themes/base/WorkPageCell.less

@@ -7,9 +7,10 @@
   margin-left: 0.5rem;
   margin-right: 0.5rem;
 
+  [data-wp-breakpoint="st-sp-0"] &,
   [data-wp-breakpoint="st-sp-1"] &,
   [data-wp-breakpoint="st-lp-1"] &,
-  [data-wp-breakpoint="lt-sp-1"] {
+  [data-wp-breakpoint="lt-sp-1"] & {
     margin-left: 0;
     margin-right: 0;
   }
@@ -102,6 +103,7 @@
 
 [data-wp-breakpoint="lt-sp-1"],
 [data-wp-breakpoint="st-sp-1"],
+[data-wp-breakpoint="st-sp-0"],
 [data-wp-breakpoint="lt-sp-2"],
 [data-wp-breakpoint="st-sp-2"],
 [data-wp-breakpoint="lt-sp-3"],