@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -2,7 +2,7 @@
 
 /**
  * @file Exposes a CommonDataModel-based site document in a platform-neutral format to it's clients
- * @version 1.138.1
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ushell/services/CommonDataModel/PersonalizationProcessor",
@@ -23,7 +23,7 @@ sap.ui.define([
     "sap/ushell/adapters/cdm/v3/_LaunchPage/readApplications",
     "sap/base/Log",
     "sap/ushell/Container"
-], function (
+], (
     PersonalizationProcessor,
     VizTypeDefaults,
     ObjectPath,
@@ -42,16 +42,16 @@ sap.ui.define([
     readApplications,
     Log,
     Container
-) {
+) => {
     "use strict";
 
     // shortcut for sap.ushell.DisplayFormat
-    var DisplayFormat = ushellLibrary.DisplayFormat;
+    const DisplayFormat = ushellLibrary.DisplayFormat;
 
     // shortcut for sap.ushell.ContentNodeType
-    var ContentNodeType = ushellLibrary.ContentNodeType;
+    const ContentNodeType = ushellLibrary.ContentNodeType;
 
-    var S_COMPONENT_NAME = "sap.ushell.services.CommonDataModel";
+    const S_COMPONENT_NAME = "sap.ushell.services.CommonDataModel";
 
     /**
      * @alias sap.ushell.services.CommonDataModel
@@ -169,14 +169,14 @@ sap.ui.define([
      * @private
      */
     CommonDataModel.prototype._applyPagePersonalization = function (oPage, oPersonalization) {
-        var sPageId = oPage.identification.id;
+        const sPageId = oPage.identification.id;
 
         if (Object.keys(oPersonalization).length) {
             // BCP: 002075129400005034972020
             // Recover old personalization
-            var oClassicPers = oPersonalization.classicHomePage;
+            const oClassicPers = oPersonalization.classicHomePage;
             if (oClassicPers && oClassicPers.version === "3.1.0") {
-                Object.keys(oClassicPers).forEach(function (sPage) {
+                Object.keys(oClassicPers).forEach((sPage) => {
                     // only recover pages which were not further personalized
                     if (!oPersonalization[sPage]) {
                         oPersonalization[sPage] = oClassicPers[sPage];
@@ -187,7 +187,7 @@ sap.ui.define([
             }
 
             // Migrate classic homepage personalization to pages personalization
-            var oVersion = new Version(oPersonalization._version || oPersonalization.version);
+            const oVersion = new Version(oPersonalization._version || oPersonalization.version);
             if (oVersion.compareTo("3.1.0") < 0) {
                 oPersonalization = {
                     classicHomePage: oPersonalization,
@@ -201,14 +201,13 @@ sap.ui.define([
         // clone the page's personalization delta to make sure that it is not changed
         // this is important as the delta might not get extracted again before it is saved
         // which would save the changed delta
-        var oPagePersonalization = deepClone(oPersonalization[sPageId], 20) || {};
-        var oConvertedPage = this._oSiteConverter.convertTo("3.0.0", deepClone(oPage, 20));
-
-        return this._triggerMixinPersonalizationInSite(oConvertedPage, oPagePersonalization)
-            .then(function (oPersonalizedSite) {
-                this._oPersonalizedPages[sPageId] = this._oSiteConverter.convertTo("3.1.0", deepClone(oPersonalizedSite, 20));
-                return this._oPersonalizedPages[sPageId];
-            }.bind(this));
+        const oPagePersonalization = deepClone(oPersonalization[sPageId], 20) || {};
+        const oConvertedPage = this._oSiteConverter.convertTo("3.0.0", deepClone(oPage, 20));
+
+        return this._triggerMixinPersonalizationInSite(oConvertedPage, oPagePersonalization).then((oPersonalizedSite) => {
+            this._oPersonalizedPages[sPageId] = this._oSiteConverter.convertTo("3.1.0", deepClone(oPersonalizedSite, 20));
+            return this._oPersonalizedPages[sPageId];
+        });
     };
 
     /**
@@ -222,22 +221,18 @@ sap.ui.define([
      * @private
      * @since 1.98.0
      */
-    CommonDataModel.prototype._migratePersonalizedPages = function (aPages) {
+    CommonDataModel.prototype._migratePersonalizedPages = async function (aPages) {
         if (typeof this._oAdapter.migratePersonalizedPages !== "function") {
-            return Promise.resolve(aPages);
+            return aPages;
         }
 
-        return this._oAdapter.migratePersonalizedPages(aPages)
-            .then(function (aPagesToSave) {
-                if (aPagesToSave.length === 0) {
-                    return null;
-                }
+        const aPagesToSave = await this._oAdapter.migratePersonalizedPages(aPages);
 
-                return this.save(aPagesToSave);
-            }.bind(this))
-            .then(function () {
-                return aPages;
-            });
+        if (aPagesToSave.length) {
+            await this.save(aPagesToSave);
+        }
+
+        return aPages;
     };
 
     /**
@@ -267,14 +262,15 @@ sap.ui.define([
 
     /**
      * TODO to be removed
+     * @returns {jQuery.Deferred} resolves with the groups order.
      * @private
      */
     CommonDataModel.prototype.getHomepageGroups = function () {
-        var oDeferred = new jQuery.Deferred();
+        const oDeferred = new jQuery.Deferred();
 
-        this.getSite().then(function (oSite) {
+        this.getSite().then((oSite) => {
             // the group order was not available in the very first ABAP CDM RT Site
-            var aGroupsOrder = (oSite && oSite.site && oSite.site.payload && oSite.site.payload.groupsOrder)
+            const aGroupsOrder = (oSite && oSite.site && oSite.site.payload && oSite.site.payload.groupsOrder)
                 ? oSite.site.payload.groupsOrder : [];
 
             oDeferred.resolve(aGroupsOrder);
@@ -284,14 +280,15 @@ sap.ui.define([
 
     /**
      * TODO to be removed
+     * @returns {jQuery.Deferred} resolves with the groups.
      * @private
      */
     CommonDataModel.prototype.getGroups = function () {
-        var oDeferred = new jQuery.Deferred();
+        const oDeferred = new jQuery.Deferred();
 
-        this.getSite().then(function (oSite) {
-            var aGroups = [];
-            Object.keys(oSite.groups).forEach(function (sKey) {
+        this.getSite().then((oSite) => {
+            const aGroups = [];
+            Object.keys(oSite.groups).forEach((sKey) => {
                 aGroups.push(oSite.groups[sKey]);
             });
             oDeferred.resolve(aGroups);
@@ -301,16 +298,18 @@ sap.ui.define([
 
     /**
      * TODO to be removed
+     * @param {string} sId the id of the group.
+     * @returns {jQuery.Deferred} resolves with a group or rejects with an error string.
      * @private
      */
     CommonDataModel.prototype.getGroup = function (sId) {
-        var oDeferred = new jQuery.Deferred();
-        this.getSite().then(function (oSite) {
-            var oGroup = oSite.groups[sId];
+        const oDeferred = new jQuery.Deferred();
+        this.getSite().then((oSite) => {
+            const oGroup = oSite.groups[sId];
             if (oGroup) {
                 oDeferred.resolve(oGroup);
             } else {
-                oDeferred.reject("Group " + sId + " not found");
+                oDeferred.reject(`Group ${sId} not found`);
             }
         });
         return oDeferred.promise();
@@ -331,7 +330,7 @@ sap.ui.define([
      * @since 1.40.0
      */
     CommonDataModel.prototype.getSite = function () {
-        //TODO JSDoc: tbd is it allowed to change "personalization" section?
+        // TODO JSDoc: tbd is it allowed to change "personalization" section?
 
         // The personalization gets only loaded here for CDM versions < 3.1.0
         // and if it was not loaded early
@@ -368,42 +367,39 @@ sap.ui.define([
      * @private
      *
      */
-    CommonDataModel.prototype.getPage = function (sPageId) {
-        var bEnablePersonalization = Config.last("/core/shell/enablePersonalization");
-        var bEnableMyHome = Config.last("/core/spaces/myHome/enabled");
-        var sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
-
-        return Promise.resolve(this._pGetSiteFromAdapter)
-            .then(function () {
-                // Allow multiple fetches without rebuilding the page
-                // This enables multiple personalization actions with a single save
-                if (this._oPersonalizedPages[sPageId]) {
-                    return this._oPersonalizedPages[sPageId];
-                }
+    CommonDataModel.prototype.getPage = async function (sPageId) {
+        const bEnablePersonalization = Config.last("/core/shell/enablePersonalization");
+        const bEnableMyHome = Config.last("/core/spaces/myHome/enabled");
+        const sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
+
+        await this._pGetSiteFromAdapter;
+        // Allow multiple fetches without rebuilding the page
+        // This enables multiple personalization actions with a single save
+        if (this._oPersonalizedPages[sPageId]) {
+            return this._oPersonalizedPages[sPageId];
+        }
 
-                if (bEnablePersonalization || (bEnableMyHome && sPageId === sMyHomePageId)) {
-                    return Promise.all([
-                        this._getPageFromAdapter(sPageId),
-                        this._getPersonalization(this._oOriginalSite._version)
-                    ])
-                        .catch(function () {
-                            return Promise.reject("CommonDataModel Service: Cannot get page " + sPageId);
-                        })
-                        .then(function (aPageAndPersonalization) {
-                            return this._applyPagePersonalization(aPageAndPersonalization[0], aPageAndPersonalization[1])
-                                .catch(function () {
-                                    return Promise.reject("Personalization Processor: Cannot mixin the personalization.");
-                                });
-                        }.bind(this))
-                        .then(function (oPersonalizedPage) {
-                            return this._migratePersonalizedPages([oPersonalizedPage])
-                                .then(function (aMigratedPages) {
-                                    return aMigratedPages[0];
-                                });
-                        }.bind(this));
-                }
-                return this._getPageFromAdapter(sPageId);
-            }.bind(this));
+        if (bEnablePersonalization || (bEnableMyHome && sPageId === sMyHomePageId)) {
+            let oPage;
+            let oPersonalization;
+            let oPersonalizedPage;
+            try {
+                oPage = await this._getPageFromAdapter(sPageId);
+                oPersonalization = await this._getPersonalization(this._oOriginalSite._version);
+            } catch (oError) {
+                return Promise.reject(`CommonDataModel Service: Cannot get page ${sPageId}`);
+            }
+
+            try {
+                oPersonalizedPage = await this._applyPagePersonalization(oPage, oPersonalization);
+            } catch (oError) {
+                return Promise.reject("Personalization Processor: Cannot mixin the personalization.");
+            }
+
+            const aMigratedPages = await this._migratePersonalizedPages([oPersonalizedPage]);
+            return aMigratedPages[0];
+        }
+        return this._getPageFromAdapter(sPageId);
     };
 
     /**
@@ -416,26 +412,19 @@ sap.ui.define([
      * @since 1.78.0
      * @private
      */
-    CommonDataModel.prototype._getPageFromAdapter = function (sPageId) {
+    CommonDataModel.prototype._getPageFromAdapter = async function (sPageId) {
         if (!this._oAdapter.getPage) {
-            return Promise.resolve(deepClone(this._oOriginalSite.pages[sPageId], 20));
+            return deepClone(this._oOriginalSite.pages[sPageId], 20);
         }
 
-        return this._oAdapter.getPage(sPageId)
-            .then(function (oPage) {
-                return Promise.all([
-                    this.getCachedVisualizations(),
-                    this.getCachedVizTypes()
-                ]).then(function (aResults) {
-                    var oVisualizations = aResults[0];
-                    var oVizTypes = aResults[1];
-
-                    this._oOriginalSite.pages[sPageId] = oPage;
-                    this._oOriginalSite.visualizations = oVisualizations;
-                    this._oOriginalSite.vizTypes = oVizTypes;
-                    return deepClone(oPage, 20);
-                }.bind(this));
-            }.bind(this));
+        const oPage = await this._oAdapter.getPage(sPageId);
+        const oVisualizations = await this.getCachedVisualizations();
+        const oVizTypes = await this.getCachedVizTypes();
+
+        this._oOriginalSite.pages[sPageId] = oPage;
+        this._oOriginalSite.visualizations = oVisualizations;
+        this._oOriginalSite.vizTypes = oVizTypes;
+        return deepClone(oPage, 20);
     };
 
     /**
@@ -445,7 +434,7 @@ sap.ui.define([
      * @returns {object[]} The filtered pages
      */
     CommonDataModel.prototype._filterForProperPages = function (aPages) {
-        return aPages.filter(function (oPage) {
+        return aPages.filter((oPage) => {
             return !!oPage;
         });
     };
@@ -461,27 +450,27 @@ sap.ui.define([
      * @private
      */
     CommonDataModel.prototype.getPages = function (aPageIds) {
-        var bEnablePersonalization = Config.last("/core/shell/enablePersonalization");
-        var bEnableMyHome = Config.last("/core/spaces/myHome/enabled");
-        var sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
-        var pReturn;
+        const bEnablePersonalization = Config.last("/core/shell/enablePersonalization");
+        const bEnableMyHome = Config.last("/core/spaces/myHome/enabled");
+        const sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
+        let pReturn;
 
         if (this._mGetPagesPromises[aPageIds.toString()]) {
             pReturn = this._mGetPagesPromises[aPageIds.toString()];
         } else {
-            pReturn = Promise.resolve(this._pGetSiteFromAdapter).then(function () {
+            pReturn = Promise.resolve(this._pGetSiteFromAdapter).then(() => {
                 if (bEnablePersonalization || bEnableMyHome) {
                     return Promise.all([
                         this._getPagesFromAdapter(aPageIds),
                         this._getPersonalization(this._oOriginalSite._version)
                     ])
-                        .catch(function () {
+                        .catch(() => {
                             return Promise.reject("CommonDataModel Service: Cannot get pages");
                         })
-                        .then(function (aResults) {
-                            var oPages = aResults[0];
-                            var oPersonalization = aResults[1];
-                            return Promise.all(Object.keys(oPages).map(function (sPageId) {
+                        .then((aResults) => {
+                            const oPages = aResults[0];
+                            const oPersonalization = aResults[1];
+                            return Promise.all(Object.keys(oPages).map((sPageId) => {
                                 // Allow multiple fetches without rebuilding the page
                                 // This enables multiple personalization actions with a single save
                                 if (this._oPersonalizedPages[sPageId]) {
@@ -491,23 +480,23 @@ sap.ui.define([
                                     return Promise.resolve(oPages[sPageId]);
                                 }
                                 return this._applyPagePersonalization(oPages[sPageId], oPersonalization)
-                                    .catch(function () {
+                                    .catch(() => {
                                         return Promise.reject("Personalization Processor: Cannot mixin the personalization.");
                                     });
-                            }.bind(this)))
-                                .then(function (aPersonalizedPages) {
+                            }))
+                                .then((aPersonalizedPages) => {
                                     return this._migratePersonalizedPages(aPersonalizedPages);
-                                }.bind(this))
-                                .then(function (aPages) {
+                                })
+                                .then((aPages) => {
                                     return this._filterForProperPages(aPages);
-                                }.bind(this));
-                        }.bind(this));
+                                });
+                        });
                 }
                 return this._getPagesFromAdapter(aPageIds)
-                    .then(function (oPages) {
+                    .then((oPages) => {
                         return this._filterForProperPages(objectValues(oPages));
-                    }.bind(this));
-            }.bind(this));
+                    });
+            });
             // We are only caching per IDs as we do not expect several different calls with different IDs to happen.
             this._mGetPagesPromises[aPageIds.toString()] = pReturn;
         }
@@ -524,35 +513,29 @@ sap.ui.define([
      * @since 1.78.0
      * @private
      */
-    CommonDataModel.prototype._getPagesFromAdapter = function (aPageIds) {
+    CommonDataModel.prototype._getPagesFromAdapter = async function (aPageIds) {
         if (!this._oAdapter.getPages) {
-            var oPagesToReturn = {};
-            for (var sPageId in this._oOriginalSite.pages) {
+            const oPagesToReturn = {};
+            for (const sPageId in this._oOriginalSite.pages) {
                 if (aPageIds.includes(this._oOriginalSite.pages[sPageId].identification.id)) {
                     oPagesToReturn[sPageId] = this._oOriginalSite.pages[sPageId];
                 }
             }
-            return Promise.resolve(deepClone(oPagesToReturn, 20));
+            return deepClone(oPagesToReturn, 20);
         }
 
-        return this._oAdapter.getPages(aPageIds).then(function (oPages) {
-            return Promise.all([
-                this.getCachedVisualizations(),
-                this.getCachedVizTypes()
-            ]).then(function (aResults) {
-                var oVisualizations = aResults[0];
-                var oVizTypes = aResults[1];
+        const oPages = await this._oAdapter.getPages(aPageIds);
+        const oVisualizations = await this.getCachedVisualizations();
+        const oVizTypes = await this.getCachedVizTypes();
 
-                this._oOriginalSite.visualizations = oVisualizations;
-                this._oOriginalSite.vizTypes = oVizTypes;
+        this._oOriginalSite.visualizations = oVisualizations;
+        this._oOriginalSite.vizTypes = oVizTypes;
 
-                Object.keys(oPages).forEach(function (sKey) {
-                    this._oOriginalSite.pages[sKey] = oPages[sKey];
-                }.bind(this));
+        Object.keys(oPages).forEach((sKey) => {
+            this._oOriginalSite.pages[sKey] = oPages[sKey];
+        });
 
-                return deepClone(oPages, 20);
-            }.bind(this));
-        }.bind(this));
+        return deepClone(oPages, 20);
     };
 
     /**
@@ -568,13 +551,12 @@ sap.ui.define([
      * @since 1.77.0
      * @private
      */
-    CommonDataModel.prototype.getAllPages = function (oFilter) {
+    CommonDataModel.prototype.getAllPages = async function (oFilter) {
         if (oFilter && oFilter.personalizedPages) {
             return this._getAllPersonalizedPages();
         }
-        return this._getAssignedPageIds().then(function (aPageIds) {
-            return this.getPages(aPageIds);
-        }.bind(this));
+        const aPageIds = await this._getAssignedPageIds();
+        return this.getPages(aPageIds);
     };
 
     /**
@@ -584,18 +566,14 @@ sap.ui.define([
      * @since 1.98.0
      * @private
      */
-    CommonDataModel.prototype._getAssignedPageIds = function () {
-        return Container.getServiceAsync("Menu")
-            .then(function (oMenuService) {
-                return oMenuService.getContentNodes();
-            })
-            .then(function (aContentNodes) {
-                var aPageIds = [];
-                aContentNodes.forEach(function (oContentNode) {
-                    this._collectPageIds(oContentNode, aPageIds);
-                }.bind(this));
-                return aPageIds;
-            }.bind(this));
+    CommonDataModel.prototype._getAssignedPageIds = async function () {
+        const oMenuService = await Container.getServiceAsync("Menu");
+        const aContentNodes = await oMenuService.getContentNodes();
+        const aPageIds = [];
+        aContentNodes.forEach((oContentNode) => {
+            this._collectPageIds(oContentNode, aPageIds);
+        });
+        return aPageIds;
     };
 
     /**
@@ -617,9 +595,9 @@ sap.ui.define([
 
         // Process children recursively
         if (oContentNode.children !== undefined) {
-            oContentNode.children.forEach(function (oContentNode) {
-                this._collectPageIds(oContentNode, aPageIds);
-            }.bind(this));
+            oContentNode.children.forEach((contentNode) => {
+                this._collectPageIds(contentNode, aPageIds);
+            });
         }
     };
 
@@ -630,36 +608,30 @@ sap.ui.define([
      * @since 1.98.0
      * @private
      */
-    CommonDataModel.prototype._getAllPersonalizedPages = function () {
-        return Promise.resolve(this._pGetSiteFromAdapter)
-            .then(function () {
-                return Promise.all([
-                    this._getAssignedPageIds(),
-                    this._getPersonalization(this._oOriginalSite._version)
-                ]);
-            }.bind(this))
-            .then(function (aResults) {
-                var aAssignedPages = aResults[0];
-                var oPersonalization = aResults[1];
-                var aPageIds = [];
-                Object.keys(oPersonalization).forEach(function (sPageId) {
-                    if (sPageId === "version" || sPageId === "_version") {
-                        return;
-                    }
-                    if (!aAssignedPages.includes(sPageId)) {
-                        return; // only load assigned pages
-                    }
-                    var oPagePersonalization = oPersonalization[sPageId];
-                    // _version might be there even after reverting personalization
-                    if (Object.keys(oPagePersonalization).length > 1) {
-                        aPageIds.push(sPageId);
-                    }
-                });
-                if (aPageIds.length > 0) {
-                    return this.getPages(aPageIds);
-                }
-                return [];
-            }.bind(this));
+    CommonDataModel.prototype._getAllPersonalizedPages = async function () {
+        await this._pGetSiteFromAdapter;
+        const aAssignedPages = await this._getAssignedPageIds();
+        const oPersonalization = await this._getPersonalization(this._oOriginalSite._version);
+        const aPageIds = [];
+
+        Object.keys(oPersonalization).forEach((sPageId) => {
+            if (sPageId === "version" || sPageId === "_version") {
+                return;
+            }
+            if (!aAssignedPages.includes(sPageId)) {
+                return; // only load assigned pages
+            }
+            const oPagePersonalization = oPersonalization[sPageId];
+            // _version might be there even after reverting personalization
+            if (Object.keys(oPagePersonalization).length > 1) {
+                aPageIds.push(sPageId);
+            }
+        });
+
+        if (aPageIds.length > 0) {
+            return this.getPages(aPageIds);
+        }
+        return [];
     };
 
     /**
@@ -673,10 +645,10 @@ sap.ui.define([
      * @since 1.75.0
      */
     CommonDataModel.prototype.getApplications = function () {
-        return new Promise(function (resolve, reject) {
+        return new Promise((resolve, reject) => {
             this.getSite()
-                .then(function (oSite) {
-                    var oApplications = oSite.applications;
+                .then((oSite) => {
+                    const oApplications = oSite.applications;
                     if (oApplications) {
                         resolve(oApplications);
                     } else {
@@ -684,7 +656,7 @@ sap.ui.define([
                     }
                 })
                 .fail(reject);
-        }.bind(this));
+        });
     };
 
     /**
@@ -699,17 +671,12 @@ sap.ui.define([
      * @private
      * @since 1.78.0
      */
-    CommonDataModel.prototype.getVizTypes = function () {
+    CommonDataModel.prototype.getVizTypes = async function () {
         if (typeof this._oAdapter.getVizTypes === "function") {
-            return Promise.all([
-                this._getSiteProperty("vizTypes"),
-                this._oAdapter.getVizTypes()
-            ]).then(function (aResults) {
-                var oSiteVizTypes = aResults[0];
-                var oAdapterVizTypes = aResults[1];
-
-                return extend(oSiteVizTypes, oAdapterVizTypes);
-            });
+            const oSiteVizTypes = await this._getSiteProperty("vizTypes");
+            const oAdapterVizTypes = await this._oAdapter.getVizTypes();
+
+            return extend(oSiteVizTypes, oAdapterVizTypes);
         }
 
         // If the adapter doesn't implement #getVizTypes we can rely on the fact that the site
@@ -728,19 +695,16 @@ sap.ui.define([
      * @private
      * @since 1.89.0
      */
-    CommonDataModel.prototype.getCachedVizTypes = function () {
-        var oCachedVizTypesPromise = Promise.resolve();
+    CommonDataModel.prototype.getCachedVizTypes = async function () {
+        let oCachedVizTypes;
 
         if (typeof this._oAdapter.getCachedVizTypes === "function") {
-            oCachedVizTypesPromise = this._oAdapter.getCachedVizTypes();
+            oCachedVizTypes = await this._oAdapter.getCachedVizTypes();
         }
 
-        return Promise.all([this._getSiteProperty("vizTypes"), oCachedVizTypesPromise]).then(function (aResults) {
-            var oSiteVizTypes = aResults[0];
-            var oCachedVizTypes = aResults[1];
+        const oSiteVizTypes = await this._getSiteProperty("vizTypes");
 
-            return extend(oSiteVizTypes, oCachedVizTypes);
-        });
+        return extend(oSiteVizTypes, oCachedVizTypes);
     };
 
     /**
@@ -753,23 +717,20 @@ sap.ui.define([
      * @private
      * @since 1.91.0
      */
-    CommonDataModel.prototype.getVizType = function (sVizType) {
-        var oVizTypePromise = Promise.resolve();
+    CommonDataModel.prototype.getVizType = async function (sVizType) {
+        let oVizType;
 
         if (typeof this._oAdapter.getVizType === "function") {
-            oVizTypePromise = this._oAdapter.getVizType(sVizType);
+            oVizType = await this._oAdapter.getVizType(sVizType);
         }
 
-        return Promise.all([this._getSiteProperty("vizTypes"), oVizTypePromise]).then(function (aResults) {
-            var oSiteVizTypes = aResults[0];
-            var oVizType = aResults[1];
+        const oSiteVizTypes = await this._getSiteProperty("vizTypes");
 
-            if (oVizType) {
-                oSiteVizTypes[sVizType] = oVizType;
-            }
+        if (oVizType) {
+            oSiteVizTypes[sVizType] = oVizType;
+        }
 
-            return oSiteVizTypes[sVizType];
-        });
+        return oSiteVizTypes[sVizType];
     };
 
     /**
@@ -784,17 +745,12 @@ sap.ui.define([
      * @private
      * @since 1.75.0
      */
-    CommonDataModel.prototype.getVisualizations = function () {
+    CommonDataModel.prototype.getVisualizations = async function () {
         if (typeof this._oAdapter.getVisualizations === "function") {
-            return Promise.all([
-                this._getSiteProperty("visualizations"),
-                this._oAdapter.getVisualizations()
-            ]).then(function (aResults) {
-                var oSiteVisualizations = aResults[0];
-                var oAdapterVisualizations = aResults[1];
-
-                return extend(oSiteVisualizations, oAdapterVisualizations);
-            });
+            const oSiteVisualizations = await this._getSiteProperty("visualizations");
+            const oAdapterVisualizations = await this._oAdapter.getVisualizations();
+
+            return extend(oSiteVisualizations, oAdapterVisualizations);
         }
 
         // If the adapter doesn't implement #getVisualizations we can rely on the fact that the site
@@ -813,19 +769,16 @@ sap.ui.define([
      * @private
      * @since 1.89.0
      */
-    CommonDataModel.prototype.getCachedVisualizations = function () {
-        var oCachedVisualizationsPromise = Promise.resolve();
+    CommonDataModel.prototype.getCachedVisualizations = async function () {
+        let oCachedVisualizations;
 
         if (typeof this._oAdapter.getCachedVisualizations === "function") {
-            oCachedVisualizationsPromise = this._oAdapter.getCachedVisualizations();
+            oCachedVisualizations = await this._oAdapter.getCachedVisualizations();
         }
 
-        return Promise.all([this._getSiteProperty("visualizations"), oCachedVisualizationsPromise]).then(function (aResults) {
-            var oSiteVisualizations = aResults[0];
-            var oCachedVisualizations = aResults[1];
+        const oSiteVisualizations = await this._getSiteProperty("visualizations");
 
-            return extend(oSiteVisualizations, oCachedVisualizations);
-        });
+        return extend(oSiteVisualizations, oCachedVisualizations);
     };
 
     /**
@@ -839,19 +792,19 @@ sap.ui.define([
      * @since 1.89.0
      */
     CommonDataModel.prototype._getSiteProperty = function (vObjectPath) {
-        return new Promise(function (resolve, reject) {
+        return new Promise((resolve, reject) => {
             this.getSite()
-                .then(function (oSite) {
-                    var vProperty = ObjectPath.get(vObjectPath, oSite);
+                .then((oSite) => {
+                    const vProperty = ObjectPath.get(vObjectPath, oSite);
                     if (vProperty) {
                         resolve(vProperty);
                     } else {
-                        var sProperty = vObjectPath.toString();
-                        reject("CDM " + sProperty + " not found.");
+                        const sProperty = vObjectPath.toString();
+                        reject(`CDM ${sProperty} not found.`);
                     }
                 })
                 .fail(reject);
-        }.bind(this));
+        });
     };
 
     /**
@@ -868,7 +821,7 @@ sap.ui.define([
      * @since 1.42.0
      */
     CommonDataModel.prototype.getGroupFromOriginalSite = function (sGroupId) {
-        var oDeferred = new jQuery.Deferred();
+        const oDeferred = new jQuery.Deferred();
 
         if (typeof sGroupId === "string" &&
             this._oOriginalSite &&
@@ -908,12 +861,12 @@ sap.ui.define([
      * @since 1.40.0
      */
     CommonDataModel.prototype.save = function (pageId) {
-        var oDeferred = new jQuery.Deferred();
+        const oDeferred = new jQuery.Deferred();
 
         if (this._bPersonalizationLoadingFailed) {
             // There is no way to recover from this except reloading the FLP as a more complex recovery logic
             // would be overkill for this rare case.
-            var sErrorMessage = "Prior personalization loading failed, cancelling save to prevent data loss. Saving this personalization will only be possible after reloading the FLP again.";
+            const sErrorMessage = "Prior personalization loading failed, cancelling save to prevent data loss. Saving this personalization will only be possible after reloading the FLP again.";
             Log.error(sErrorMessage, null, S_COMPONENT_NAME);
             oDeferred.reject(sErrorMessage);
             return oDeferred.promise();
@@ -941,65 +894,65 @@ sap.ui.define([
 
     /**
      * Extracts and saves the personalization for a CDM 3.0 site
-     * @returns {Promise<undefined>} Resolves once the personalization was extracted and saved
+     * @returns {Promise} Resolves once the personalization was extracted and saved
      *
      * @private
      * @since 1.98.0
      */
     CommonDataModel.prototype._saveCdmVersion30 = function () {
-        var oOriginalPage = this._oOriginalSite;
-        var oPersonalizedPage = this._oPersonalizedSiteForCDMVersion30;
+        const oOriginalPage = this._oOriginalSite;
+        const oPersonalizedPage = this._oPersonalizedSiteForCDMVersion30;
 
-        return new Promise(function (resolve, reject) {
+        return new Promise((resolve, reject) => {
             this._oPersonalizationProcessor.extractPersonalization(deepClone(oPersonalizedPage, 20), deepClone(oOriginalPage, 20))
                 .done(resolve)
                 .fail(reject);
-        }.bind(this))
-            .catch(function () {
+        })
+            .catch(() => {
                 return Promise.reject("Personalization Processor: Cannot extract personalization.");
             })
-            .then(function (oPersonalization) {
+            .then((oPersonalization) => {
                 if (isEmptyObject(oPersonalization)) {
                     return Promise.resolve();
                 }
                 return this._setPersonalization(oPersonalization);
-            }.bind(this));
+            });
     };
 
     /**
      * Extracts and saves the personalization for a CDM 3.1 site
      * @param {string[]} aPageIds The list of pages which should be saved
-     * @returns {Promise<undefined>} Resolves once the personalization was extracted and saved
+     * @returns {Promise} Resolves once the personalization was extracted and saved
      *
      * @private
      * @since 1.98.0
      */
     CommonDataModel.prototype._saveCdmVersion31 = function (aPageIds) {
         // Extract personalization deltas
-        var aPersPromises = aPageIds.map(function (sPageId) {
-            var oOriginalPage = this._oSiteConverter.convertTo("3.0.0", this._oOriginalSite.pages[sPageId]);
-            var oPersonalizedPage = this._oSiteConverter.convertTo("3.0.0", this._oPersonalizedPages[sPageId]);
+        const aPersPromises = aPageIds.map((sPageId) => {
+            const oOriginalPage = this._oSiteConverter.convertTo("3.0.0", this._oOriginalSite.pages[sPageId]);
+            const oPersonalizedPage = this._oSiteConverter.convertTo("3.0.0", this._oPersonalizedPages[sPageId]);
 
-            return new Promise(function (resolve, reject) {
+            return new Promise((resolve, reject) => {
                 this._oPersonalizationProcessor.extractPersonalization(deepClone(oPersonalizedPage, 20), deepClone(oOriginalPage, 20))
-                    .done(function (oPersonalization) {
+                    .done((oPersonalization) => {
                         resolve({
                             pageId: sPageId,
                             personalization: oPersonalization
                         });
                     })
-                    .fail(function (sError) {
-                        Log.error("Cannot extract personalization of page " + sPageId + ": " + sError, null, S_COMPONENT_NAME);
+                    .fail((sError) => {
+                        Log.error(`Cannot extract personalization of page ${sPageId}: ${sError}`, null, S_COMPONENT_NAME);
                         resolve();
                     });
-            }.bind(this));
-        }.bind(this));
+            });
+        });
 
         // save personalization deltas to internal object
         return Promise.all(aPersPromises)
-            .then(function (aPersonalizations) {
-                var bShouldSave = false;
-                aPersonalizations.forEach(function (oDelta) {
+            .then((aPersonalizations) => {
+                let bShouldSave = false;
+                aPersonalizations.forEach((oDelta) => {
                     if (!oDelta) {
                         return;
                     }
@@ -1017,14 +970,14 @@ sap.ui.define([
 
                         this._oPersonalizationDeltasForCDMVersion31[oDelta.pageId] = oDelta.personalization;
                     }
-                }.bind(this));
+                });
 
                 // Save internal object to personalization
                 if (bShouldSave) {
                     return this._setPersonalization(this._oPersonalizationDeltasForCDMVersion31);
                 }
                 return Promise.resolve();
-            }.bind(this));
+            });
     };
 
     /**
@@ -1035,13 +988,13 @@ sap.ui.define([
      */
     CommonDataModel.prototype._getPersonalization = function (sCDMVersion) {
         return ushellUtils.promisify(this._oAdapter.getPersonalization(sCDMVersion))
-            .catch(function (oError) {
+            .catch((oError) => {
                 Log.error("Could not get page personalization", oError, S_COMPONENT_NAME);
                 // Do not prevent the page from loading if the personalization could not be loaded
                 // but prevent saving the personalization to prevent data loss
                 this._bPersonalizationLoadingFailed = true;
                 return {};
-            }.bind(this));
+            });
     };
 
     /**
@@ -1051,7 +1004,7 @@ sap.ui.define([
      *
      * @param {object} extractedPersonalization The personalization delta to be persisted
      * @param {string} pageId The page ID the personalization belongs to
-     * @returns {Promise<undefined>} A promise that wraps the Deferred of the CDM Adapter to save the personalization
+     * @returns {Promise} A promise that wraps the Deferred of the CDM Adapter to save the personalization
      */
     CommonDataModel.prototype._setPersonalization = function (extractedPersonalization, pageId) {
         if (this._oPendingPersonalizationDeferred) {
@@ -1061,31 +1014,31 @@ sap.ui.define([
                     aPromiseResolvers: []
                 };
             }
-            return new Promise(function (resolve, reject) {
+            return new Promise((resolve, reject) => {
                 this._oNextPersonalizationQuery.fnNextCall = this._setPersonalization.bind(this, extractedPersonalization, pageId);
                 this._oNextPersonalizationQuery.aPromiseResolvers.push({
                     resolve: resolve,
                     reject: reject
                 });
-            }.bind(this));
+            });
         }
         this._oPendingPersonalizationDeferred = this._oAdapter.setPersonalization(extractedPersonalization, pageId);
-        return new Promise(function (resolve, reject) {
+        return new Promise((resolve, reject) => {
             this._oPendingPersonalizationDeferred
                 .then(resolve)
                 .fail(reject)
-                .always(function () {
+                .always(() => {
                     delete this._oPendingPersonalizationDeferred;
                     if (this._oNextPersonalizationQuery) {
-                        var oNextPersonalizationPromise = this._oNextPersonalizationQuery.fnNextCall();
+                        const oNextPersonalizationPromise = this._oNextPersonalizationQuery.fnNextCall();
                         this._cleanupPersonalizationQueuePromises(
                             oNextPersonalizationPromise,
                             this._oNextPersonalizationQuery.aPromiseResolvers
                         );
                         delete this._oNextPersonalizationQuery;
                     }
-                }.bind(this));
-        }.bind(this));
+                });
+        });
     };
 
     /**
@@ -1095,7 +1048,7 @@ sap.ui.define([
      * @param {object[]} queuedPromises The pending promises that are waiting to be resolved or rejected
      */
     CommonDataModel.prototype._cleanupPersonalizationQueuePromises = function (nextPersonalizationPromise, queuedPromises) {
-        queuedPromises.forEach(function (oPromise) {
+        queuedPromises.forEach((oPromise) => {
             nextPersonalizationPromise
                 .then(oPromise.resolve)
                 .catch(oPromise.reject);
@@ -1132,7 +1085,7 @@ sap.ui.define([
 
         const oGroups = oPersonalizedSite.groups;
 
-        Object.keys(oGroups).forEach(function (sKey) {
+        Object.keys(oGroups).forEach((sKey) => {
             if (!oGroups[sKey]) {
                 // Undefined group detected. Cleaning it up...
                 delete oGroups[sKey];
@@ -1179,7 +1132,7 @@ sap.ui.define([
 
         // we could use Array.filter here but as there is nothing to do in the most cases we avoid copying the array
         while (i < aGroupsOrder.length) {
-            var sGroupId = aGroupsOrder[i];
+            const sGroupId = aGroupsOrder[i];
             if (!oGroups[sGroupId]) {
                 aGroupsOrder.splice(i, 1);
             } else {
@@ -1203,8 +1156,8 @@ sap.ui.define([
      * @since 1.48.0
      */
     CommonDataModel.prototype.getPlugins = (function () {
-        var fnExtractPluginConfigFromInboundSignature = function (sPluginName, oSignatureInbounds) {
-            var iNumInbounds = Object.keys(oSignatureInbounds).length;
+        function fnExtractPluginConfigFromInboundSignature (sPluginName, oSignatureInbounds) {
+            const iNumInbounds = Object.keys(oSignatureInbounds).length;
 
             if (iNumInbounds === 0) {
                 return {};
@@ -1212,15 +1165,15 @@ sap.ui.define([
 
             if (iNumInbounds > 1) {
                 Log.warning(
-                    "Multiple inbounds are defined for plugin '" + sPluginName + "'",
+                    `Multiple inbounds are defined for plugin '${sPluginName}'`,
                     "Plugin startup configuration will be determined using "
                     + "the first signature inbound with semanticObject:Shell and action:plugin for plugin.",
                     S_COMPONENT_NAME
                 );
             }
 
-            var oShellPluginSignatureInbounds = Object.values(oSignatureInbounds).find(
-                function (oInbound) {
+            const oShellPluginSignatureInbounds = Object.values(oSignatureInbounds).find(
+                (oInbound) => {
                     return (oInbound && oInbound.semanticObject === "Shell"
                         && oInbound.action === "plugin");
                 }
@@ -1228,19 +1181,18 @@ sap.ui.define([
 
             if (oShellPluginSignatureInbounds === undefined) {
                 Log.error(
-                    "Cannot find inbound with semanticObject:Shell and action:plugin for plugin '" +
-                    sPluginName + "'",
+                    `Cannot find inbound with semanticObject:Shell and action:plugin for plugin '${sPluginName}'`,
                     "plugin startup configuration cannot be determined correctly",
                     S_COMPONENT_NAME
                 );
                 return {};
             }
 
-            var oSignatureParams = ObjectPath.get("signature.parameters", oShellPluginSignatureInbounds) || {};
+            const oSignatureParams = ObjectPath.get("signature.parameters", oShellPluginSignatureInbounds) || {};
 
             return Object.keys(oSignatureParams).reduce(
-                function (oResult, sNextParam) {
-                    var sDefaultValue = ObjectPath.get(sNextParam + ".defaultValue.value", oSignatureParams);
+                (oResult, sNextParam) => {
+                    const sDefaultValue = ObjectPath.get(`${sNextParam}.defaultValue.value`, oSignatureParams);
 
                     if (typeof sDefaultValue === "string") {
                         oResult[sNextParam] = sDefaultValue;
@@ -1250,9 +1202,9 @@ sap.ui.define([
                 },
                 {} /* oResult */
             );
-        };
+        }
 
-        var oPluginSets;
+        let oPluginSets;
         return function (oPluginSetsCache) {
             if (oPluginSetsCache !== undefined) {
                 oPluginSets = oPluginSetsCache;
@@ -1264,25 +1216,21 @@ sap.ui.define([
 
             oPluginSets = {};
 
-            return this.getSiteWithoutPersonalization().then(function (oSite) {
-                var oApplications = oSite.applications || {};
+            return this.getSiteWithoutPersonalization().then((oSite) => {
+                const oApplications = oSite.applications || {};
 
                 Object.keys(oApplications).filter(function (sAppName) {
                     return ObjectPath.get("type", this[sAppName]["sap.flp"]) === "plugin";
                 }, oApplications).forEach(function (sPluginName) {
-                    var oConfigFromInboundSignature;
-                    var oPlugin = this[sPluginName];
-                    var oComponentProperties = {};
+                    const oPlugin = this[sPluginName];
+                    let oComponentProperties = {};
 
                     if (!isPlainObject(oPlugin["sap.platform.runtime"])) {
-                        Log.error("Cannot find 'sap.platform.runtime' section for plugin '"
-                            + sPluginName + "'",
+                        Log.error(`Cannot find 'sap.platform.runtime' section for plugin '${sPluginName}'`,
                             "plugin might not be started correctly",
                             "sap.ushell.services.CommonDataModel");
                     } else if (!isPlainObject(oPlugin["sap.platform.runtime"].componentProperties)) {
-                        Log.error("Cannot find 'sap.platform.runtime/componentProperties' " +
-                            "section for plugin '"
-                            + sPluginName + "'",
+                        Log.error(`Cannot find 'sap.platform.runtime/componentProperties' section for plugin '${sPluginName}'`,
                             "plugin might not be started correctly",
                             "sap.ushell.services.CommonDataModel");
                     } else {
@@ -1297,16 +1245,16 @@ sap.ui.define([
                     //
                     // define plugin configuration
                     //
-                    var oSignatureInbounds = ObjectPath.get(
+                    const oSignatureInbounds = ObjectPath.get(
                         "crossNavigation.inbounds", oPlugin["sap.app"]
                     ) || {};
 
-                    oConfigFromInboundSignature = fnExtractPluginConfigFromInboundSignature(
+                    const oConfigFromInboundSignature = fnExtractPluginConfigFromInboundSignature(
                         sPluginName,
                         oSignatureInbounds
                     );
 
-                    var oPluginConfig = extend(
+                    const oPluginConfig = extend(
                         oComponentProperties.config || {},
                         oConfigFromInboundSignature // has precedence
                     );
@@ -1319,14 +1267,14 @@ sap.ui.define([
                         oPluginSets[sPluginName].asyncHints = oComponentProperties.asyncHints;
                     }
 
-                    var oDeviceTypes = ObjectPath.get("deviceTypes", oPlugin["sap.ui"]);
+                    const oDeviceTypes = ObjectPath.get("deviceTypes", oPlugin["sap.ui"]);
                     if (oDeviceTypes) {
                         oPluginSets[sPluginName].deviceTypes = oDeviceTypes;
                     }
                 }, oApplications);
 
                 return ushellUtils.deepFreeze(oPluginSets);
-            }, function (vError) {
+            }, (vError) => {
                 return vError;
             });
         };
@@ -1341,7 +1289,7 @@ sap.ui.define([
      * @private
      */
     CommonDataModel.prototype._mapDisplayFormats = function (aDisplayFormats) {
-        var oDisplayFormatMap = {
+        const oDisplayFormatMap = {
             tile: DisplayFormat.Standard,
             standard: DisplayFormat.Standard,
             link: DisplayFormat.Compact,
@@ -1352,11 +1300,11 @@ sap.ui.define([
             standardWide: DisplayFormat.StandardWide
         };
 
-        var aSupportedFormats = Object.keys(oDisplayFormatMap).filter(function (sDisplayFormat) {
+        const aSupportedFormats = Object.keys(oDisplayFormatMap).filter((sDisplayFormat) => {
             return aDisplayFormats.indexOf(sDisplayFormat) > -1;
         });
 
-        return aSupportedFormats.map(function (sSupportedFormat) {
+        return aSupportedFormats.map((sSupportedFormat) => {
             return oDisplayFormatMap[sSupportedFormat];
         });
     };
@@ -1371,11 +1319,11 @@ sap.ui.define([
      */
     CommonDataModel.prototype._ensureProperDisplayFormats = function (oSite) {
         if (oSite.vizTypes) {
-            Object.keys(oSite.vizTypes).forEach(function (sKey) {
+            Object.keys(oSite.vizTypes).forEach((sKey) => {
                 if (oSite.vizTypes[sKey]["sap.flp"] && oSite.vizTypes[sKey]["sap.flp"].vizOptions) {
-                    var oVizType = oSite.vizTypes[sKey];
-                    var aSupportedDisplayFormats = ObjectPath.get("vizOptions.displayFormats.supported", oVizType["sap.flp"]);
-                    var sDefaultDisplayFormat = ObjectPath.get("vizOptions.displayFormats.default", oVizType["sap.flp"]);
+                    const oVizType = oSite.vizTypes[sKey];
+                    const aSupportedDisplayFormats = ObjectPath.get("vizOptions.displayFormats.supported", oVizType["sap.flp"]);
+                    const sDefaultDisplayFormat = ObjectPath.get("vizOptions.displayFormats.default", oVizType["sap.flp"]);
 
                     if (aSupportedDisplayFormats) {
                         oSite.vizTypes[sKey]["sap.flp"].vizOptions.displayFormats.supported = this._mapDisplayFormats(aSupportedDisplayFormats);
@@ -1384,36 +1332,36 @@ sap.ui.define([
                         oSite.vizTypes[sKey]["sap.flp"].vizOptions.displayFormats.default = this._mapDisplayFormats([sDefaultDisplayFormat])[0];
                     }
                 }
-            }.bind(this));
+            });
         }
 
         if (oSite.hasOwnProperty("pages")) {
-            Object.keys(oSite.pages).forEach(function (sKey) {
-                var oPage = oSite.pages[sKey];
+            Object.keys(oSite.pages).forEach((sKey) => {
+                const oPage = oSite.pages[sKey];
                 if (oPage.payload && oPage.payload.sections) {
-                    var oSections = oPage.payload.sections;
-                    Object.keys(oSections).forEach(function (sSectionKey) {
-                        var oSection = oSections[sSectionKey];
-                        Object.keys(oSection.viz).forEach(function (sVizKey) {
-                            var oViz = oSection.viz[sVizKey];
+                    const oSections = oPage.payload.sections;
+                    Object.keys(oSections).forEach((sSectionKey) => {
+                        const oSection = oSections[sSectionKey];
+                        Object.keys(oSection.viz).forEach((sVizKey) => {
+                            const oViz = oSection.viz[sVizKey];
                             if (oViz.displayFormatHint) {
-                                var aMappedFormat = this._mapDisplayFormats([oViz.displayFormatHint])[0];
+                                const aMappedFormat = this._mapDisplayFormats([oViz.displayFormatHint])[0];
                                 oViz.displayFormatHint = aMappedFormat || oViz.displayFormatHint;
                             }
-                        }.bind(this));
-                    }.bind(this));
+                        });
+                    });
                 }
-            }.bind(this));
+            });
         } else if (oSite.hasOwnProperty("groups")) {
-            Object.keys(oSite.groups).forEach(function (sGroupKey) {
-                var oGroup = oSite.groups[sGroupKey];
-                oGroup.payload.tiles.forEach(function (oTile) {
+            Object.keys(oSite.groups).forEach((sGroupKey) => {
+                const oGroup = oSite.groups[sGroupKey];
+                oGroup.payload.tiles.forEach((oTile) => {
                     if (oTile.displayFormatHint) {
-                        var aMappedFormat = this._mapDisplayFormats([oTile.displayFormatHint])[0];
+                        const aMappedFormat = this._mapDisplayFormats([oTile.displayFormatHint])[0];
                         oTile.displayFormatHint = aMappedFormat || oTile.displayFormatHint;
                     }
-                }.bind(this));
-            }.bind(this));
+                });
+            });
         }
     };
 
@@ -1449,14 +1397,11 @@ sap.ui.define([
      * @private
      * @since 1.76.0
      */
-    CommonDataModel.prototype.getMenuEntries = function (sMenuKey) {
-        return new Promise(function (resolve, reject) {
-            this.getSite().then(function (oSite) {
-                var aMenuEntries = ObjectPath.get("menus." + sMenuKey + ".payload.menuEntries", oSite);
-                // return a copy of the menu so that the original site cannot get changed
-                resolve(deepClone(aMenuEntries) || []);
-            });
-        }.bind(this));
+    CommonDataModel.prototype.getMenuEntries = async function (sMenuKey) {
+        const oSite = await this.getSite();
+        const aMenuEntries = ObjectPath.get(`menus.${sMenuKey}.payload.menuEntries`, oSite);
+        // return a copy of the menu so that the original site cannot get changed
+        return deepClone(aMenuEntries) || [];
     };
 
     /**
@@ -1467,23 +1412,20 @@ sap.ui.define([
      * @private
      * @since 1.80.0
      */
-    CommonDataModel.prototype.getContentProviderIds = function () {
-        return new Promise(function (resolve, reject) {
-            this.getSite().then(function (oSite) {
-                var aSystemAliases = Object.keys(oSite.systemAliases);
-                var oContentProviderIds = {};
+    CommonDataModel.prototype.getContentProviderIds = async function () {
+        const oSite = await this.getSite();
+        const aSystemAliases = Object.keys(oSite.systemAliases);
+        const oContentProviderIds = {};
 
-                objectValues(oSite.applications).forEach(function (oApplication) {
-                    var sContentProviderId = readApplications.getContentProviderId(oApplication);
+        objectValues(oSite.applications).forEach((oApplication) => {
+            const sContentProviderId = readApplications.getContentProviderId(oApplication);
 
-                    if (aSystemAliases.includes(sContentProviderId)) {
-                        oContentProviderIds[sContentProviderId] = true;
-                    }
-                });
+            if (aSystemAliases.includes(sContentProviderId)) {
+                oContentProviderIds[sContentProviderId] = true;
+            }
+        });
 
-                resolve(Object.keys(oContentProviderIds));
-            });
-        }.bind(this));
+        return Object.keys(oContentProviderIds);
     };
 
     CommonDataModel.hasNoAdapter = false;