@sapui5/sap.ushell_abap 1.151.0 → 1.152.0

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
  *
  * @deprecated since 1.100
- * @version 1.151.0
+ * @version 1.152.0
  */
 sap.ui.define([
     "sap/ushell_abap/adapters/abap/FlpLaunchPageAdapter"

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

@@ -8,7 +8,7 @@
  * service now calls the ClientSideTargetResolution service in the ABAP
  * platform.
  *
- * @version 1.151.0
+ * @version 1.152.0
  */
 sap.ui.define([], () => {
     "use strict";

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

@@ -8,7 +8,7 @@
  * service now calls the ClientSideTargetResolution service in the ABAP
  * platform.
  *
- * @version 1.151.0
+ * @version 1.152.0
  * @since 1.121
  */
 sap.ui.define([], () => {

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
- * @version 1.151.0
+ * @version 1.152.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview PagePersistenceAdapter for the ABAP platform.
- * @version 1.151.0
+ * @version 1.152.0
  */
 sap.ui.define([
     "sap/base/i18n/Localization",

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

@@ -7,7 +7,7 @@
  *               Container header properties transported via pseudo-items are mapped to the
  *               respective header properties in setItem/getItem/delItem
  *
- * @version 1.151.0
+ * @version 1.152.0
  */
 sap.ui.define([
     "sap/ushell_abap/adapters/abap/AdapterContainer",

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

@@ -7,7 +7,7 @@
  *               Container header properties transported via pseudo-items are mapped to the
  *               respective header properties in setItem/getItem/delItem
  *
- * @version 1.151.0
+ * @version 1.152.0
  */
 sap.ui.define([
     "./PersonalizationAdapter"

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Search adapter for the ABAP platform.
- * @version 1.151.0
+ * @version 1.152.0
  */
 sap.ui.define([], () => {
     "use strict";

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The SupportTicket adapter for the ABAP platform.
- * @version 1.151.0
+ * @version 1.152.0
  */
 sap.ui.define([
     "sap/base/util/isEmptyObject",

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the ABAP platform
  *
- * @version 1.151.0
+ * @version 1.152.0
  */
 sap.ui.define([
 ], () => {

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

@@ -1,25 +1,23 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ushell_abap/pbServices/ui2/ODataWrapper",
+    "sap/base/i18n/date/CalendarWeekNumbering",
+    "sap/base/Log",
     "sap/ui/thirdparty/datajs",
-    "sap/ui/thirdparty/jquery",
     "sap/ui/VersionInfo",
-    "sap/base/Log",
-    "sap/ushell/resources",
-    "sap/base/i18n/date/CalendarWeekNumbering",
     "sap/ushell/Config",
-    "sap/ushell/utils/LaunchpadError"
+    "sap/ushell/resources",
+    "sap/ushell/utils/LaunchpadError",
+    "sap/ushell_abap/pbServices/ui2/ODataWrapper"
 ], (
-    ODataWrapper,
+    CalendarWeekNumbering,
+    Log,
     datajs,
-    jQuery,
     VersionInfo,
-    Log,
-    resources,
-    CalendarWeekNumbering,
     Config,
-    LaunchpadError
+    resources,
+    LaunchpadError,
+    ODataWrapper
 ) => {
     "use strict";
 
@@ -81,45 +79,42 @@ sap.ui.define([
             return {
                 themes: aThemes,
                 sets: aThemeSets,
-                themeRoot: sThemeRoot // neeeded for calculate avatar urls
+                themeRoot: sThemeRoot // needed for calculate avatar urls
             };
         };
 
         /**
          * Returns the list of themes available for the user.
          *
-         * @returns {jQuery.Promise} Resolves the theme list.
+         * @returns {Promise} Resolves the theme list.
          */
-        this.getThemeList = function () {
-            const oDeferred = new jQuery.Deferred();
-
-            this._getThemeList()
-                .then((oThemeList) => {
-                    oDeferred.resolve({
-                        options: oThemeList.themes, // rename for compatibility with previous implementation
-                        sets: oThemeList.sets,
-                        themeRoot: oThemeList.themeRoot
-                    });
-                })
-                .catch((oError) => {
-                    Log.error(oError.message, oError, "sap.ushell_abap.adapters.abap.UserInfoAdapter");
-                    // fallback to the previous implementation via /UI2/INTEROP
+        this.getThemeList = async function () {
+            try {
+                const oThemeList = await this._getThemeList();
+                return {
+                    options: oThemeList.themes, // rename for compatibility with previous implementation
+                    sets: oThemeList.sets,
+                    themeRoot: oThemeList.themeRoot
+                };
+            } catch (oError) {
+                Log.error(oError.message, oError, "sap.ushell_abap.adapters.abap.UserInfoAdapter");
+                // fallback to the previous implementation via /UI2/INTEROP
+                return new Promise((resolve, reject) => {
                     datajs.read({requestUri: "/sap/opu/odata/UI2/INTEROP/Themes"},
                         (oData) => { // success
-                            oDeferred.resolve({
+                            resolve({
                                 options: oData?.results || []
                             });
                         },
                         (oDataJsError) => { // fail
                             Log.error(oDataJsError.message, null, "sap.ushell_abap.adapters.abap.UserInfoAdapter");
-                            const oError = new LaunchpadError(`Failed to fetch data: ${oDataJsError.message}`, {
+                            const oFallbackError = new LaunchpadError(`Failed to fetch data: ${oDataJsError.message}`, {
                                 dataJsError: oDataJsError
                             });
-                            oDeferred.reject(oError);
+                            reject(oFallbackError);
                         });
                 });
-
-            return oDeferred.promise();
+            }
         };
 
         /**
@@ -150,42 +145,41 @@ sap.ui.define([
         /**
          * Returns the list of available language for the user.
          *
-         * @returns {jQuery.Promise} Resolves the list of languages.
+         * @returns {Promise} Resolves the list of languages.
          */
         this.getLanguageList = function () {
-            const oDeferred = new jQuery.Deferred();
             const sUri = encodeURI("/sap/opu/odata/UI2/INTEROP/UserProfilePropertyValues?$filter=id eq 'PREFERRED_LOGON_LANGUAGE'");
 
-            // read semantic objects from interop service
-            datajs.read({ requestUri: sUri },
-                // sucess
-                (oData) => {
-                    let aResult = [{
-                        text: resources.i18n.getText("userSettings.browserLanguage"),
-                        key: DEFAULT_LANGUAGE_KEY
-                    }];
-                    const aLanguageListFromServer = oData.results.map((oLanguage) => {
-                        return {
-                            text: oLanguage.description,
-                            key: oLanguage.value
-                        };
-                    }).sort((oLanguage1, oLanguage2) => {
-                        return oLanguage1.text.localeCompare(oLanguage2.text);
-                    });
+            return new Promise((resolve, reject) => {
+                // read semantic objects from interop service
+                datajs.read({ requestUri: sUri },
+                    // success
+                    (oData) => {
+                        let aResult = [{
+                            text: resources.i18n.getText("userSettings.browserLanguage"),
+                            key: DEFAULT_LANGUAGE_KEY
+                        }];
+                        const aLanguageListFromServer = oData.results.map((oLanguage) => {
+                            return {
+                                text: oLanguage.description,
+                                key: oLanguage.value
+                            };
+                        }).sort((oLanguage1, oLanguage2) => {
+                            return oLanguage1.text.localeCompare(oLanguage2.text);
+                        });
 
-                    aResult = aResult.concat(aLanguageListFromServer);
-                    oDeferred.resolve(aResult);
-                },
-                // fail
-                (oDataJsError) => {
-                    Log.error(oDataJsError.message, null, "sap.ushell_abap.adapters.abap.UserInfoAdapter");
-                    const oError = new LaunchpadError(`Failed to fetch data: ${oDataJsError.message}`, {
-                        dataJsError: oDataJsError
+                        aResult = aResult.concat(aLanguageListFromServer);
+                        resolve(aResult);
+                    },
+                    // fail
+                    (oDataJsError) => {
+                        Log.error(oDataJsError.message, null, "sap.ushell_abap.adapters.abap.UserInfoAdapter");
+                        const oError = new LaunchpadError(`Failed to fetch data: ${oDataJsError.message}`, {
+                            dataJsError: oDataJsError
+                        });
+                        reject(oError);
                     });
-                    oDeferred.reject(oError);
-                });
-
-            return oDeferred.promise();
+            });
         };
 
         /**
@@ -197,7 +191,7 @@ sap.ui.define([
          * This is also the indicator that this user profile property cannot be changed via
          * a call to <code>updateUserPreferences</code>.
          *
-         * @returns {jQuery.Promise} Resolves an object with the received results, .e.g.:
+         * @returns {Promise} Resolves an object with the received results, .e.g.:
          *              <pre>
          *              {
          *                  "NUMBER_FORMAT": [
@@ -214,7 +208,6 @@ sap.ui.define([
          * @private
          */
         this.getUserProfilePropertyValueLists = function () {
-            const oDeferred = new jQuery.Deferred();
             let sUri;
             const oResult = {};
             const aUserProfilePropertyIds = [
@@ -226,6 +219,7 @@ sap.ui.define([
             ];
 
             const oODataWrapper = this._createWrapper("/sap/opu/odata/UI2/INTEROP/");
+
             oODataWrapper.openBatchQueue();
             let sCurrentId;
 
@@ -245,19 +239,19 @@ sap.ui.define([
                 );
             }
 
-            oODataWrapper.submitBatchQueue(
-                // success
-                () => {
-                    oDeferred.resolve(oResult);
-                },
-                // error
-                (sErrorMessage) => {
-                    Log.error(sErrorMessage, null, "sap.ushell_abap.adapters.abap.UserInfoAdapter");
-                    oDeferred.reject(new Error(sErrorMessage));
-                }
-            );
-
-            return oDeferred.promise();
+            return new Promise((resolve, reject) => {
+                oODataWrapper.submitBatchQueue(
+                    // success
+                    () => {
+                        resolve(oResult);
+                    },
+                    // error
+                    (sErrorMessage) => {
+                        Log.error(sErrorMessage, null, "sap.ushell_abap.adapters.abap.UserInfoAdapter");
+                        reject(new Error(sErrorMessage));
+                    }
+                );
+            });
         };
 
         this._createWrapper = function (sBaseUrl) {
@@ -269,24 +263,14 @@ sap.ui.define([
          *
          *  @param {object} oUser User object
          *
-         *  @returns {jQuery.Promise} Resolves once the preferences were updated.
+         *  @returns {Promise} Resolves once the preferences were updated.
          */
         this.updateUserPreferences = function (oUser) {
             Log.debug("[000] updateUserPreferences", "UserInfoAdapter");
-            const that = this;
             let sRelativeUrl;
             let iODataRequestsRunning;
             let oDataObj;
-            const oDeferred = new jQuery.Deferred();
-            function fnSuccess () {
-                iODataRequestsRunning -= 1;
-                if (iODataRequestsRunning === 0) {
-                    oDeferred.resolve();
-                }
-            }
-            function fnFailure (sErrorMessage, oParsedErrorInformation) {
-                oDeferred.reject(new Error(sErrorMessage), oParsedErrorInformation);
-            }
+
             Log.debug("[000] updateUserPreferences: _createWrapper", "UserInfoAdapter");
             oDataWrapper = this._createWrapper("/sap/opu/odata/UI2/INTEROP/");
 
@@ -294,44 +278,54 @@ sap.ui.define([
             Log.debug("[000] updateUserPreferences: oDataWrapper.openBatchQueue", "UserInfoAdapter");
             oDataWrapper.openBatchQueue();
 
-            // put the preferences to update in the OData batch queue
-            const aUserChangedProperties = oUser.getChangedProperties() || [];
-            Log.debug("[000] updateUserPreferences: getChangedProperties", "UserInfoAdapter");
-            iODataRequestsRunning = aUserChangedProperties.length;
-            aUserChangedProperties.forEach((oUserChangedProperty) => {
-                let name = oUserChangedProperty.name;
-                let newValue = oUserChangedProperty.newValue;
-                if (name.toUpperCase() === "LANGUAGE") {
-                    name = "PREFERRED_LOGON_LANGUAGE";
-                    newValue = newValue === DEFAULT_LANGUAGE_KEY ? undefined : newValue;
+            return new Promise((resolve, reject) => {
+                function fnSuccess () {
+                    iODataRequestsRunning -= 1;
+                    if (iODataRequestsRunning === 0) {
+                        resolve();
+                    }
                 }
-                sRelativeUrl = `UserProfileProperties(${[
-                    `id='${name}'`,
-                    "shellType='FLP')"
-                ].join(",")}`;
-
-                // the preference to update
-                oDataObj = {
-                    id: name,
-                    shellType: "FLP",
-                    value: newValue
-                };
-                // check for the datatype of the value & process oDataObj
-                that._updateODataObjectBasedOnDatatype(newValue, oDataObj);
-                Log.debug("[000] updateUserPreferences: oDataWrapper: put", "UserInfoAdapter");
-                oDataWrapper.put(sRelativeUrl, oDataObj, fnSuccess, fnFailure);
-            });
-            Log.debug("[000] updateUserPreferences: submitBatchQueue", "UserInfoAdapter");
-            // submit
-            oDataWrapper.submitBatchQueue(() => {
-                // request accepted but does not mean that the single requests
-                // have been successfully resolved - see above
-                if (iODataRequestsRunning === 0) {
-                    oDeferred.resolve();
+                function fnFailure (sErrorMessage) {
+                    reject(new Error(sErrorMessage));
                 }
-            }, fnFailure);
 
-            return oDeferred.promise();
+                // put the preferences to update in the OData batch queue
+                const aUserChangedProperties = oUser.getChangedProperties() || [];
+                Log.debug("[000] updateUserPreferences: getChangedProperties", "UserInfoAdapter");
+                iODataRequestsRunning = aUserChangedProperties.length;
+                aUserChangedProperties.forEach((oUserChangedProperty) => {
+                    let name = oUserChangedProperty.name;
+                    let newValue = oUserChangedProperty.newValue;
+                    if (name.toUpperCase() === "LANGUAGE") {
+                        name = "PREFERRED_LOGON_LANGUAGE";
+                        newValue = newValue === DEFAULT_LANGUAGE_KEY ? undefined : newValue;
+                    }
+                    sRelativeUrl = `UserProfileProperties(${[
+                        `id='${name}'`,
+                        "shellType='FLP')"
+                    ].join(",")}`;
+
+                    // the preference to update
+                    oDataObj = {
+                        id: name,
+                        shellType: "FLP",
+                        value: newValue
+                    };
+                    // check for the datatype of the value & process oDataObj
+                    this._updateODataObjectBasedOnDatatype(newValue, oDataObj);
+                    Log.debug("[000] updateUserPreferences: oDataWrapper: put", "UserInfoAdapter");
+                    oDataWrapper.put(sRelativeUrl, oDataObj, fnSuccess, fnFailure);
+                });
+                Log.debug("[000] updateUserPreferences: submitBatchQueue", "UserInfoAdapter");
+                // submit
+                oDataWrapper.submitBatchQueue(() => {
+                    // request accepted but does not mean that the single requests
+                    // have been successfully resolved - see above
+                    if (iODataRequestsRunning === 0) {
+                        resolve();
+                    }
+                }, fnFailure);
+            });
         };
     };
 });

package/src/main/js/sap/ushell_abap/adapters/hana/ContainerAdapter.js

@@ -3,14 +3,16 @@
 /**
  * @fileOverview The Unified Shell's container adapter for the HANA platform.
  *
- * @version 1.151.0
+ * @version 1.152.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
-    "sap/base/Log"
+    "sap/base/Log",
+    "sap/ushell/base/promisify"
 ], (
     jQuery,
-    Log
+    Log,
+    promisify
 ) => {
     "use strict";
 
@@ -72,45 +74,37 @@ sap.ui.define([
         /**
          * Logs out the current user from this adapter's systems backend system.
          *
-         * @returns {jQuery.Promise} Resolved when logout is finished, even when it failed
+         * @returns {Promise} Resolved when logout is finished, even when it failed
          * @since 1.11.0
          */
-        this.logout = function () {
-            const oDeferred = new jQuery.Deferred();
-
-            jQuery.ajax({
-                type: "HEAD",
-                url: oSystem.adjustUrl("/sap/hana/xs/formLogin/token.xsjs"),
-                headers: {
-                    "X-CSRF-Token": "Fetch"
-                },
-                success: function (oData, oStatus, oXhr) {
-                    jQuery.ajax({
+        this.logout = async function () {
+            try {
+                const [, , oXhr] = await promisify(jQuery.ajax({
+                    type: "HEAD",
+                    url: oSystem.adjustUrl("/sap/hana/xs/formLogin/token.xsjs"),
+                    headers: {
+                        "X-CSRF-Token": "Fetch"
+                    }
+                }), /* bWrapDeferredResult */ true);
+                try {
+                    await promisify(jQuery.ajax({
                         type: "POST",
                         url: oSystem.adjustUrl("/sap/hana/xs/formLogin/logout.xscfunc"),
                         headers: {
                             "X-CSRF-Token": oXhr.getResponseHeader("X-CSRF-Token")
-                        },
-                        success: function () {
-                            Log.info(`HANA system logged out: ${oSystem.getAlias()}`,
-                                null, "sap.ushell_abap.adapters.hana.ContainerAdapter");
-                            oDeferred.resolve();
-                        },
-                        error: function () {
-                            Log.error(`Logging out HANA system failed: ${
-                                oSystem.getAlias()}`, null,
-                            "sap.ushell_abap.adapters.hana.ContainerAdapter");
-                            oDeferred.resolve();
                         }
-                    });
-                },
-                error: function () {
-                    Log.error(`Fetching X-CSRF-Token failed: ${oSystem.getAlias()}`,
+                    }));
+                    Log.info(`HANA system logged out: ${oSystem.getAlias()}`,
                         null, "sap.ushell_abap.adapters.hana.ContainerAdapter");
-                    oDeferred.resolve();
+                } catch {
+                    Log.error(`Logging out HANA system failed: ${
+                        oSystem.getAlias()}`, null,
+                    "sap.ushell_abap.adapters.hana.ContainerAdapter");
                 }
-            });
-            return oDeferred.promise();
+            } catch {
+                Log.error(`Fetching X-CSRF-Token failed: ${oSystem.getAlias()}`,
+                    null, "sap.ushell_abap.adapters.hana.ContainerAdapter");
+            }
         };
     };
 }, true /* bExport */);

package/src/main/js/sap/ushell_abap/bootstrap/PageSetsRequestHandler.js

@@ -5,19 +5,17 @@
  */
 sap.ui.define([
     "sap/base/Log",
-    "sap/ui/thirdparty/jquery",
+    "sap/ushell/base/requireAsync",
     "sap/ushell_abap/bootstrap/XhrFactory",
     "sap/ushell_abap/base/Ui2Utils"
 ], (
     Log,
-    jQuery,
+    requireAsync,
     XhrFactory,
     ui2Utils
 ) => {
     "use strict";
 
-    /* global OData */
-
     const S_PAGE_SETS_FALLBACK_URL_BASE = "/sap/opu/odata/UI2/PAGE_BUILDER_PERS";
     const S_PAGE_SETS_FALLBACK_EXPAND = "Pages/PageChipInstances/Chip/ChipBags/ChipProperties,"
             + "Pages/PageChipInstances/RemoteCatalog,"
@@ -114,25 +112,6 @@ sap.ui.define([
             return sServiceUrl;
         }
 
-        /**
-         * Processes the OData response.
-         * @param {jQuery.Deferred} oDeferred the deferred object updating the cache in OData.read
-         * @param {int} iStatus the status code
-         * @param {string} sCsrfToken the CSRF token
-         * @param {string} sResponse the response message
-         *
-         * @private
-         */
-        #processOData (oDeferred, iStatus, sCsrfToken, sResponse) {
-            if (iStatus === 200) {
-                oDeferred.resolve(JSON.parse(sResponse).d, sCsrfToken);
-            } else {
-                // rejecting the deferred will make the request later (in the ushell adapter) fail, so
-                // the error handling there takes effect
-                oDeferred.reject(new Error(`PageSet request failed: ${sResponse}`));
-            }
-        }
-
         /**
          * Determines the URL for the PageSets OData service from the startup service result. If the URL is not set
          * a hard-coded fallback URL is returned and set in the startupResult.
@@ -160,35 +139,24 @@ sap.ui.define([
         }
 
         /**
-         * Creates the Deferred in the OData.read cache to keep the result of the request with the
-         * given URL.
-         * @param {string} sUrl the URL to be requested
-         * @returns {jQuery.Deferred} the deferred object which will be resolved with the response of the request
+         * Performs an OData GET request using a plain XHR.
+         * @param {string} sUrl the url to be requested
+         * @param {object} oStartupResult the startup result object, containing the base URL and the CSRF token
+         * @returns {Promise<object>} Resolves the response
          *
          * @private
          */
-        #createODataDeferred (sUrl) {
-            const oDeferred = new jQuery.Deferred();
+        #sendODataRequest (sUrl, oStartupResult) {
+            const oDeferred = Promise.withResolvers();
+
             // creating the deferred objects here should ensure that the ushell adapters later read
             // the responses from the "cache", even if UI5 bootstrap is faster than the
             // OData requests
-            sap.ui.require(["sap/ui/thirdparty/datajs"], (datajs) => {
-                OData.read.$cache = OData.read.$cache || new ui2Utils.Map();
-                OData.read.$cache.put(sUrl, oDeferred.promise());
+            requireAsync(["sap/ui/thirdparty/datajs"]).then(([datajs]) => {
+                datajs.read.$cache = datajs.read.$cache || new ui2Utils.Map();
+                datajs.read.$cache.put(sUrl, oDeferred.promise);
             });
-            return oDeferred;
-        }
 
-        /**
-         * Performs an OData GET request using a plain XHR.
-         * @param {string} sUrl the url to be requested
-         * @param {object} oStartupResult the startup result object, containing the base URL and the CSRF token
-         * @param {function(number, object, function)} fnCallback callback function to be called when the request finished,
-         *  taking the status code, the CSRF token and the response message
-         *
-         * @private
-         */
-        #requestOData (sUrl, oStartupResult, fnCallback) {
             const oXhr = XhrFactory.createAndOpen(sUrl, oStartupResult);
             // set sap-statistics header, see
             // http://help.sap.com/saphelp_nw74/helpdata/de/40/93b81292194d6a926e105c10d5048d/content.htm
@@ -199,18 +167,25 @@ sap.ui.define([
                 if (this.readyState !== /* DONE */4) {
                     return; // not yet DONE
                 }
-                fnCallback(oXhr.status, undefined /* csrf token */, oXhr.responseText);
+
+                if (oXhr.status === 200) {
+                    oDeferred.resolve([JSON.parse(oXhr.responseText).d, undefined /* sCsrfToken */]);
+                } else {
+                    // rejecting the deferred will make the request later (in the ushell adapter) fail, so
+                    // the error handling there takes effect
+                    oDeferred.reject(new Error(`PageSet request failed: ${oXhr.responseText}`));
+                }
             };
+
             oXhr.send();
+
+            return oDeferred.promise;
         }
 
-        requestPageSets (oStartupResult) {
+        async requestPageSets (oStartupResult) {
             const sPageSetServiceUrl = this.#getAndAdjustPageSetServiceURL(oStartupResult);
-            const oDeferred = this.#createODataDeferred(sPageSetServiceUrl);// TODO make as Promise.all
 
-            this.#requestOData(sPageSetServiceUrl, oStartupResult, (iStatus, sCsrfToken, sResponse) => {
-                this.#processOData(oDeferred, iStatus, sCsrfToken, sResponse);
-            });
+            await this.#sendODataRequest(sPageSetServiceUrl, oStartupResult);
         }
 
         /**