@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.138.1
+ * @version 1.139.0
  * @deprecated since 1.120
  */
 sap.ui.define([
@@ -15,7 +15,7 @@ sap.ui.define([
     "sap/base/util/deepClone",
     "sap/base/util/deepExtend",
     "sap/base/Log"
-], function (
+], (
     EventBus,
     jQuery,
     Config,
@@ -24,14 +24,14 @@ sap.ui.define([
     deepClone,
     deepExtend,
     Log
-) {
+) => {
     "use strict";
 
-    var sModuleName = "sap.ushell.services.Bookmark";
-    var LEGACY_HANA_CATALOG_ID = "X-SAP-UI2-HANA:hana?remoteId=HANA_CATALOG";
+    const sModuleName = "sap.ushell.services.Bookmark";
+    const LEGACY_HANA_CATALOG_ID = "X-SAP-UI2-HANA:hana?remoteId=HANA_CATALOG";
 
     // shortcut for sap.ushell.ContentNodeType
-    var ContentNodeType = ushellLibrary.ContentNodeType;
+    const ContentNodeType = ushellLibrary.ContentNodeType;
 
     /**
      * @alias sap.ushell.services.Bookmark
@@ -78,28 +78,27 @@ sap.ui.define([
          * @private
          */
         this._addBookmarkToContentNodes = function (oBookmarkParams, aContentNodes, bCustom, sContentProviderId) {
-            var aPromises = aContentNodes.map(function (oContentNode) {
+            const aPromises = aContentNodes.map((oContentNode) => {
                 if (oContentNode && oContentNode.hasOwnProperty("type") && oContentNode.isContainer) {
                     switch (oContentNode.type) {
                         case ContentNodeType.Page:
                             return this.addBookmarkToPage(oBookmarkParams, oContentNode.id, sContentProviderId);
                         case ContentNodeType.HomepageGroup:
-                            return new Promise(function (resolve, reject) {
-                                this._oLaunchPageServicePromise.then(function (LaunchPageService) {
+                            return new Promise((resolve, reject) => {
+                                this._oLaunchPageServicePromise.then((LaunchPageService) => {
                                     LaunchPageService.getGroupById(oContentNode.id)
                                         .done(resolve)
                                         .fail(reject);
                                 });
-                            }.bind(this))
-                                .then(function (oGroup) {
-                                    return this.addBookmarkToHomepageGroup(oBookmarkParams, oGroup, bCustom, sContentProviderId);
-                                }.bind(this));
+                            }).then((oGroup) => {
+                                return this.addBookmarkToHomepageGroup(oBookmarkParams, oGroup, bCustom, sContentProviderId);
+                            });
                         default:
-                            return Promise.reject("Bookmark Service: The API needs to be called with a valid content node type. '" + oContentNode.type + "' is not supported.");
+                            return Promise.reject(`Bookmark Service: The API needs to be called with a valid content node type. '${oContentNode.type}' is not supported.`);
                     }
                 }
                 return Promise.reject("Bookmark Service: Not a valid content node.");
-            }.bind(this));
+            });
 
             return Promise.all(aPromises);
         };
@@ -190,10 +189,10 @@ sap.ui.define([
          * @public
          */
         this.addBookmark = function (oParameters, vContainer, sContentProviderId) {
-            var oDeferred = new jQuery.Deferred();
-            var bEnablePersonalization = Config.last("/core/shell/enablePersonalization");
-            var bEnableSpace = Config.last("/core/spaces/enabled");
-            var bEnableMyHome = Config.last("/core/spaces/myHome/enabled");
+            const oDeferred = new jQuery.Deferred();
+            const bEnablePersonalization = Config.last("/core/shell/enablePersonalization");
+            const bEnableSpace = Config.last("/core/spaces/enabled");
+            const bEnableMyHome = Config.last("/core/spaces/myHome/enabled");
 
             // Ignore call and do not complain if personalization is disabled
             if (!bEnablePersonalization && (!bEnableSpace || !bEnableMyHome)) {
@@ -204,22 +203,22 @@ sap.ui.define([
                 .then(() => {
                     return this._changeUrlStatesToPersistent(oParameters.url);
                 })
-                .then(function (sNewUrl) {
+                .then((sNewUrl) => {
                     oParameters.url = sNewUrl;
 
                     // Check if no container was provided and we are in spaces mode.
                     if (typeof vContainer === "undefined" && bEnableSpace) {
                         return sap.ushell.Container.getServiceAsync("Menu")
-                            .then(function (oMenuService) {
+                            .then((oMenuService) => {
                                 return oMenuService.getDefaultSpace();
                             })
-                            .then(function (oDefaultSpace) {
-                                var oDefaultPage = oDefaultSpace && oDefaultSpace.children && oDefaultSpace.children[0];
+                            .then((oDefaultSpace) => {
+                                const oDefaultPage = oDefaultSpace && oDefaultSpace.children && oDefaultSpace.children[0];
                                 return oDefaultPage;
                             })
-                            .then(function (oContentNode) {
+                            .then((oContentNode) => {
                                 return this._addBookmarkToContentNodes(oParameters, [oContentNode], false, sContentProviderId);
-                            }.bind(this));
+                            });
                     }
 
                     // Check if an old Launchpad Group object was provided instead of a content node
@@ -228,12 +227,12 @@ sap.ui.define([
                     }
 
                     // Make sure we always use an array of content nodes
-                    var aContentNodes = [].concat(vContainer);
+                    const aContentNodes = [].concat(vContainer);
 
                     return this._addBookmarkToContentNodes(oParameters, aContentNodes, false, sContentProviderId);
-                }.bind(this))
+                })
                 .then(oDeferred.resolve)
-                .catch(function (vError) {
+                .catch((vError) => {
                     Log.error("Error during Bookmark creation: ", vError, sModuleName);
                     oDeferred.reject(vError);
                 });
@@ -293,8 +292,8 @@ sap.ui.define([
          * @ui5-restricted ssuite.smartbusiness
          */
         this.addCustomBookmark = async function (sVizType, oConfig, vContentNodes, sContentProviderId) {
-            var oClonedConfig = deepClone(oConfig);
-            var oBookmarkConfig = deepExtend(oClonedConfig, {
+            const oClonedConfig = deepClone(oConfig);
+            const oBookmarkConfig = deepExtend(oClonedConfig, {
                 vizType: sVizType,
                 vizConfig: {
                     "sap.flp": {
@@ -312,7 +311,7 @@ sap.ui.define([
             oBookmarkConfig.url = await this._changeUrlStatesToPersistent(oBookmarkConfig.url);
 
             // Make sure we always use an array of content nodes
-            var aContentNodes = [].concat(vContentNodes);
+            const aContentNodes = [].concat(vContentNodes);
 
             return this._addBookmarkToContentNodes(oBookmarkConfig, aContentNodes, true, sContentProviderId);
         };
@@ -363,14 +362,14 @@ sap.ui.define([
         this.addBookmarkToHomepageGroup = function (oParameters, oGroup, bCustom, sContentProviderId) {
             // Reject if in launchpad spaces mode
             if (Config.last("/core/spaces/enabled")) {
-                var sError = "Bookmark Service: The API is not available in spaces mode.";
+                const sError = "Bookmark Service: The API is not available in spaces mode.";
                 return Promise.reject(sError);
             }
 
             // Delegate to launchpage service and publish event
-            return new Promise(function (resolve, reject) {
-                this._oLaunchPageServicePromise.then(function (LaunchPageService) {
-                    var oDeferred;
+            return new Promise((resolve, reject) => {
+                this._oLaunchPageServicePromise.then((LaunchPageService) => {
+                    let oDeferred;
 
                     if (bCustom) {
                         oDeferred = LaunchPageService.addCustomBookmark(oParameters, oGroup, sContentProviderId);
@@ -379,8 +378,8 @@ sap.ui.define([
                     }
 
                     oDeferred
-                        .done(function (oTile) {
-                            var oData = {
+                        .done((oTile) => {
+                            const oData = {
                                 tile: oTile,
                                 group: oGroup
                             };
@@ -389,7 +388,7 @@ sap.ui.define([
                         })
                         .fail(reject);
                 });
-            }.bind(this));
+            });
         };
 
         /**
@@ -439,9 +438,9 @@ sap.ui.define([
             }
 
             // Reject if personalization is disabled
-            var bEnablePersonalization = Config.last("/core/shell/enablePersonalization");
-            var bEnableMyHome = Config.last("/core/spaces/myHome/enabled");
-            var sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
+            const bEnablePersonalization = Config.last("/core/shell/enablePersonalization");
+            const bEnableMyHome = Config.last("/core/spaces/myHome/enabled");
+            const sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
             if (!bEnablePersonalization && (!bEnableMyHome || (bEnableMyHome && sPageId !== sMyHomePageId))) {
                 return Promise.reject("Bookmark Service: Add bookmark is not allowed as the personalization functionality is not enabled.");
             }
@@ -451,7 +450,7 @@ sap.ui.define([
             }
 
             // Delegate to pages service
-            return this._oPagesServicePromise.then(function (oPagesService) {
+            return this._oPagesServicePromise.then((oPagesService) => {
                 return oPagesService.addBookmarkToPage(sPageId, oParameters, undefined, sContentProviderId);
             });
         };
@@ -467,6 +466,8 @@ sap.ui.define([
          *   For list of parameters see the description for the addBookmark function
          * @param {string} [groupId]
          *   ID of the group the bookmark tile should be added to.
+         * @param {string} [sContentProviderId]
+         *   the content provider id.
          *
          * @returns {jQuery.Promise} Resolves on success, but rejects
          *   (with a reason-message) on failure to add the bookmark to the specified or implied group.
@@ -478,26 +479,26 @@ sap.ui.define([
          */
         this.addBookmarkByGroupId = function (oParameters, groupId, sContentProviderId) {
             // Reject if in launchpad spaces mode
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
             if (Config.last("/core/spaces/enabled")) {
-                var sError = "Bookmark Service: The API 'addBookmarkByGroupId' is not supported in launchpad spaces mode.";
+                const sError = "Bookmark Service: The API 'addBookmarkByGroupId' is not supported in launchpad spaces mode.";
                 return oDeferred.reject(sError).promise();
             }
 
             this._oLaunchPageServicePromise
-                .then(function (LaunchPageService) {
+                .then((LaunchPageService) => {
                     LaunchPageService.getGroups()
-                        .done(function (aGroups) {
-                            var oGroup = aGroups.find(function (entry) {
+                        .done((aGroups) => {
+                            const oGroup = aGroups.find((entry) => {
                                 return entry.id === groupId;
                             }) || null;
 
                             this.addBookmark(oParameters, oGroup, sContentProviderId)
                                 .done(oDeferred.resolve)
                                 .fail(oDeferred.reject);
-                        }.bind(this))
+                        })
                         .fail(oDeferred.reject);
-                }.bind(this))
+                })
                 .catch(oDeferred.reject);
 
             return oDeferred.promise();
@@ -516,19 +517,19 @@ sap.ui.define([
          * @private
          */
         this.getShellGroupIDs = function (bGetAll) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             // Reject if in launchpad spaces mode
             if (Config.last("/core/spaces/enabled")) {
-                var sError = "Bookmark Service: The API 'getShellGroupIDs' is not supported in launchpad spaces mode.";
+                const sError = "Bookmark Service: The API 'getShellGroupIDs' is not supported in launchpad spaces mode.";
 
                 return oDeferred.reject(sError).promise();
             }
 
-            this._oLaunchPageServicePromise.then(function (LaunchPageService) {
+            this._oLaunchPageServicePromise.then((LaunchPageService) => {
                 LaunchPageService.getGroupsForBookmarks(bGetAll)
-                    .done(function (aGroups) {
-                        aGroups = aGroups.map(function (group) {
+                    .done((aGroups) => {
+                        aGroups = aGroups.map((group) => {
                             return {
                                 id: LaunchPageService.getGroupId(group.object),
                                 title: group.title
@@ -557,41 +558,41 @@ sap.ui.define([
          */
         this._doAddCatalogTileToGroup = function (oDeferred, sCatalogTileId, oCatalog, sGroupId) {
             this._oLaunchPageServicePromise
-                .then(function (LaunchPageService) {
+                .then((LaunchPageService) => {
                     if (sGroupId) {
                         LaunchPageService.getGroups()
                             .fail(oDeferred.reject)
-                            .done(function (aGroups) {
-                                var bGroupFound = aGroups.some(function (oGroup) {
+                            .done((aGroups) => {
+                                const bGroupFound = aGroups.some((oGroup) => {
                                     if (LaunchPageService.getGroupId(oGroup) === sGroupId) {
                                         this._addToGroup(oCatalog, oDeferred, sCatalogTileId, oGroup);
                                         return true;
                                     }
-                                }.bind(this));
+                                });
 
                                 if (!bGroupFound) {
                                     // TODO: Consider adding the tile to the default group. This would
                                     // enable the user to add tiles if no valid group ID is available.
                                     // Take into account how the consumer app requests the group ids.
-                                    var sError = "Group '" + sGroupId + "' is unknown";
+                                    const sError = `Group '${sGroupId}' is unknown`;
                                     Log.error(sError, null, "sap.ushell.services.Bookmark");
                                     oDeferred.reject(sError);
                                 }
-                            }.bind(this));
+                            });
                     } else {
                         LaunchPageService.getDefaultGroup()
                             .fail(oDeferred.reject)
-                            .done(function (oGroup) {
+                            .done((oGroup) => {
                                 this._addToGroup(oCatalog, oDeferred, sCatalogTileId, oGroup);
-                            }.bind(this));
+                            });
                     }
-                }.bind(this));
+                });
 
             return oDeferred.promise();
         };
 
         this._isSameCatalogTile = function (sCatalogTileId, oCatalogTile, oLaunchPageService) {
-            var sIdWithPotentialSuffix = oLaunchPageService.getCatalogTileId(oCatalogTile);
+            const sIdWithPotentialSuffix = oLaunchPageService.getCatalogTileId(oCatalogTile);
 
             if (sIdWithPotentialSuffix === undefined) {
                 // prevent to call undefined.indexOf.
@@ -606,31 +607,31 @@ sap.ui.define([
 
         this._addToGroup = function (oCatalog, oDeferred, sCatalogTileId, oGroup) {
             return this._oLaunchPageServicePromise
-                .then(function (LaunchPageService) {
+                .then((LaunchPageService) => {
                     LaunchPageService.getCatalogTiles(oCatalog)
                         .fail(oDeferred.reject)
-                        .done(function (aCatalogTiles) {
-                            var sGroupId = LaunchPageService.getGroupId(oGroup);
-                            var bTileFound = aCatalogTiles.some(function (oCatalogTile) {
+                        .done((aCatalogTiles) => {
+                            const sGroupId = LaunchPageService.getGroupId(oGroup);
+                            const bTileFound = aCatalogTiles.some((oCatalogTile) => {
                                 if (this._isSameCatalogTile(sCatalogTileId, oCatalogTile, LaunchPageService)) {
                                     LaunchPageService.addTile(oCatalogTile, oGroup)
                                         .fail(oDeferred.reject)
-                                        .done(function () { // ignore argument oTile!
+                                        .done(() => { // ignore argument oTile!
                                             oDeferred.resolve();
                                             EventBus.getInstance().publish("sap.ushell.services.Bookmark", "catalogTileAdded", sGroupId);
                                         });
                                     return true;
                                 }
-                            }.bind(this));
+                            });
 
                             if (!bTileFound) {
-                                var sError = "No tile '" + sCatalogTileId + "' in catalog '"
-                                    + LaunchPageService.getCatalogId(oCatalog) + "'";
+                                const sError = `No tile '${sCatalogTileId}' in catalog '${
+                                    LaunchPageService.getCatalogId(oCatalog)}'`;
                                 Log.error(sError, null, "sap.ushell.services.Bookmark");
                                 oDeferred.reject(sError);
                             }
-                        }.bind(this));
-                }.bind(this));
+                        });
+                });
         };
 
         /**
@@ -657,8 +658,8 @@ sap.ui.define([
          * @deprecated since 1.112. Please use {@link sap.ushell.services.BookmarkV2#addBookmark} instead.
          */
         this.addCatalogTileToGroup = function (sCatalogTileId, sGroupId, oCatalogData) {
-            var oDeferred = new jQuery.Deferred();
-            var sError;
+            const oDeferred = new jQuery.Deferred();
+            let sError;
 
             Log.error("Deprecated API call of 'sap.ushell.Bookmark.addCatalogTileToGroup'. Please use 'addBookmark' instead",
                 null,
@@ -672,17 +673,17 @@ sap.ui.define([
             }
 
             this._oLaunchPageServicePromise
-                .then(function (LaunchPageService) {
-                    var fnMatcher = oCatalogData ? this._isMatchingRemoteCatalog : this._isLegacyHANACatalog;
+                .then((LaunchPageService) => {
+                    const fnMatcher = oCatalogData ? this._isMatchingRemoteCatalog : this._isLegacyHANACatalog;
 
                     oCatalogData = oCatalogData || { id: LEGACY_HANA_CATALOG_ID };
                     // TODO first determine the catalog, then call onCatalogTileAdded incl. its ID
                     LaunchPageService.onCatalogTileAdded(sCatalogTileId);
                     LaunchPageService.getCatalogs()
                         .fail(oDeferred.reject)
-                        .done(function (aCatalogs) {
-                            var oSourceCatalog;
-                            aCatalogs.forEach(function (oCatalog) {
+                        .done((aCatalogs) => {
+                            let oSourceCatalog;
+                            aCatalogs.forEach((oCatalog) => {
                                 if (fnMatcher(oCatalog, oCatalogData, LaunchPageService)) {
                                     if (!oSourceCatalog) {
                                         oSourceCatalog = oCatalog;
@@ -690,19 +691,19 @@ sap.ui.define([
                                         // Note: We use the first match. If more than one catalog matches
                                         // this might be the wrong one, resulting in a "missing tile"
                                         // error. However we log the multiple catalog match before.
-                                        Log.warning("More than one matching catalog: " + JSON.stringify(oCatalogData), null, "sap.ushell.services.Bookmark");
+                                        Log.warning(`More than one matching catalog: ${JSON.stringify(oCatalogData)}`, null, "sap.ushell.services.Bookmark");
                                     }
                                 }
                             });
                             if (oSourceCatalog) {
                                 this._doAddCatalogTileToGroup(oDeferred, sCatalogTileId, oSourceCatalog, sGroupId);
                             } else {
-                                sError = "No matching catalog found: " + JSON.stringify(oCatalogData);
+                                sError = `No matching catalog found: ${JSON.stringify(oCatalogData)}`;
                                 Log.error(sError, null, "sap.ushell.services.Bookmark");
                                 oDeferred.reject(sError);
                             }
-                        }.bind(this));
-                }.bind(this));
+                        });
+                });
 
             return oDeferred.promise();
         };
@@ -711,41 +712,38 @@ sap.ui.define([
          * Check if the bookmark parameters are valid.
          *
          * @param {object} oParameters The bookmark parameters
-         * @returns {Promise<undefined>} Rejects with an error message if invalid bookmark data is found.
+         * @returns {Promise} Rejects with an error message if invalid bookmark data is found.
          *
          * @since 1.112
          * @private
          */
-        this._checkBookmarkParameters = function (oParameters) {
-            return Promise.resolve()
-                .then(function () {
-                    if (!oParameters) {
-                        throw new Error("Invalid Bookmark Data: No bookmark parameters passed.");
-                    }
+        this._checkBookmarkParameters = async function (oParameters) {
+            if (!oParameters) {
+                throw new Error("Invalid Bookmark Data: No bookmark parameters passed.");
+            }
 
-                    var oDataSource = oParameters.dataSource;
-                    var sODataVersion;
-                    if (oDataSource) {
-                        if (oDataSource.type !== "OData") {
-                            throw new Error("Invalid Bookmark Data: Unknown data source type: " + oDataSource.type);
-                        }
+            const oDataSource = oParameters.dataSource;
+            let sODataVersion;
+            if (oDataSource) {
+                if (oDataSource.type !== "OData") {
+                    throw new Error(`Invalid Bookmark Data: Unknown data source type: ${oDataSource.type}`);
+                }
 
-                        sODataVersion = oDataSource.settings && oDataSource.settings.odataVersion;
-                        var aValidODataVersions = ["2.0", "4.0"];
-                        if (!aValidODataVersions.includes(sODataVersion)) {
-                            throw new Error("Invalid Bookmark Data: Unknown OData version in the data source: " + sODataVersion);
-                        }
-                    }
+                sODataVersion = oDataSource.settings && oDataSource.settings.odataVersion;
+                const aValidODataVersions = ["2.0", "4.0"];
+                if (!aValidODataVersions.includes(sODataVersion)) {
+                    throw new Error(`Invalid Bookmark Data: Unknown OData version in the data source: ${sODataVersion}`);
+                }
+            }
 
-                    if (oParameters.serviceUrl) {
-                        return sap.ushell.Container.getServiceAsync("ReferenceResolver")
-                            .then(function (oReferenceResolver) {
-                                if (oReferenceResolver.hasSemanticDateRanges(oParameters.serviceUrl) && !oDataSource) {
-                                    throw new Error("Invalid Bookmark Data: Provide a data source to use semantic date ranges.");
-                                }
-                            });
-                    }
-                });
+            if (oParameters.serviceUrl) {
+                return sap.ushell.Container.getServiceAsync("ReferenceResolver")
+                    .then((oReferenceResolver) => {
+                        if (oReferenceResolver.hasSemanticDateRanges(oParameters.serviceUrl) && !oDataSource) {
+                            throw new Error("Invalid Bookmark Data: Provide a data source to use semantic date ranges.");
+                        }
+                    });
+            }
         };
 
         /**
@@ -759,13 +757,15 @@ sap.ui.define([
          *   the catalog ID in the remote system
          * @param {string} oRemoteCatalogData.baseUrl
          *   the base URL of the catalog in the remote system
+         * @param {object} LaunchPageService
+         *   the launch page service
          *
          * @returns {boolean} Resolves to true if the given catalog data matches a remote catalog, otherwise it resolves to false.
          * @static
          * @private
          */
         this._isMatchingRemoteCatalog = function (oCatalog, oRemoteCatalogData, LaunchPageService) {
-            var oCatalogData = LaunchPageService.getCatalogData(oCatalog);
+            const oCatalogData = LaunchPageService.getCatalogData(oCatalog);
 
             // systemAlias is not considered yet, which might lead to multiple matches
             return oCatalogData.remoteId === oRemoteCatalogData.remoteId
@@ -798,17 +798,17 @@ sap.ui.define([
          * @public
          */
         this.countBookmarks = function (sUrl, sContentProviderId) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             if (Config.last("/core/spaces/enabled")) {
                 this._oPagesServicePromise
-                    .then(function (oPagesService) {
+                    .then((oPagesService) => {
                         return oPagesService.countBookmarks({ url: sUrl, contentProviderId: sContentProviderId });
                     })
                     .then(oDeferred.resolve, oDeferred.reject);
             } else {
                 this._oLaunchPageServicePromise
-                    .then(function (LaunchPageService) {
+                    .then((LaunchPageService) => {
                         LaunchPageService.countBookmarks(sUrl, sContentProviderId)
                             .done(oDeferred.resolve)
                             .fail(oDeferred.reject);
@@ -840,22 +840,18 @@ sap.ui.define([
          * @private
          * @ui5-restricted ssuite.smartbusiness
          */
-        this.countCustomBookmarks = function (oIdentifier) {
+        this.countCustomBookmarks = async function (oIdentifier) {
             if (!oIdentifier || !oIdentifier.url || !oIdentifier.vizType) {
                 return Promise.reject("countCustomBookmarks: Some required parameters are missing.");
             }
 
             if (Config.last("/core/spaces/enabled")) {
-                return this._oPagesServicePromise
-                    .then(function (oPagesService) {
-                        return oPagesService.countBookmarks(oIdentifier);
-                    });
+                const oPagesService = await this._oPagesServicePromise;
+                return oPagesService.countBookmarks(oIdentifier);
             }
 
-            return this._oLaunchPageServicePromise
-                .then(function (LaunchPageService) {
-                    return LaunchPageService.countCustomBookmarks(oIdentifier);
-                });
+            const oLaunchPageService = await this._oLaunchPageServicePromise;
+            return oLaunchPageService.countCustomBookmarks(oIdentifier);
         };
 
         /**
@@ -876,18 +872,18 @@ sap.ui.define([
          * @public
          */
         this.deleteBookmarks = function (sUrl, sContentProviderId) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             if (Config.last("/core/spaces/enabled")) {
                 this._oPagesServicePromise
-                    .then(function (oPagesService) {
+                    .then((oPagesService) => {
                         return oPagesService.deleteBookmarks({ url: sUrl, contentProviderId: sContentProviderId });
                     })
                     .then(oDeferred.resolve, oDeferred.reject);
             } else {
-                this._oLaunchPageServicePromise.then(function (LaunchPageService) {
+                this._oLaunchPageServicePromise.then((LaunchPageService) => {
                     LaunchPageService.deleteBookmarks(sUrl, sContentProviderId)
-                        .done(function (oResult) {
+                        .done((oResult) => {
                             EventBus.getInstance().publish("sap.ushell.services.Bookmark", "bookmarkTileDeleted", sUrl);
 
                             oDeferred.resolve(oResult);
@@ -927,17 +923,18 @@ sap.ui.define([
             }
             if (Config.last("/core/spaces/enabled")) {
                 return this._oPagesServicePromise
-                    .then(function (oPagesService) {
+                    .then((oPagesService) => {
                         return oPagesService.deleteBookmarks(oIdentifier);
                     });
             }
 
             return this._oLaunchPageServicePromise
-                .then(function (LaunchPageService) {
+                .then((LaunchPageService) => {
                     return LaunchPageService.deleteCustomBookmarks(oIdentifier);
                 })
-                .then(function () {
+                .then((iDeletedBookmarksCount) => {
                     EventBus.getInstance().publish("sap.ushell.services.Bookmark", "bookmarkTileDeleted", oIdentifier.url);
+                    return iDeletedBookmarksCount;
                 });
         };
 
@@ -996,14 +993,14 @@ sap.ui.define([
          * @public
          */
         this.updateBookmarks = function (sUrl, oParameters, sContentProviderId) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             if (Config.last("/core/spaces/enabled")) {
                 Promise.all([
                     this._oPagesServicePromise,
                     this._changeUrlStatesToPersistent(oParameters.url)
                 ])
-                    .then(function ([oPagesService, sNewUrl]) {
+                    .then(([oPagesService, sNewUrl]) => {
                         oParameters.url = sNewUrl;
                         return oPagesService.updateBookmarks({ url: sUrl, contentProviderId: sContentProviderId }, oParameters);
                     })
@@ -1013,7 +1010,7 @@ sap.ui.define([
                     this._oLaunchPageServicePromise,
                     this._changeUrlStatesToPersistent(oParameters.url)
                 ])
-                    .then(function ([LaunchPageService, sNewUrl]) {
+                    .then(([LaunchPageService, sNewUrl]) => {
                         oParameters.url = sNewUrl;
                         LaunchPageService.updateBookmarks(sUrl, oParameters, sContentProviderId)
                             .done(oDeferred.resolve)
@@ -1083,7 +1080,7 @@ sap.ui.define([
                 return Promise.reject("deleteCustomBookmarks: Some required parameters are missing.");
             }
 
-            var oBookmarkConfig = deepExtend({}, oConfig, {
+            const oBookmarkConfig = deepExtend({}, oConfig, {
                 vizConfig: {
                     "sap.flp": {
                         chipConfig: oConfig.chipConfig
@@ -1101,13 +1098,13 @@ sap.ui.define([
 
             if (Config.last("/core/spaces/enabled")) {
                 return this._oPagesServicePromise
-                    .then(function (oPagesService) {
+                    .then((oPagesService) => {
                         return oPagesService.updateBookmarks(oIdentifier, oBookmarkConfig);
                     });
             }
 
             return this._oLaunchPageServicePromise
-                .then(function (LaunchPageService) {
+                .then((LaunchPageService) => {
                     return LaunchPageService.updateCustomBookmarks(oIdentifier, oBookmarkConfig);
                 });
         };
@@ -1152,35 +1149,31 @@ sap.ui.define([
          * @since 1.81
          * @deprecated since 1.119. Please use {@link sap.ushell.services.BookmarkV2#getContentNodes} instead.
          */
-        this.getContentNodes = function () {
+        this.getContentNodes = async function () {
             // Spaces mode
             if (Config.last("/core/spaces/enabled")) {
-                return sap.ushell.Container.getServiceAsync("Menu")
-                    .then(function (oMenuService) {
-                        return oMenuService.getContentNodes();
-                    });
+                const oMenuService = await sap.ushell.Container.getServiceAsync("Menu");
+                return oMenuService.getContentNodes();
             }
 
             // Classic home page
-            return new Promise(function (resolve, reject) {
-                this._oLaunchPageServicePromise
-                    .then(function (LaunchPageService) {
-                        LaunchPageService.getGroupsForBookmarks()
-                            .done(function (aHomepageGroups) {
-                                var aResults = aHomepageGroups.map(function (oBookmarkGroup) {
-                                    return {
-                                        id: LaunchPageService.getGroupId(oBookmarkGroup.object),
-                                        label: oBookmarkGroup.title,
-                                        type: ContentNodeType.HomepageGroup,
-                                        isContainer: true
-                                    };
-                                });
+            return new Promise(async (resolve, reject) => {
+                const oLaunchPageService = await this._oLaunchPageServicePromise;
+                oLaunchPageService.getGroupsForBookmarks()
+                    .done((aHomepageGroups) => {
+                        const aResults = aHomepageGroups.map((oBookmarkGroup) => {
+                            return {
+                                id: oLaunchPageService.getGroupId(oBookmarkGroup.object),
+                                label: oBookmarkGroup.title,
+                                type: ContentNodeType.HomepageGroup,
+                                isContainer: true
+                            };
+                        });
 
-                                resolve(aResults);
-                            })
-                            .fail(reject);
-                    });
-            }.bind(this));
+                        resolve(aResults);
+                    })
+                    .fail(reject);
+            });
         };
 
         /**
@@ -1197,7 +1190,7 @@ sap.ui.define([
         this._changeUrlStatesToPersistent = async function (sUrl) {
             const AppState = await sap.ushell.Container.getServiceAsync("AppState");
 
-            var bAppStateConfigPersistent = AppState.getPersistentWhenShared();
+            const bAppStateConfigPersistent = AppState.getPersistentWhenShared();
             // gate keeper - if the platform did not implement yet the new persistency mechanism
             // with different persistency method types, no action should be taken
             if (AppState.getSupportedPersistencyMethods().length === 0 && bAppStateConfigPersistent !== true) {
@@ -1212,7 +1205,6 @@ sap.ui.define([
         };
     }
 
-
     Bookmark.hasNoAdapter = true;
     return Bookmark;
 }, true /* bExport */);