@sapui5/sap.ushell_abap 1.150.1 → 1.152.0

package/src/main/js/sap/ushell_abap/adapters/abap/FlpLaunchPageAdapter.js

@@ -3,20 +3,21 @@
 /**
  * @fileoverview The Unified Shell's page building adapter for the ABAP platform. Private copy. Classical home page functions are deprecated.
  * @since 1.121
- * @version 1.150.1
+ * @version 1.152.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI",
     "sap/ushell/components/cards/ManifestPropertyHelper",
-    "sap/ui/thirdparty/jquery",
     "sap/base/util/ObjectPath",
     "sap/base/util/isEmptyObject",
     "sap/m/GenericTile",
     "sap/ushell/base/SAPBusinessClientEnablement",
+    "sap/ushell/base/promisify",
+    "sap/ushell/base/requireAsync",
     "sap/ushell/Config",
     "sap/base/util/deepExtend",
     "sap/ushell/utils/chipsUtils",
-    "sap/ushell_abap/pbServices/ui2/Utils",
+    "sap/ushell_abap/base/Ui2Utils",
     "sap/ushell_abap/pbServices/ui2/Page",
     "sap/base/Log",
     "sap/m/library",
@@ -27,11 +28,12 @@ sap.ui.define([
 ], (
     URI,
     ManifestPropertyHelper,
-    jQuery,
     ObjectPath,
     isEmptyObject,
     GenericTile,
     SAPBusinessClientEnablement,
+    promisify,
+    requireAsync,
     Config,
     deepExtend,
     chipsUtils,
@@ -82,8 +84,8 @@ sap.ui.define([
      */
     function LaunchPageAdapter (oUnused, sParameter, oAdapterConfiguration) {
         let bCatalogsValid; // undefined = not yet valid
-        let oGetGroupsDeferred; // used to synchronize parallel getGroups-requests
-        let oGetCatalogsDeferred; // used to synchronize parallel getCatalog-requests
+        let pGetGroupsResolver; // { promise, resolve, reject } used to synchronize parallel getGroups-requests
+        let pGetCatalogsHandle; // { promise, resolve, reject } — used to synchronize parallel getCatalog-requests
 
         // Stores a boolean that indicates whether a target mapping is supported on the current device.
         // One should use makeTargetMappingSupportKey to store and retrieve values to/from this map.
@@ -197,7 +199,7 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         LaunchPageAdapter.prototype._orderBasedOnConfiguration = function (oConfiguration, aElements) {
-            let aOrder = (oConfiguration && Utils.isArray(oConfiguration.order) ? oConfiguration.order : []);
+            let aOrder = (oConfiguration && Array.isArray(oConfiguration.order) ? oConfiguration.order : []);
             const mElementsById = {};
             const aOrderedElements = [];
             let oElement;
@@ -205,7 +207,7 @@ sap.ui.define([
             let n;
 
             // append link tiles as they are exposed together with tiles via getGroupTiles
-            aOrder = aOrder.concat(oConfiguration && Utils.isArray(oConfiguration.linkOrder) ? oConfiguration.linkOrder : []);
+            aOrder = aOrder.concat(oConfiguration && Array.isArray(oConfiguration.linkOrder) ? oConfiguration.linkOrder : []);
 
             // create a map of instances by ID
             for (i = 0, n = aElements.length; i < n; i += 1) {
@@ -360,29 +362,28 @@ sap.ui.define([
          *
          * @param {string[]} aHiddenGroupsIDs The input parameter must be of type array, containing the IDs of the
          *   groups that should be set hidden. In case an empty array is provided all groups should be changed to visible.
-         * @returns {jQuery.Promise} Resolves once the group is hidden.
+         * @returns {Promise} Resolves once the group is hidden.
          * @private
          * @deprecated since 1.120
          */
         this.hideGroups = function (aHiddenGroupsIDs) {
-            const oDeferred = new jQuery.Deferred();
-
             if (!aHiddenGroupsIDs || !(aHiddenGroupsIDs instanceof Array)) {
-                oDeferred.reject(new Error("Input parameter must be of type Array."));
-            } else {
+                return Promise.reject(new Error("Input parameter must be of type Array."));
+            }
+
+            return new Promise((resolve, reject) => {
                 const oConf = JSON.parse(that._oCurrentPageSet.getConfiguration() || "{}");
 
                 // Replace the hidden groups array on the current configuration with the new hidden groups array
                 oConf.hiddenGroups = aHiddenGroupsIDs;
                 that._oCurrentPageSet.setConfiguration(
                     JSON.stringify(oConf),
-                    /* fnSuccess */oDeferred.resolve.bind(oDeferred),
+                    /* fnSuccess */resolve,
                     /* fnFailure */(sErrorMessage) => {
-                        oDeferred.reject(new Error(sErrorMessage));
+                        reject(new Error(sErrorMessage));
                     }
                 );
-            }
-            return oDeferred.promise();
+            });
         };
 
         /**
@@ -519,13 +520,10 @@ sap.ui.define([
             function loadDependenciesAndTriggerChipInstanceLoad (oChipInstance) {
                 // append the promise for loading to the instance, but only as long as loading is
                 // pending. Note: will be used by getTileView
-                oChipInstance._loadingDeferred = new jQuery.Deferred(); // used for KPI tiles and custom tiles
-                oChipInstance.$loadingPromise = oChipInstance._loadingDeferred.promise();
-                that._aOtherChipsPromises.push(new Promise((resolve, reject) => {
-                    oChipInstance.$loadingPromise
-                        .done(resolve)
-                        .fail(reject);
-                }));
+                // used for KPI tiles and custom tiles; $loadingPromise is a native Promise
+                oChipInstance._loadingDeferred = Promise.withResolvers();
+                oChipInstance.$loadingPromise = oChipInstance._loadingDeferred.promise;
+                that._aOtherChipsPromises.push(oChipInstance.$loadingPromise);
 
                 if (window["sap-ui-debug"] === true) {
                     LaunchPageAdapter.prototype._triggerChipInstanceLoad(oChipInstance);
@@ -536,7 +534,7 @@ sap.ui.define([
                     // even more round trips; in practice, chances are high that the homepage will contain some non-KPI custom tiles,
                     // so core-ext-light will probably be loaded in most cases
                     // see internal BCP 1770271005
-                    sap.ui.require(["sap/ushell/EventHub"], (oEventHub) => {
+                    requireAsync(["sap/ushell/EventHub"]).then(([oEventHub]) => {
                         const oCoreResourcesComplementEvent = oEventHub.on("CoreResourcesComplementLoaded");
 
                         oCoreResourcesComplementEvent.do((oEvent) => {
@@ -602,7 +600,7 @@ sap.ui.define([
          * This method reads all target mappings for the current user via
          *   a) a compactTM promise if present in config
          *   b) xor a start_up service call with tm_compact=true
-         * @returns {jQuery.Promise} Resolves to an array
+         * @returns {Promise} Resolves to an object
          * <pre>
          *   [
          *     {
@@ -614,9 +612,7 @@ sap.ui.define([
          *   ]
          * </pre>
          */
-        LaunchPageAdapter.prototype._readTargetMappings = function () {
-            const oDeferred = new jQuery.Deferred();
-
+        LaunchPageAdapter.prototype._readTargetMappings = async function () {
             function formatResult (oStartupData) {
                 const aRes = [];
                 const oTargetMappings = oStartupData.targetMappings || oStartupData || {};
@@ -631,16 +627,10 @@ sap.ui.define([
             }
 
             if (ObjectPath.get("compactTMPromise", oAdapterConfig)) {
-                oAdapterConfig.compactTMPromise
-                    .then((oResult) => {
-                        const aRes = formatResult(oResult || {});
-                        oDeferred.resolve({ results: aRes });
-                    })
-                    .catch((oError) => {
-                        oDeferred.reject(oError);
-                    });
-                return oDeferred.promise();
+                const oResult = await oAdapterConfig.compactTMPromise;
+                return { results: formatResult(oResult || {}) };
             }
+
             const oTargetMappingsConfig = ObjectPath.create("services.targetMappings", oAdapterConfig);
             const sCacheId = oTargetMappingsConfig.cacheId || "";
             let sUrl = `/sap/bc/ui2/start_up?so=%2A&action=%2A&tm-compact=true&shellType=${SAPBusinessClientEnablement.getShellType()}&depth=0`;
@@ -653,20 +643,20 @@ sap.ui.define([
                 sUrl += `${sUrl.indexOf("?") < 0 ? "?" : "&"}sap-ui2-cache-disable=${sUI2CacheDisable}`;
             }
 
-            Utils.get(
-                sUrl,
-                false, /* xml=*/
-                (sDirectStartResult) => {
-                    const oDirectStartResult = JSON.parse(sDirectStartResult);
-                    const oDirectStartTargetMappings = oDirectStartResult.targetMappings || {};
-                    const aRes = formatResult(oDirectStartTargetMappings);
-                    oDeferred.resolve({ results: aRes });
-                },
-                (sErrorMessage) => {
-                    oDeferred.reject(new Error(sErrorMessage));
-                }
-            );
-            return oDeferred.promise();
+            return new Promise((resolve, reject) => {
+                Utils.get(
+                    sUrl,
+                    false, /* xml=*/
+                    (sDirectStartResult) => {
+                        const oDirectStartResult = JSON.parse(sDirectStartResult);
+                        const oDirectStartTargetMappings = oDirectStartResult.targetMappings || {};
+                        resolve({ results: formatResult(oDirectStartTargetMappings) });
+                    },
+                    (sErrorMessage) => {
+                        reject(new Error(sErrorMessage));
+                    }
+                );
+            });
         };
 
         /**
@@ -1233,93 +1223,88 @@ sap.ui.define([
         };
 
         /**
-         * Lazily initializes <code>_oCurrentPageSet</code> and returns a jQuery promise resolving with it.
-         * Parallel calls are deduplicated. Subsequent calls return the already-resolved promise.
+         * Lazily initializes <code>_oCurrentPageSet</code> and returns a Promise resolving with it.
+         * Parallel calls are deduplicated. Subsequent calls return the already-settled promise.
          *
-         * @returns {jQuery.Promise<sap.ushell_abap.pbServices.ui2.PageSet>} Resolves with the current page set object.
+         * @returns {Promise<sap.ushell_abap.pbServices.ui2.PageSet>} Resolves with the current page set object.
          * @private
          */
         this._getPageSet = function () {
-            if (this._oGetPageSetDeferred) {
-                return this._oGetPageSetDeferred.promise();
+            if (this._pGetPageSet) {
+                return this._pGetPageSet;
             }
 
-            this._oGetPageSetDeferred = new jQuery.Deferred();
+            this._pGetPageSet = Promise.resolve().then(async () => {
+                const PageBuildingService = await Container.getServiceAsync("PageBuilding");
+                const fnReadPageSet = PageBuildingService.getFactory().getPageBuildingService().readPageSet;
 
-            Container.getServiceAsync("PageBuilding")
-                .then((PageBuildingService) => {
-                    const fnReadPageSet = PageBuildingService.getFactory().getPageBuildingService().readPageSet;
+                if (oLaunchPageServiceConfig && oLaunchPageServiceConfig.cacheId) {
+                    // add PageSet cache buster token if configured
+                    fnReadPageSet.cacheBusterTokens
+                        .put(sDEFAULT_PAGE_ID, oLaunchPageServiceConfig.cacheId);
+                }
+                if (oLaunchPageServiceConfig && oLaunchPageServiceConfig["sap-ui2-cache-disable"] && fnReadPageSet) {
+                    const oAppendedParameters = fnReadPageSet.appendedParameters || {};
+                    oAppendedParameters["sap-ui2-cache-disable"] = oLaunchPageServiceConfig["sap-ui2-cache-disable"];
+                    fnReadPageSet.appendedParameters = oAppendedParameters;
+                }
 
-                    if (oLaunchPageServiceConfig && oLaunchPageServiceConfig.cacheId) {
-                        // add PageSet cache buster token if configured
-                        fnReadPageSet.cacheBusterTokens
-                            .put(sDEFAULT_PAGE_ID, oLaunchPageServiceConfig.cacheId);
-                    }
-                    if (oLaunchPageServiceConfig && oLaunchPageServiceConfig["sap-ui2-cache-disable"] && fnReadPageSet) {
-                        const oAppendedParameters = fnReadPageSet.appendedParameters || {};
-                        oAppendedParameters["sap-ui2-cache-disable"] = oLaunchPageServiceConfig["sap-ui2-cache-disable"];
-                        fnReadPageSet.appendedParameters = oAppendedParameters;
-                    }
+                /*
+                 * In spaces mode we will create an empty page inside an empty pageSet.
+                 * This is needed because the appfinder and search integration request the classic homepage content
+                 * which is not available in spaces mode.
+                 * For consistency reasons it should then also not be available from the search results.
+                 * The empty pageSet has all needed functions the real pageSet has.
+                 * Functions which should not be used in spaces mode throw an error
+                 */
+                if (Config.last("/core/spaces/enabled")) {
+                    const oFactory = PageBuildingService.getFactory();
 
-                    /*
-                     * In spaces mode we will create an empty page inside an empty pageSet.
-                     * This is needed because the appfinder and search integration request the classic homepage content
-                     * which is not available in spaces mode.
-                     * For consistency reasons it should then also not be available from the search results.
-                     * The empty pageSet has all needed functions the real pageSet has.
-                     * Functions which should not be used in spaces mode throw an error
-                     */
-                    if (Config.last("/core/spaces/enabled")) {
-                        const oFactory = PageBuildingService.getFactory();
+                    const oFakeDefaultPage = new Page(oFactory, {
+                        id: PAGE_ID_WITHOUT_TM
+                    });
 
-                        const oFakeDefaultPage = new Page(oFactory, {
-                            id: PAGE_ID_WITHOUT_TM
-                        });
+                    this._oCurrentPageSet = {
+                        getDefaultPage: function () {
+                            return oFakeDefaultPage;
+                        },
+                        getPages: function () {
+                            return [oFakeDefaultPage];
+                        },
+                        appendPage: function () {
+                            throw new Error("Not implemented in Pages Runtime");
+                        },
+                        isPageRemovable: function () {
+                            return false;
+                        },
+                        removePage: function () {
+                            throw new Error("Not implemented in Pages Runtime");
+                        },
+                        isPageResettable: function () {
+                            return true;
+                        },
+                        resetPage: function () {
+                        },
+                        getConfiguration: function () {
+                            return "{}";
+                        },
+                        setConfiguration: function () {
+                        },
+                        filter: function () {
+                        }
+                    };
 
-                        this._oCurrentPageSet = {
-                            getDefaultPage: function () {
-                                return oFakeDefaultPage;
-                            },
-                            getPages: function () {
-                                return [oFakeDefaultPage];
-                            },
-                            appendPage: function () {
-                                throw new Error("Not implemented in Pages Runtime");
-                            },
-                            isPageRemovable: function () {
-                                return false;
-                            },
-                            removePage: function () {
-                                throw new Error("Not implemented in Pages Runtime");
-                            },
-                            isPageResettable: function () {
-                                return true;
-                            },
-                            resetPage: function () {
-                            },
-                            getConfiguration: function () {
-                                return "{}";
-                            },
-                            setConfiguration: function () {
-                            },
-                            filter: function () {
-                            }
-                        };
+                    return this._oCurrentPageSet;
+                }
 
-                        this._oGetPageSetDeferred.resolve(this._oCurrentPageSet);
-                    } else {
-                        PageBuildingService.getPageSet(sDEFAULT_PAGE_ID)
-                            .fail(this._oGetPageSetDeferred.reject.bind(this._oGetPageSetDeferred))
-                            .done((oPageSet) => {
-                                this._oCurrentPageSet = oPageSet;
-                                // remove unsupported pages before loading their chip instances
-                                this._oCurrentPageSet.filter([sDEFAULT_PAGE_ID], [sDEFAULT_CATALOG_ID]);
-                                this._oGetPageSetDeferred.resolve(oPageSet);
-                            });
-                    }
-                });
+                const oPageSet = await promisify(PageBuildingService.getPageSet(sDEFAULT_PAGE_ID));
+                this._oCurrentPageSet = oPageSet;
+                // remove unsupported pages before loading their chip instances
+                this._oCurrentPageSet.filter([sDEFAULT_PAGE_ID], [sDEFAULT_CATALOG_ID]);
+                return oPageSet;
+            });
 
-            return this._oGetPageSetDeferred.promise();
+            return this._pGetPageSet;
         };
 
         /**
@@ -1328,52 +1313,52 @@ sap.ui.define([
          *
          * The first group in this list is considered the default group.
          *
-         * @returns {jQuery.Promise<sap.ushell_abap.pbServices.ui2.Page[]>} Resolves the list of group.
+         * @returns {Promise<sap.ushell_abap.pbServices.ui2.Page[]>} Resolves the list of group.
          * @since 1.11.0
          * @deprecated since 1.120
          */
         this.getGroups = function () {
             if (this._bPageSetFullyLoaded) {
                 // return the already known page set (the order is recomputed because the page set might have changed it since last call)
-                return new jQuery.Deferred().resolve(getOrderedPages()).promise();
+                return Promise.resolve(getOrderedPages());
             }
-            if (!oGetGroupsDeferred) {
-                // start a new request and remember it in oGetGroupsDeferred, so that parallel calls don't start another one
-                oGetGroupsDeferred = new jQuery.Deferred();
+            if (!pGetGroupsResolver) {
+                // start a new request and remember it, so that parallel calls don't start another one
+                pGetGroupsResolver = Promise.withResolvers();
 
                 // The target mappings are used in the classic homepage and in spaces mode.
                 const oMappingPromise = this._loadTargetMappings();
 
                 this._getPageSet()
-                    .done((oPageSet) => {
+                    .then((oPageSet) => {
                         if (Config.last("/core/spaces/enabled")) {
-                            oGetGroupsDeferred.resolve([]);
+                            pGetGroupsResolver.resolve([]);
                         } else {
-                            const oChipsLoadedDeferred = new jQuery.Deferred();
+                            const { promise: pChipsLoaded, resolve: resolveChipsLoaded } = Promise.withResolvers();
 
                             // Trigger load of all CHIP instances, but wait for the locals only
                             this._loadApplaunchersAndDelayLoadingOfOtherChips(
                                 oPageSet.getPages(),
-                                oChipsLoadedDeferred.resolve.bind(oChipsLoadedDeferred)
+                                resolveChipsLoaded
                             );
 
-                            jQuery.when(oMappingPromise, oChipsLoadedDeferred)
-                                .done(() => {
+                            Promise.all([oMappingPromise, pChipsLoaded])
+                                .then(() => {
                                     this._bPageSetFullyLoaded = true;
 
                                     if (Log.getLevel() >= Log.Level.DEBUG) { // sap-ui-debug = true
                                         this._findAndReportTileErrors(oPageSet.getPages(), oTargetMappingSupport);
                                     }
 
-                                    oGetGroupsDeferred.resolve(getOrderedPages());
+                                    pGetGroupsResolver.resolve(getOrderedPages());
                                 })
-                                .fail(oGetGroupsDeferred.reject.bind(oGetGroupsDeferred));
+                                .catch(pGetGroupsResolver.reject);
                         }
                     })
-                    .fail(oGetGroupsDeferred.reject.bind(oGetGroupsDeferred));
+                    .catch(pGetGroupsResolver.reject);
             }
 
-            return oGetGroupsDeferred.promise();
+            return pGetGroupsResolver.promise;
         };
 
         /**
@@ -1388,7 +1373,7 @@ sap.ui.define([
                 return this._oTargetMappingPromise;
             }
             this._oTargetMappingPromise = this._readTargetMappings()
-                .done((oTargetMappings) => {
+                .then((oTargetMappings) => {
                     const sFormFactor = Utils.getFormFactor();
 
                     oTargetMappings.results.forEach((oTargetMapping) => {
@@ -1402,6 +1387,7 @@ sap.ui.define([
                             oTargetMappingSupport.get(sKey)
                             || !!(oTargetMapping.formFactors && oTargetMapping.formFactors[sFormFactor]));
                     });
+                    this._bTargetMappingsLoaded = true;
                 });
 
             return this._oTargetMappingPromise;
@@ -1416,34 +1402,26 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.getGroupsAndWaitForAllChips = function () {
-            return new Promise((resolve, reject) => {
-                that.getGroups()
-                    .done(resolve)
-                    .fail(reject);
-            }).then((aGroups) => {
-                return Promise.allSettled(that._aOtherChipsPromises)
-                    .then(() => {
-                        return aGroups;
-                    });
-            });
+            return that.getGroups()
+                .then((aGroups) => {
+                    return Promise.allSettled(that._aOtherChipsPromises)
+                        .then(() => {
+                            return aGroups;
+                        });
+                });
         };
 
         /**
          * Returns the default group.
          *
-         * @returns {jQuery.Promise<sap.ushell_abap.pbServices.ui2.Page>} Resolves the default group.
+         * @returns {Promise<sap.ushell_abap.pbServices.ui2.Page>} Resolves the default group.
          * @since 1.11.0
          * @deprecated since 1.120
          */
-        this.getDefaultGroup = function () {
-            const oDeferred = new jQuery.Deferred();
-
-            this.getGroups().done(() => {
-                // TODO test if getGroups()[0] is faster than getDefaultPage
-                oDeferred.resolve(that._oCurrentPageSet.getDefaultPage());
-            }).fail(oDeferred.reject.bind(oDeferred));
-
-            return oDeferred.promise();
+        this.getDefaultGroup = async function () {
+            // TODO test if getGroups()[0] is faster than getDefaultPage
+            await this.getGroups();
+            return that._oCurrentPageSet.getDefaultPage();
         };
 
         /**
@@ -1523,87 +1501,77 @@ sap.ui.define([
          *
          * Intention: the page builder adds this group to the end of the home screen.
          *
-         * In case of error it gets the consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
-         *
          * @param {string} sTitle the title of the new group
-         * @returns {jQuery.Promise<sap.ushell_abap.pbServices.ui2.Page>} Resolves once the group was added.
+         * @returns {Promise<sap.ushell_abap.pbServices.ui2.Page>} Resolves once the group was added.
          * @since 1.11.0
          * @deprecated since 1.120
          */
         this.addGroup = function (sTitle) {
-            const oDeferred = new jQuery.Deferred();
-
-            that._oCurrentPageSet.appendPage(sTitle, sDEFAULT_CATALOG_ID,
-                oDeferred.resolve.bind(oDeferred),
-                (sErrorMessage) => {
-                    oDeferred.reject(new Error(sErrorMessage), getOrderedPages());
-                });
-
-            return oDeferred.promise();
+            return new Promise((resolve, reject) => {
+                that._oCurrentPageSet.appendPage(sTitle, sDEFAULT_CATALOG_ID,
+                    resolve,
+                    (sErrorMessage) => {
+                        reject(new Error(sErrorMessage));
+                    });
+            });
         };
 
         /**
          * Removes a group.
          *
-         * In case of error it gets the consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
-         *
          * @param {object} oGroup the group to be removed
-         * @returns {jQuery.Promise} Resolves once the group was removed.
+         * @returns {Promise} Resolves once the group was removed.
          * @since 1.11.0
          * @deprecated since 1.120
          */
         this.removeGroup = function (oGroup) {
-            const oDeferred = new jQuery.Deferred();
+            if (!that._oCurrentPageSet.isPageRemovable(oGroup)) {
+                return Promise.reject(new Error("Group is not removable"));
+            }
 
-            if (that._oCurrentPageSet.isPageRemovable(oGroup)) {
+            return new Promise((resolve, reject) => {
                 that._oCurrentPageSet.removePage(
                     oGroup,
-                    oDeferred.resolve.bind(oDeferred),
+                    resolve,
                     (sErrorMessage) => {
                         Log.error(`Failed to remove group '${oGroup.toString()}'`, sErrorMessage, sCOMPONENT);
-                        oDeferred.reject(new Error(sErrorMessage), getOrderedPages());
+                        reject(new Error(sErrorMessage));
                     }
                 );
-            } else {
-                oDeferred.reject(new Error("Group is not removable"), getOrderedPages());
-            }
-            return oDeferred.promise();
+            });
         };
 
         /**
          * Resets a group. Only groups can be reset for which <code>isGroupRemovable</code> returns false.
          * For others the fail handler is called.
          *
-         * In case of error it gets the consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
-         *
          * @param {sap.ushell_abap.pbServices.ui2.Page} oGroup the group to be reset
-         * @returns {jQuery.Promise} Resolves once the group was reset.
+         * @returns {Promise} Resolves once the group was reset.
          * @since 1.11.0
          * @deprecated since 1.120
          */
         this.resetGroup = function (oGroup) {
-            const oDeferred = new jQuery.Deferred();
-            const that = this;
-
             if (that._oCurrentPageSet.isPageRemovable(oGroup)) {
                 // pages which are removable should be removed and cannot be reset
-                oDeferred.reject(new Error("Group is not removable"), getOrderedPages());
-            } else if (that._oCurrentPageSet.isPageResettable(oGroup)) {
+                return Promise.reject(new Error("Group is not removable"));
+            }
+
+            if (that._oCurrentPageSet.isPageResettable(oGroup)) {
                 // pages which are resettable should be reset
-                that._oCurrentPageSet.resetPage(
-                    oGroup,
-                    () => {
-                        that._loadApplaunchersAndDelayLoadingOfOtherChips([oGroup], oDeferred.resolve.bind(oDeferred, oGroup));
-                    },
-                    (sErrorMessage) => {
-                        oDeferred.reject(new Error("Failed to reset group"), getOrderedPages());
-                    });
-            } else {
-                // on all other pages an reset has simply no effect
-                oDeferred.resolve(oGroup);
+                return new Promise((resolve, reject) => {
+                    that._oCurrentPageSet.resetPage(
+                        oGroup,
+                        () => {
+                            that._loadApplaunchersAndDelayLoadingOfOtherChips([oGroup], () => resolve(oGroup));
+                        },
+                        () => {
+                            reject(new Error("Failed to reset group"));
+                        });
+                });
             }
 
-            return oDeferred.promise();
+            // on all other pages a reset has simply no effect
+            return Promise.resolve(oGroup);
         };
 
         /**
@@ -1667,7 +1635,7 @@ sap.ui.define([
          * @since 1.21.0
          */
         this.isTileIntentSupported = function (oTile) {
-            if (!this._oTargetMappingPromise || this._oTargetMappingPromise.state() !== "resolved") {
+            if (!this._bTargetMappingsLoaded) {
                 Log.error("isTileIntentSupported might return wrong results as data loading hasn't finished yet!", "sap.ushell_abap.adapters.abap.LaunchPageAdapter");
             }
 
@@ -1837,127 +1805,109 @@ sap.ui.define([
 
         /**
          * Moves a group to a new index.
-         * In case of error it gets the consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
          * @param {object} oGroup the group to be moved
          * @param {int} iNewIndex the new index for the group
-         * @returns {jQuery.Promise} Resolves once the group was moved.
+         * @returns {Promise} Resolves once the group was moved.
          * @since 1.11.0
          * @deprecated since 1.120
          */
-        this.moveGroup = function (oGroup, iNewIndex) {
+        this.moveGroup = async function (oGroup, iNewIndex) {
             // see wiki UICEI/PageSets+and+Groups#PageSetsandGroups-Rearrangegroupsonthehomepage
-            const oDeferred = new jQuery.Deferred();
+            const aPages = await this.getGroups();
+            const iIndex = aPages.indexOf(oGroup);
 
-            function updateConfiguration (aPages) {
-                const aIds = [];
+            aPages.splice(iIndex, 1);
+            aPages.splice(iNewIndex, 0, oGroup);
 
-                aPages.forEach((oPage) => {
-                    aIds.push(oPage.getId());
-                });
+            const aIds = aPages.map((oPage) => oPage.getId());
 
-                // save new order without overwriting other parts of the configuration
-                const oConf = JSON.parse(that._oCurrentPageSet.getConfiguration() || "{}");
-                oConf.order = aIds;
+            // save new order without overwriting other parts of the configuration
+            const oConf = JSON.parse(that._oCurrentPageSet.getConfiguration() || "{}");
+            oConf.order = aIds;
+
+            return new Promise((resolve, reject) => {
                 that._oCurrentPageSet.setConfiguration(JSON.stringify(oConf),
-                    oDeferred.resolve.bind(oDeferred),
+                    resolve,
                     (sErrorMessage) => {
-                        oDeferred.reject(new Error(sErrorMessage), getOrderedPages());
+                        reject(new Error(sErrorMessage));
                     });
-            }
-
-            this.getGroups().done((aPages) => {
-                const iIndex = aPages.indexOf(oGroup);
-
-                aPages.splice(iIndex, 1);
-                aPages.splice(iNewIndex, 0, oGroup);
-                updateConfiguration(aPages);
             });
-
-            return oDeferred.promise();
         };
 
         /**
          * Sets a new title to an existing group.
-         * In case of error it gets the old title.
          *
          * @param {object} oGroup the group we need to set the title
          * @param {string} sNewTitle the new title of the group
-         * @returns {jQuery.Promise} Resolves once the group title was set.
+         * @returns {Promise} Resolves once the group title was set.
          * @since 1.11.0
          * @deprecated since 1.120
          */
         this.setGroupTitle = function (oGroup, sNewTitle) {
-            const oDeferred = new jQuery.Deferred();
-
-            oGroup.setTitle(sNewTitle,
-                oDeferred.resolve.bind(oDeferred),
-                (sErrorMessage) => {
-                    oDeferred.reject(new Error("Failed to set group title"), oGroup.getTitle());
-                });
-
-            return oDeferred.promise();
+            return new Promise((resolve, reject) => {
+                oGroup.setTitle(sNewTitle,
+                    resolve,
+                    () => {
+                        reject(new Error("Failed to set group title"));
+                    });
+            });
         };
 
         /**
          * Adds a tile to the end of a group. The group is optional. If no group is given, use the default group.
-         * In case of error it gets the consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
          * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oCatalogTile an 'anonymous' catalog tile from the catalog browser
          * @param {sap.ushell_abap.pbServices.ui2.Page} [oGroup] the group
-         * @returns {jQuery.Promise<sap.ushell_abap.pbServices.ui2.ChipInstance>} Resolves once the tile was added.
+         * @returns {Promise<sap.ushell_abap.pbServices.ui2.ChipInstance>} Resolves once the tile was added.
          * @since 1.11.0
          * @deprecated since 1.120
          */
         this.addTile = function (oCatalogTile, oGroup) {
-            const oDeferred = new jQuery.Deferred();
             const oChip = oCatalogTile.getChip(); // unwrap (see wrapAsChipInstances)
 
             if (oCatalogTile.isStub()) {
                 // this is a "Cannot load tile" tile, this should not be added to the group
                 // BCP 1670300106
-                oDeferred.reject(new Error("Tile was not added to the group as the tile failed loading"), getOrderedPages());
-            } else {
-                if (!oGroup) {
-                    oGroup = that._oCurrentPageSet.getDefaultPage();
-                }
+                return Promise.reject(new Error("Tile was not added to the group as the tile failed loading"));
+            }
+
+            if (!oGroup) {
+                oGroup = that._oCurrentPageSet.getDefaultPage();
+            }
 
+            return new Promise((resolve, reject) => {
                 oGroup.addChipInstance(oChip,
-                    oDeferred.resolve.bind(oDeferred),
+                    resolve,
                     (sErrorMessage) => {
-                        oDeferred.reject(new Error(sErrorMessage), getOrderedPages());
+                        reject(new Error(sErrorMessage));
                     }
                 );
-            }
-
-            return oDeferred.promise();
+            });
         };
 
         /**
          * Removes the given tile from the given group.
-         * In case of error it gets the consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
          * @param {sap.ushell_abap.pbServices.ui2.Page} oGroup the group containing the tile
          * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile the tile
-         * @returns {jQuery.Promise} Resolves once the tile was removed.
+         * @returns {Promise} Resolves once the tile was removed.
          * @since 1.11.0
          * @deprecated since 1.120
          */
         this.removeTile = function (oGroup, oTile) {
-            const oDeferred = new jQuery.Deferred();
-
-            oGroup.removeChipInstance(oTile,
-                oDeferred.resolve.bind(oDeferred),
-                (sErrorMessage) => {
-                    oDeferred.reject(new Error(sErrorMessage), getOrderedPages());
-                }
-            );
-            return oDeferred.promise();
+            return new Promise((resolve, reject) => {
+                oGroup.removeChipInstance(oTile,
+                    resolve,
+                    (sErrorMessage) => {
+                        reject(new Error(sErrorMessage));
+                    }
+                );
+            });
         };
 
         /**
          * Moves a tile to another location in the same or a different group.
-         * In case of error it gets the consistent backend state of all groups as array of <code>sap.ushell_abap.pbServices.ui2.Page</code>.
          *
          * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile the tile to be moved
          * @param {int} iSourceIndex the index in the source group
@@ -1966,17 +1916,17 @@ sap.ui.define([
          * @param {sap.ushell_abap.pbServices.ui2.Page} oSourceGroup the tile's group
          * @param {sap.ushell_abap.pbServices.ui2.Page} [oTargetGroup] the group the tile will be placed in or tile's group if not supplied
          * @param {string} [sNewTileType] (added with 1.60) The new type of the tile
-         * @returns {jQuery.Promise} Resolves once the tile was moved.
+         * @returns {Promise} Resolves once the tile was moved.
          * @since 1.11.0
          * @deprecated since 1.120
          */
         this.moveTile = function (oTile, iSourceIndex, iTargetIndex, oSourceGroup, oTargetGroup, sNewTileType) {
-            const oDeferred = new jQuery.Deferred();
+            const { promise, resolve, reject } = Promise.withResolvers();
             const bIsWrapperOnly = this._isWrapperOnly(oTile);
             const oBagsContents = new Utils.Map();
             let oCreatedChipInstance;
             function fnFailure (sErrorMessage) {
-                oDeferred.reject(new Error(sErrorMessage), getOrderedPages());
+                reject(new Error(sErrorMessage));
             }
             let iCalls = 2;
 
@@ -1987,7 +1937,7 @@ sap.ui.define([
                 // oNewChipInstance needs to be cached for the removeChipInstance call
                 oCreatedChipInstance = oCreatedChipInstance || oNewChipInstance;
                 if (iCalls <= 0) {
-                    oDeferred.resolve(oCreatedChipInstance);
+                    resolve(oCreatedChipInstance);
                 }
             }
 
@@ -2003,12 +1953,12 @@ sap.ui.define([
             if (iSourceIndex < 0) {
                 Log.error("moveTile: tile not found in source group", null, sCOMPONENT);
                 fnFailure("moveTile: tile not found in source group");
-                return oDeferred.promise();
+                return promise;
             }
 
             if (oSourceGroup === oTargetGroup) {
                 addToLayout(oSourceLayout, oTile.getId(), iTargetIndex, sNewTileType);
-                oSourceGroup.setLayout(JSON.stringify(oSourceLayout), oDeferred.resolve.bind(oDeferred, oTile), fnFailure);
+                oSourceGroup.setLayout(JSON.stringify(oSourceLayout), () => resolve(oTile), fnFailure);
             } else {
                 Container.getServiceAsync("PageBuilding")
                     .then((PageBuildingService) => {
@@ -2075,7 +2025,7 @@ sap.ui.define([
                     });
             }
 
-            return oDeferred.promise();
+            return promise;
         };
 
         /**
@@ -2163,84 +2113,81 @@ sap.ui.define([
          * Note: this function became async since 1.23.0.
          *
          * @param {sap.ushell_abap.pbServices.ui2.ChipInstance} oTile The tile's chip data
-         * @returns {jQuery.Promise<sap.ui.core.Control>} Resolves an instance of sap.m.GenericTile.
+         * @returns {Promise<sap.ui.core.Control>} Resolves an instance of sap.m.GenericTile.
          * @since 1.11.0
          * @deprecated since 1.120
          */
         this.getTileView = function (oTile) {
-            const that = this;
-            const oDeferred = new jQuery.Deferred();
+            return new Promise((resolve, reject) => {
+                function doReject (oError) {
+                    Log.error("Tile not successfully loaded:", oError, sCOMPONENT);
+                    reject(oError);
+                }
 
-            function doReject (oError) {
-                Log.error("Tile not successfully loaded:", oError, sCOMPONENT);
-                oDeferred.reject(oError);
-            }
+                function doResolve () {
+                    let sTileType;
 
-            function doResolve () {
-                let sTileType;
+                    // if needed, notify the tile in which way it shall display itself
+                    const oTypesContract = oTile.getContract("types");
+                    if (oTypesContract) {
+                        // set the tile type before getting the view
+                        // note: the contract caches the new type until the handler is attached
+                        sTileType = that.getTileType(oTile);
+                        oTypesContract.setType(sTileType);
+                    }
 
-                // if needed, notify the tile in which way it shall display itself
-                const oTypesContract = oTile.getContract("types");
-                if (oTypesContract) {
-                    // set the tile type before getting the view
-                    // note: the contract caches the new type until the handler is attached
-                    sTileType = that.getTileType(oTile);
-                    oTypesContract.setType(sTileType);
-                }
+                    oTile.getImplementationAsSapui5Async()
+                        .then((oView) => {
+                            if (sTileType === "link") {
+                                if (!oView.hasModel()) {
+                                    oView = oView.getComponentInstance().getRootControl();
+                                }
+                                const oViewModel = oView.getModel();
+                                const oViewController = oView.getController();
+
+                                const sUrl = oViewModel && oViewModel.getProperty ? oViewModel.getProperty("/nav/navigation_target_url") : undefined;
+                                const oLinkTile = new GenericTile({
+                                    mode: "{view>/mode}",
+                                    header: "{view>/config/display_title_text}",
+                                    subheader: "{view>/config/display_subtitle_text}",
+                                    sizeBehavior: "{view>/sizeBehavior}",
+                                    size: "Auto",
+                                    url: oViewController.formatters && oViewController.formatters.leanURL(sUrl),
+                                    press: [oViewController.onPress, oViewController]
+                                });
 
-                oTile.getImplementationAsSapui5Async()
-                    .then((oView) => {
-                        if (sTileType === "link") {
-                            if (!oView.hasModel()) {
-                                oView = oView.getComponentInstance().getRootControl();
+                                oLinkTile.setModel(oViewModel, "view");
+                                resolve(oLinkTile);
+                                return;
                             }
-                            const oViewModel = oView.getModel();
-                            const oViewController = oView.getController();
-
-                            const sUrl = oViewModel && oViewModel.getProperty ? oViewModel.getProperty("/nav/navigation_target_url") : undefined;
-                            const oLinkTile = new GenericTile({
-                                mode: "{view>/mode}",
-                                header: "{view>/config/display_title_text}",
-                                subheader: "{view>/config/display_subtitle_text}",
-                                sizeBehavior: "{view>/sizeBehavior}",
-                                size: "Auto",
-                                url: oViewController.formatters && oViewController.formatters.leanURL(sUrl),
-                                press: [oViewController.onPress, oViewController]
-                            });
 
-                            oLinkTile.setModel(oViewModel, "view");
-                            oDeferred.resolve(oLinkTile);
-                            return;
-                        }
-
-                        oDeferred.resolve(oView);
-                    })
-                    .catch(doReject);
-            }
-
-            if (!oTile.$loadingPromise) { // loading resolved or failed
-                if (!oTile.isStub()) { // success
-                    // call getImplementationAsSapui5Async async for non-AppLaunchers and resolves.
-                    // For AppLaunchers, there is an optimization (requested by RT) to call it sync
-                    // as the resources are already bundled and loaded at startup.
-                    // Although they are called sync the view creation is still async
-                    Utils.callHandler(doResolve, doReject, /* async */!isAppLauncher(oTile));
-                } else { // failed
-                    doReject(new Error("Tile failed to load - tile is still a stub"));
+                            resolve(oView);
+                        })
+                        .catch(doReject);
                 }
-            } else { // loading pending
-                oTile.$loadingPromise
-                    .fail(doReject)
-                    .done(() => {
-                        try {
-                            doResolve();
-                        } catch (oError) {
-                            doReject((oError));
-                        }
-                    });
-            }
 
-            return oDeferred.promise();
+                if (!oTile.$loadingPromise) { // loading resolved or failed
+                    if (!oTile.isStub()) { // success
+                        // call getImplementationAsSapui5Async async for non-AppLaunchers and resolves.
+                        // For AppLaunchers, there is an optimization (requested by RT) to call it sync
+                        // as the resources are already bundled and loaded at startup.
+                        // Although they are called sync the view creation is still async
+                        Utils.callHandler(doResolve, doReject, /* async */!isAppLauncher(oTile));
+                    } else { // failed
+                        doReject(new Error("Tile failed to load - tile is still a stub"));
+                    }
+                } else { // loading pending
+                    oTile.$loadingPromise
+                        .then(() => {
+                            try {
+                                doResolve();
+                            } catch (oError) {
+                                doReject(oError);
+                            }
+                        })
+                        .catch(doReject);
+                }
+            });
         };
 
         /**
@@ -2291,7 +2238,7 @@ sap.ui.define([
 
                 if (bOldVisibility === undefined) {
                     // attach handler, but only once.
-                    oTile.$loadingPromise.done(() => {
+                    oTile.$loadingPromise.then(() => {
                         const oVisibleContract = oTile.getContract("visible");
                         if (oVisibleContract) {
                             // tile uses visibility contract and sets the latest visibility
@@ -2362,85 +2309,78 @@ sap.ui.define([
          * this is handled gracefully by providing a "dummy" empty catalog (with ID instead of title).
          * Use {@link getCatalogError} to check if a (remote) catalog could not be loaded from the backend.
          * <p>
-         * Care has been taken to make sure that progress notifications are sent reliably for each single catalog,
-         * i.e. attaching a <code>progress</code> handler gives you the same possibilities as attaching a <code>done</code> handler,
-         * but with the advantage of improved responsiveness.
+         * Progress notifications are sent per catalog by the service layer (FlpLaunchPage), which
+         * iterates the resolved array. The adapter resolves with the full catalogs array at once.
          *
          * @example
          * sap.ushell.Container.getServiceAsync("LaunchPage")
          *     .then(function (LaunchPageService) {
          *         LaunchPageService.getCatalogs()
-         *             .fail(function (sErrorMessage) { // string
+         *             .catch(function (oError) {
          *                 // handle error situation
          *             })
-         *             .progress(function (oCatalog) { // object
-         *                 // do s.th. with single catalog
-         *             })
-         *             .done(function (aCatalogs) { // object[]
+         *             .then(function (aCatalogs) { // object[]
          *                 aCatalogs.forEach(function (oCatalog) {
          *                     // do s.th. with single catalog
          *                 });
          *             });
          *     });
          *
-         * @returns {jQuery.Promise} Resolves an array of black-box catalog objects is provided (which might be empty).
-         *   In case of failure, an error message is passed. Progress notifications are sent for each single catalog,
-         *   providing a single black-box catalog object each time.
+         * @returns {Promise} Resolves with an array of black-box catalog objects (which might be empty).
+         *   In case of failure, the promise is rejected with an error.
          * @since 1.11.0
          */
         this.getCatalogs = function () {
-            let oDeferred;
-            const oOldGetCatalogsDeferred = oGetCatalogsDeferred;
+            const oOldHandle = pGetCatalogsHandle;
             const bRefreshRequired = bCatalogsValid === false;
 
-            // Note: bCatalogsValid can be undefined, false, true
-            if (oOldGetCatalogsDeferred && !oOldGetCatalogsDeferred.$notified && !bRefreshRequired) {
-                // re-use existing Deferred object; we cannot miss any notifications!
-                oDeferred = oOldGetCatalogsDeferred;
-            } else {
-                oGetCatalogsDeferred = new jQuery.Deferred();
-                oDeferred = oGetCatalogsDeferred;
-                oDeferred
-                    .done(() => {
-                        if (oDeferred === oGetCatalogsDeferred) {
-                            // only the last call is allowed to change "global" variables
-                            bCatalogsValid = true;
-                        }
-                    })
-                    .always(() => {
-                        if (oDeferred === oGetCatalogsDeferred) {
-                            // only the last call is allowed to change "global" variables
-                            oGetCatalogsDeferred = null;
-                        }
-                    });
+            // Note: bCatalogsValid can be undefined, false, true.
+            // Concurrent calls share the in-flight promise; a refresh forces a new load after the
+            // current one settles.
+            if (oOldHandle && !bRefreshRequired) {
+                return oOldHandle.promise;
+            }
+
+            const oHandle = Promise.withResolvers();
+            pGetCatalogsHandle = oHandle;
 
-                if (oOldGetCatalogsDeferred) {
-                    if (bRefreshRequired) {
-                        bCatalogsValid = undefined; // not yet valid, refresh is in progress...
+            oHandle.promise
+                .then(() => {
+                    if (oHandle === pGetCatalogsHandle) {
+                        // only the last call is allowed to change "global" variables
+                        bCatalogsValid = true;
                     }
-                    // if we cannot reuse the old Deferred object, wait until it is done;
-                    // after invalidation, wait until old operations are complete and then start a new roundtrip
-                    oOldGetCatalogsDeferred
-                        .always(() => {
-                            this._startLoading(oDeferred, bRefreshRequired);
-                        });
-                } else {
-                    this._startLoading(oDeferred, bRefreshRequired);
-                }
+                })
+                .finally(() => {
+                    if (oHandle === pGetCatalogsHandle) {
+                        // only the last call is allowed to change "global" variables
+                        pGetCatalogsHandle = null;
+                    }
+                });
+
+            if (oOldHandle) {
+                // refresh required: wait until old load completes, then start a new roundtrip
+                bCatalogsValid = undefined; // not yet valid, refresh is in progress...
+                oOldHandle.promise
+                    .finally(() => {
+                        this._startLoading(oHandle, bRefreshRequired);
+                    });
+            } else {
+                this._startLoading(oHandle, bRefreshRequired);
             }
 
-            return oDeferred.promise();
+            return oHandle.promise;
         };
 
         /**
          * Resolves the promise to return the user's catalogs by refreshing the first remote catalog found, failing gracefully.
          *
-         * @param {jQuery.Deferred} oDeferred A jQuery.Deferred to be resolved, rejected or notified.
+         * @param {{promise: Promise, resolve: function, reject: function}} oHandle A Promise.withResolvers() handle to be resolved or rejected.
          * @param {sap.ushell_abap.pbServices.ui2.PageSet} oPageSet The page set containing the default page with allCatalogs.
          * @returns {Promise<sap.ushell.services.PageBuilding>} A promise that is resolved once the PageBuilding service is retrieved.
          * @private
          */
-        this._refreshRemoteCatalogs = function (oDeferred, oPageSet) {
+        this._refreshRemoteCatalogs = function (oHandle, oPageSet) {
             return Container.getServiceAsync("PageBuilding")
                 .then((PageBuildingService) => {
                     let iPendingRequests = 0;
@@ -2458,32 +2398,25 @@ sap.ui.define([
                                 oWrappedCatalog.tiles = wrapAsChipInstances(oFactory, oCatalog.getChips());
                                 // TODO oRemoteCatalogWrapper.errorMessage once wrappers are cached
 
-                                oDeferred.notify(oWrappedCatalog);
-
                                 iPendingRequests -= 1;
                                 if (iPendingRequests <= 0) {
-                                    oDeferred.resolve(aWrappedCatalogs);
+                                    oHandle.resolve(aWrappedCatalogs);
                                 }
                             }, (sErrorMessage) => {
                                 // log errors, but do not fail
                                 Log.error(`Failed to load catalog: ${sErrorMessage}`, oCatalog.toString(), sCOMPONENT);
                                 oWrappedCatalog.errorMessage = sErrorMessage || "Error"; // not undefined!
 
-                                oDeferred.notify(oWrappedCatalog);
-
                                 iPendingRequests -= 1;
                                 if (iPendingRequests <= 0) {
-                                    oDeferred.resolve(aWrappedCatalogs);
+                                    oHandle.resolve(aWrappedCatalogs);
                                 }
                             });
-                        } else {
-                            oDeferred.notify(oWrappedCatalog);
-                            oDeferred.$notified = true; // notifications have already been sent
                         }
                     });
 
                     if (iPendingRequests <= 0) {
-                        oDeferred.resolve(aWrappedCatalogs);
+                        oHandle.resolve(aWrappedCatalogs);
                     }
                 });
         };
@@ -2491,60 +2424,56 @@ sap.ui.define([
         /**
          * Resolves the promise to return the user's catalogs...by just knowing them already.
          *
-         * @param {jQuery.Deferred} oDeferred A jQuery.Deferred to be resolved, rejected or notified.
+         * @param {{promise: Promise, resolve: function, reject: function}} oHandle A Promise.withResolvers() handle to be resolved or rejected.
          * @param {sap.ushell_abap.pbServices.ui2.PageSet} oPageSet The page set containing the default page with allCatalogs.
          * @returns {Promise<sap.ushell.services.PageBuilding>} A promise that is resolved once the PageBuilding service is retrieved.
          * @private
          */
-        this._useKnownCatalogs = function (oDeferred, oPageSet) {
+        this._useKnownCatalogs = function (oHandle, oPageSet) {
             return Container.getServiceAsync("PageBuilding")
                 .then((PageBuildingService) => {
                     const aWrappedCatalogs = wrapCatalogs(PageBuildingService.getFactory(), oPageSet);
 
-                    aWrappedCatalogs.forEach((oWrappedCatalog) => {
-                        oDeferred.notify(oWrappedCatalog);
-                    });
-
-                    oDeferred.resolve(aWrappedCatalogs);
+                    oHandle.resolve(aWrappedCatalogs);
                 });
         };
 
         /**
          * Resolves the promise to return the user's catalogs either by loading them, refreshing them, or just knowing them already.
          *
-         * @param {jQuery.Deferred} oDeferred A jQuery.Deferred to be resolved, rejected or notified.
+         * @param {{promise: Promise, resolve: function, reject: function}} oHandle A Promise.withResolvers() handle to be resolved or rejected.
          * @param {boolean} bRefreshRequired Whether or not the catalogs should be loaded again.
          * @private
          */
-        this._doGetCatalogs = function (oDeferred, bRefreshRequired) {
+        this._doGetCatalogs = function (oHandle, bRefreshRequired) {
             this._getPageSet()
-                .done((oPageSet) => {
+                .then((oPageSet) => {
                     const oAllCatalogs = oPageSet.getDefaultPage().getAllCatalogs();
                     if (oAllCatalogs.isStub()) {
                         oAllCatalogs.load(() => {
-                            this._refreshRemoteCatalogs(oDeferred, oPageSet);
+                            this._refreshRemoteCatalogs(oHandle, oPageSet);
                         }, (sErrorMessage) => {
-                            oDeferred.reject(new Error(sErrorMessage));
+                            oHandle.reject(new Error(sErrorMessage));
                         }, "type eq 'CATALOG_PAGE' or type eq 'H' or type eq 'SM_CATALOG' or type eq 'REMOTE'", true, "title", true);
                     } else if (bRefreshRequired) {
-                        this._refreshRemoteCatalogs(oDeferred, oPageSet);
+                        this._refreshRemoteCatalogs(oHandle, oPageSet);
                     } else {
-                        this._useKnownCatalogs(oDeferred, oPageSet);
+                        this._useKnownCatalogs(oHandle, oPageSet);
                     }
                 })
-                .fail((oError) => {
-                    oDeferred.reject(oError);
+                .catch((oError) => {
+                    oHandle.reject(oError);
                 });
         };
 
         /**
          * Starts loading of catalogs, after parallel calls and invalidation have been taken care of.
          *
-         * @param {jQuery.Deferred} oDeferred A jQuery.Deferred to be resolved, rejected or notified.
+         * @param {{promise: Promise, resolve: function, reject: function}} oHandle A Promise.withResolvers() handle to be resolved or rejected.
          * @param {boolean} bRefreshRequired Whether or not the catalogs should be loaded again.
          * @private
          */
-        this._startLoading = function (oDeferred, bRefreshRequired) {
+        this._startLoading = function (oHandle, bRefreshRequired) {
             let oPromise;
 
             if (oLaunchPageServiceConfig && oLaunchPageServiceConfig.cacheId) {
@@ -2561,7 +2490,7 @@ sap.ui.define([
                             oCacheTokens.put(PAGE_ID_WITHOUT_TM, oLaunchPageServiceConfig.cacheId);
                         }
                     })
-                    .catch(oDeferred.reject);
+                    .catch(oHandle.reject);
             } else {
                 oPromise = Promise.resolve();
             }
@@ -2573,16 +2502,16 @@ sap.ui.define([
                      */
                     if (!that._bPageSetFullyLoaded) {
                         this.getGroups()
-                            .done(() => {
-                                this._doGetCatalogs(oDeferred, bRefreshRequired);
+                            .then(() => {
+                                this._doGetCatalogs(oHandle, bRefreshRequired);
                             })
-                            .fail(oDeferred.reject);
+                            .catch(oHandle.reject);
                         return;
                     }
 
-                    this._doGetCatalogs(oDeferred, bRefreshRequired);
+                    this._doGetCatalogs(oHandle, bRefreshRequired);
                 })
-                .catch(oDeferred.reject);
+                .catch(oHandle.reject);
         };
 
         /**
@@ -2656,40 +2585,39 @@ sap.ui.define([
          * Returns the catalog's tiles.
          *
          * @param {object} oConfigCatalog the catalog
-         * @returns {jQuery.Promise<sap.ushell_abap.pbServices.ui2.Chip[]>} Resolves the catalog tiles.
+         * @returns {Promise<sap.ushell_abap.pbServices.ui2.Chip[]>} Resolves the catalog tiles.
          * @since 1.11.0
          */
         this.getCatalogTiles = function (oConfigCatalog) {
-            const oDeferred = new jQuery.Deferred();
-            let iAsyncCount = 0;
+            return new Promise((resolve) => {
+                let iAsyncCount = 0;
 
-            function onLoaded () {
-                iAsyncCount -= 1;
+                function onLoaded () {
+                    iAsyncCount -= 1;
 
-                if (iAsyncCount === 0) {
-                    oDeferred.resolve(oConfigCatalog.tiles);
+                    if (iAsyncCount === 0) {
+                        resolve(oConfigCatalog.tiles);
+                    }
                 }
-            }
 
-            function onFailure (oCatalogTile, sErrorMessage) {
-                // log errors, but do not fail
-                Log.error(`Failed to load catalog tile: ${sErrorMessage}`, oCatalogTile.toString(), sCOMPONENT);
-                onLoaded();
-            }
-
-            for (let i = 0; i < oConfigCatalog.tiles.length; i += 1) {
-                const oChipInstance = oConfigCatalog.tiles[i];
-                if (oChipInstance.isStub()) {
-                    iAsyncCount += 1;
-                    oChipInstance.load(onLoaded, onFailure.bind(null, oChipInstance));
+                function onFailure (oCatalogTile, sErrorMessage) {
+                    // log errors, but do not fail
+                    Log.error(`Failed to load catalog tile: ${sErrorMessage}`, oCatalogTile.toString(), sCOMPONENT);
+                    onLoaded();
                 }
-            }
 
-            if (iAsyncCount === 0) {
-                oDeferred.resolve(oConfigCatalog.tiles);
-            }
+                for (let i = 0; i < oConfigCatalog.tiles.length; i += 1) {
+                    const oChipInstance = oConfigCatalog.tiles[i];
+                    if (oChipInstance.isStub()) {
+                        iAsyncCount += 1;
+                        oChipInstance.load(onLoaded, onFailure.bind(null, oChipInstance));
+                    }
+                }
 
-            return oDeferred.promise();
+                if (iAsyncCount === 0) {
+                    resolve(oConfigCatalog.tiles);
+                }
+            });
         };
 
         /**
@@ -2819,19 +2747,17 @@ sap.ui.define([
          *
          * @param {sap.ui2.ChipInstance} oCatalogTile the catalog tile
          * @param {boolean} bPreview return the tile in preview mode, default is true
-         * @returns {jQuery.Promise<sap.ui.core.Control>} the UI5 representation of the catalog tile
+         * @returns {Promise<sap.ui.core.Control>} the UI5 representation of the catalog tile
          * @since 1.97.0
          * @private
          */
-        this.getCatalogTileViewControl = function (oCatalogTile, bPreview) {
-            const oDeferred = new jQuery.Deferred();
+        this.getCatalogTileViewControl = async function (oCatalogTile, bPreview) {
             bPreview = typeof bPreview !== "undefined" ? bPreview : true;
             const sTitle = this.getCatalogTileTitle(oCatalogTile);
 
             if (oCatalogTile.isStub()) {
                 Log.warning("CHIP (instance) is just a stub!", oCatalogTile.toString(true), sCOMPONENT);
-                oDeferred.resolve(this._createErrorTile(sTitle, "CHIP was just a stub!"));
-                return oDeferred.promise();
+                return this._createErrorTile(sTitle, "CHIP was just a stub!");
             }
 
             if (bPreview) {
@@ -2839,19 +2765,16 @@ sap.ui.define([
                 if (oPreviewContract) {
                     oPreviewContract.setEnabled(true);
                 } else {
-                    oDeferred.resolve(this._createPreviewTile(sTitle));
-                    return oDeferred.promise();
+                    return this._createPreviewTile(sTitle);
                 }
             }
 
-            oCatalogTile.getImplementationAsSapui5Async()
-                .catch((oError) => {
-                    Log.error(`Cannot get catalog tile view as SAPUI5: ${oError.message || oError}`, oError.stack, sCOMPONENT);
-                    return this._createErrorTile(sTitle, (oError.message || oError));
-                })
-                .then(oDeferred.resolve);
-
-            return oDeferred.promise();
+            try {
+                return await oCatalogTile.getImplementationAsSapui5Async();
+            } catch (oError) {
+                Log.error(`Cannot get catalog tile view as SAPUI5: ${oError.message || oError}`, oError.stack, sCOMPONENT);
+                return this._createErrorTile(sTitle, (oError.message || oError));
+            }
         };
 
         /**
@@ -2957,7 +2880,7 @@ sap.ui.define([
             const sCatalogDescription = oCatalogTile.getChip().getDescription();
 
             function addKeywords (oKeywordsSet, aKeywordsList) {
-                if (Utils.isArray(aKeywordsList)) {
+                if (Array.isArray(aKeywordsList)) {
                     aKeywordsList.forEach((sKeyword) => {
                         if (oKeywordsSet.hasOwnProperty(sKeyword)) {
                             return;
@@ -3053,7 +2976,7 @@ sap.ui.define([
          *   Unsupported parameters will be ignored.
          * @param {string} oParameters.title The title of the bookmark.
          * @param {string} oParameters.url The URL of the bookmark. If the target application shall run in
-         *   the Shell the URL has to be in the format <code>"#SO-Action~Context?P1=a&P2=x&/route?RPV=1"</code>
+         *   the Shell the URL has to be in the format <code>"#SO-Action?P1=a&P2=x&/route?RPV=1"</code>
          * @param {string} [oParameters.icon] The icon URL of the bookmark (e.g. <code>"sap-icon://home"</code>).
          * @param {string} [oParameters.info] The information text of the bookmark.
          * @param {string} [oParameters.subtitle] The subtitle of the bookmark.
@@ -3063,12 +2986,12 @@ sap.ui.define([
          * @param {string} [oParameters.numberUnit] The unit for the number retrieved from <code>serviceUrl</code>.
          * @param {object} [oGroup=DefaultGroup] Group to which the bookmark will be added to.
          *   If not given the default group {@link #getDefaultGroup} is used.
-         * @returns {jQuery.Promise} Resolves once the bookmark was added.
+         * @returns {Promise} Resolves once the bookmark was added.
          * @see sap.ushell.services.URLParsing#getShellHash
          * @since 1.11.0
          * @deprecated since 1.120
          */
-        this.addBookmark = function (oParameters, oGroup) {
+        this.addBookmark = async function (oParameters, oGroup) {
             let sChipId = sSTATIC_BASE_CHIP_ID;
             let oConfiguration = {
                 display_icon_url: oParameters.icon || "",
@@ -3076,7 +2999,6 @@ sap.ui.define([
                 display_subtitle_text: oParameters.subtitle || "",
                 display_title_text: oParameters.title
             };
-            const oDeferred = new jQuery.Deferred();
 
             const oBags = {
                 tileProperties: {
@@ -3107,22 +3029,14 @@ sap.ui.define([
             if (oGroup && !(oGroup instanceof Page)) {
                 // same behavior like addCatalogTileToGroup of the Bookmark service:
                 // if the group is unknown don't use the default group but reject.
-                oDeferred.reject(new Error("The given object is not a group"));
-                return oDeferred.promise();
+                throw new Error("The given object is not a group");
             }
 
             oConfiguration = {
                 tileConfiguration: JSON.stringify(oConfiguration)
             };
 
-            this._createBookmarkTile(sChipId, oParameters.url, oConfiguration, oBags, oParameters.title, oGroup)
-                .then(() => {
-                    oDeferred.resolve();
-                })
-                .catch((oError) => {
-                    oDeferred.reject(oError);
-                });
-            return oDeferred.promise();
+            await this._createBookmarkTile(sChipId, oParameters.url, oConfiguration, oBags, oParameters.title, oGroup);
         };
 
         /**
@@ -3156,31 +3070,22 @@ sap.ui.define([
          * </pre>
          * @param {object} oGroup The group where the bookmark should be added
          *
-         * @returns {jQuery.Promise} Resolves with the resulting tile or rejects in case of an error
+         * @returns {Promise} Resolves with the resulting tile or rejects in case of an error
          *
          * @private
          * @since 1.83.0
          * @deprecated since 1.120
          */
-        this.addCustomBookmark = function (oBookmarkConfig, oGroup) {
+        this.addCustomBookmark = async function (oBookmarkConfig, oGroup) {
             const oChipConfig = oBookmarkConfig.vizConfig["sap.flp"].chipConfig;
-            const oDeferred = new jQuery.Deferred();
 
             if (oGroup && !(oGroup instanceof Page)) {
                 // same behavior like addCatalogTileToGroup of the Bookmark service:
                 // if the group is unknown don't use the default group but reject.
-                oDeferred.reject(new Error("The given object is not a group"));
-                return oDeferred.promise();
+                throw new Error("The given object is not a group");
             }
 
-            this._createBookmarkTile(oChipConfig.chipId, oBookmarkConfig.url, oChipConfig.configuration, oChipConfig.bags, oBookmarkConfig.title, oGroup)
-                .then(() => {
-                    oDeferred.resolve();
-                })
-                .catch((oError) => {
-                    oDeferred.reject(oError);
-                });
-            return oDeferred.promise();
+            await this._createBookmarkTile(oChipConfig.chipId, oBookmarkConfig.url, oChipConfig.configuration, oChipConfig.bags, oBookmarkConfig.title, oGroup);
         };
 
         /**
@@ -3431,47 +3336,32 @@ sap.ui.define([
          *
          * @param {string} sUrl The URL of the bookmarks to be visited, exactly as specified to {@link #addBookmark}.
          * @param {function(sap.ushell_abap.pbServices.ui2.ChipInstance)} [fnVisitor] The asynchronous visitor function returning a
-         *   <code>jQuery.Deferred</code> object's promise.
+         *   Promise.
          *   In case of success, no details are expected. In case of failure, an error message is passed.
-         * @returns {jQuery.Promise} Resolves the count of visited bookmarks is provided (which might be zero).
+         * @returns {Promise} Resolves the count of visited bookmarks is provided (which might be zero).
          *   In case of failure, an error message is passed.
          * @see #addBookmark
          * @since 1.17.1
          * @deprecated since 1.120
          */
-        LaunchPageAdapter.prototype._visitBookmarks = function (sUrl, fnVisitor) {
-            const aDeferreds = [];
-            const oDeferred = new jQuery.Deferred();
-
-            that.getGroupsAndWaitForAllChips()
-                .then((aGroups) => {
-                    let iCount = 0;
-                    aGroups.forEach((oGroup) => {
-                        oGroup.getChipInstances().forEach((oChipInstance) => {
-                            if (that._isBookmarkFor(oChipInstance, sUrl)) {
-                                iCount += 1;
-                                if (fnVisitor) {
-                                    aDeferreds.push(fnVisitor(oChipInstance));
-                                }
-                            }
-                        });
-                    });
-                    if (aDeferreds.length === 0) {
-                        oDeferred.resolve(iCount);
-                    } else {
-                        jQuery.when.apply(jQuery, aDeferreds)
-                            .fail((oError) => {
-                                oDeferred.reject(oError);
-                            })
-                            .done(() => {
-                                oDeferred.resolve(iCount);
-                            });
+        LaunchPageAdapter.prototype._visitBookmarks = async function (sUrl, fnVisitor) {
+            const aGroups = await that.getGroupsAndWaitForAllChips();
+            const aPromises = [];
+            let iCount = 0;
+
+            aGroups.forEach((oGroup) => {
+                oGroup.getChipInstances().forEach((oChipInstance) => {
+                    if (that._isBookmarkFor(oChipInstance, sUrl)) {
+                        iCount += 1;
+                        if (fnVisitor) {
+                            aPromises.push(fnVisitor(oChipInstance));
+                        }
                     }
-                })
-                .catch((oError) => {
-                    oDeferred.reject(oError);
                 });
-            return oDeferred.promise();
+            });
+
+            await Promise.all(aPromises);
+            return iCount;
         };
 
         /**
@@ -3497,30 +3387,23 @@ sap.ui.define([
             if (!oIdentifier.chipId) {
                 throw new Error("_visitCustomBookmarks: Required parameter is missing: oIdentifier.chipId");
             }
-            return new Promise((resolve, reject) => {
-                this.getGroups()
-                    .fail(reject)
-                    .done((aGroups) => {
-                        const aPromises = [];
-                        let iCount = 0;
-
-                        aGroups.forEach((oGroup) => {
-                            oGroup.getChipInstances().forEach((oChipInstance) => {
-                                if (LaunchPageAdapter.prototype._isBookmarkFor(oChipInstance, oIdentifier)) {
-                                    iCount += 1;
-                                    if (fnVisitor) {
-                                        aPromises.push(fnVisitor(oChipInstance));
-                                    }
+            return this.getGroups()
+                .then((aGroups) => {
+                    const aPromises = [];
+                    let iCount = 0;
+
+                    aGroups.forEach((oGroup) => {
+                        oGroup.getChipInstances().forEach((oChipInstance) => {
+                            if (LaunchPageAdapter.prototype._isBookmarkFor(oChipInstance, oIdentifier)) {
+                                iCount += 1;
+                                if (fnVisitor) {
+                                    aPromises.push(fnVisitor(oChipInstance));
                                 }
-                            });
+                            }
                         });
-                        Promise.all(aPromises)
-                            .then(() => {
-                                resolve(iCount);
-                            })
-                            .catch(reject);
                     });
-            });
+                    return Promise.all(aPromises).then(() => iCount);
+                });
         };
 
         /**
@@ -3530,7 +3413,7 @@ sap.ui.define([
          * This is a potentially asynchronous operation in case the user's pages have not yet been loaded completely!
          *
          * @param {string} sUrl The URL of the bookmarks to be counted, exactly as specified to {@link #addBookmark}.
-         * @returns {jQuery.Promise} Resolves the count of existing bookmarks is provided (which might be zero).
+         * @returns {Promise} Resolves the count of existing bookmarks is provided (which might be zero).
          *   In case of failure, an error message is passed.
          * @see #addBookmark
          * @since 1.17.1
@@ -3567,7 +3450,7 @@ sap.ui.define([
          * Deletes <b>all</b> bookmarks pointing to the given URL from all of the user's pages.
          *
          * @param {string} sUrl The URL of the bookmarks to be deleted, exactly as specified to {@link #addBookmark}.
-         * @returns {jQuery.Promise} Resolves the number of deleted bookmarks is provided (which might be zero).
+         * @returns {Promise} Resolves the number of deleted bookmarks is provided (which might be zero).
          *   In case of failure, an error message is passed.
          * @see #addBookmark
          * @see #countBookmarks
@@ -3576,12 +3459,11 @@ sap.ui.define([
          */
         this.deleteBookmarks = function (sUrl) {
             return LaunchPageAdapter.prototype._visitBookmarks(sUrl, (oChipInstance) => {
-                const oDeferred = new jQuery.Deferred();
-                oChipInstance.remove(oDeferred.resolve.bind(oDeferred),
-                    (sErrorMessage) => {
-                        oDeferred.reject(new Error(sErrorMessage));
+                return new Promise((resolve, reject) => {
+                    oChipInstance.remove(resolve, (sErrorMessage) => {
+                        reject(new Error(sErrorMessage));
                     });
-                return oDeferred.promise();
+                });
             });
         };
 
@@ -3622,7 +3504,7 @@ sap.ui.define([
          * @param {string} sUrl The URL of the bookmarks to be updated, exactly as specified to {@link #addBookmark}.
          *   In case you need to update the URL itself, pass the old one here and the new one as <code>oParameters.url</code>!
          * @param {object} oParameters The bookmark parameters as documented in {@link #addBookmark}.
-         * @returns {jQuery.Promise} Resolves the number of updated bookmarks is provided (which might be zero).
+         * @returns {Promise} Resolves the number of updated bookmarks is provided (which might be zero).
          *   In case of failure, an error message is passed.
          * @see #addBookmark
          * @see #countBookmarks
@@ -3633,7 +3515,6 @@ sap.ui.define([
         this.updateBookmarks = function (sUrl, oParameters) {
             return LaunchPageAdapter.prototype._visitBookmarks(sUrl, (oChipInstance) => {
                 const oTileConfiguration = getAppLauncherTileConfiguration(oChipInstance);
-                const oDeferred = new jQuery.Deferred();
 
                 // do only the update for properties which changed
                 const oBags = {
@@ -3666,7 +3547,7 @@ sap.ui.define([
 
                 const oConfiguration = {};
 
-                this._getTileTargetConfiguration(oParameters.url || oTileConfiguration.navigation_target_url)
+                return this._getTileTargetConfiguration(oParameters.url || oTileConfiguration.navigation_target_url)
                     .then((oNavigationConfiguration) => {
                         // merge navigation properties on top of the provided configuration
                         oNewTileConfiguration = deepExtend({}, oNewTileConfiguration, oNavigationConfiguration);
@@ -3687,13 +3568,7 @@ sap.ui.define([
                         if (aUpdatedBags.length) {
                             oChipInstance.getContract("bag").fireBagsUpdated(aUpdatedBags);
                         }
-                        oDeferred.resolve();
-                    })
-                    .catch((oError) => {
-                        oDeferred.reject(oError);
                     });
-
-                return oDeferred.promise();
             });
         };