@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module exposes a model containing the pages hierarchy to its clients.
- * @version 1.138.1
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -18,7 +18,7 @@ sap.ui.define([
     "sap/ushell/adapters/cdm/v3/_LaunchPage/readUtils",
     "sap/ushell/adapters/cdm/v3/_LaunchPage/readVisualizations",
     "sap/base/util/ObjectPath"
-], function (
+], (
     Log,
     RestrictedJSONModel,
     deepClone,
@@ -32,7 +32,7 @@ sap.ui.define([
     readUtils,
     readVisualizations,
     ObjectPath
-) {
+) => {
     "use strict";
 
     /**
@@ -53,7 +53,7 @@ sap.ui.define([
      * @since 1.72.0
      * @private
      */
-    var Pages = function () {
+    function Pages () {
         this.COMPONENT_NAME = "sap.ushell.services.Pages";
         this._oCdmServicePromise = Container.getServiceAsync("CommonDataModel");
         this._oCSTRServicePromise = Container.getServiceAsync("ClientSideTargetResolution");
@@ -62,7 +62,7 @@ sap.ui.define([
         });
         this._bImplicitSaveEnabled = true;
         this._aPagesToBeSaved = [];
-    };
+    }
 
     /**
      * Type for a page in the "pages and spaces" concept.
@@ -124,12 +124,12 @@ sap.ui.define([
      * @private
      */
     Pages.prototype._generateId = function (sPageId) {
-        var aIds = [];
-        var oPage = this.getModel().getProperty(this.getPagePath(sPageId));
+        const aIds = [];
+        const oPage = this.getModel().getProperty(this.getPagePath(sPageId));
 
-        oPage.sections.forEach(function (oSection) {
+        oPage.sections.forEach((oSection) => {
             aIds.push(oSection.id);
-            oSection.visualizations.forEach(function (oVisualization) {
+            oSection.visualizations.forEach((oVisualization) => {
                 aIds.push(oVisualization.id);
             });
         });
@@ -170,8 +170,8 @@ sap.ui.define([
      * @private
      */
     Pages.prototype.getPageIndex = function (sPageId) {
-        var aPages = this._oPagesModel.getProperty("/pages");
-        for (var iPageIndex = 0; iPageIndex < aPages.length; ++iPageIndex) {
+        const aPages = this._oPagesModel.getProperty("/pages");
+        for (let iPageIndex = 0; iPageIndex < aPages.length; ++iPageIndex) {
             if (aPages[iPageIndex].id === sPageId) {
                 return iPageIndex;
             }
@@ -189,11 +189,11 @@ sap.ui.define([
      * @private
      */
     Pages.prototype.getPagePath = function (sPageId) {
-        var iPageIndex = this.getPageIndex(sPageId);
+        const iPageIndex = this.getPageIndex(sPageId);
         if (typeof iPageIndex === "undefined") {
             return "";
         }
-        return "/pages/" + iPageIndex;
+        return `/pages/${iPageIndex}`;
     };
 
     /**
@@ -205,46 +205,41 @@ sap.ui.define([
      *
      * @private
      */
-    Pages.prototype.loadPage = function (sPageId) {
-        var sPagePath = this.getPagePath(sPageId);
+    Pages.prototype.loadPage = async function (sPageId) {
+        const sPagePath = this.getPagePath(sPageId);
 
         if (sPagePath) {
-            return Promise.resolve(sPagePath);
+            return sPagePath;
         }
 
         ushellUtils.setPerformanceMark(["FLP-Pages-Service-loadPage-start[", sPageId, "]"].join(""));
 
-        return this._oCdmServicePromise
-            .catch(function (oError) {
-                Log.error("Pages - loadPage: Couldn't resolve CDM Service.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (oCdmService) {
-                return Promise.all([
-                    oCdmService.getPage(sPageId),
-                    oCdmService.getCachedVisualizations(),
-                    oCdmService.getApplications(),
-                    oCdmService.getCachedVizTypes()
-                ]);
-            })
-            .then(function (aResults) {
-                var oPage = aResults[0];
-                var oVisualizations = aResults[1];
-                var oApplications = aResults[2];
-                var oVizTypes = aResults[3];
-                return this._getModelForPage(oPage, oVisualizations, oApplications, oVizTypes);
-            }.bind(this))
-            .then(function (oModelForPage) {
-                var iPageCount = this._oPagesModel.getProperty("/pages/").length;
-                var sNewPagePath = "/pages/" + iPageCount;
-                this._oPagesModel._setProperty(sNewPagePath, oModelForPage);
-                ushellUtils.setPerformanceMark(["FLP-Pages-Service-loadPage-end[", sPageId, "]"].join(""));
-                return sNewPagePath;
-            }.bind(this))
-            .catch(function (oError) {
-                Log.error("Pages - loadPage: Failed to gather site data.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this));
+        let oCdmService;
+        try {
+            oCdmService = await this._oCdmServicePromise;
+        } catch (oError) {
+            Log.error("Pages - loadPage: Couldn't resolve CDM Service.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
+
+        try {
+            const oPage = await oCdmService.getPage(sPageId);
+            const oVisualizations = await oCdmService.getCachedVisualizations();
+            const oApplications = await oCdmService.getApplications();
+            const oVizTypes = await oCdmService.getCachedVizTypes();
+
+            const oModelForPage = await this._getModelForPage(oPage, oVisualizations, oApplications, oVizTypes);
+
+            const iPageCount = this._oPagesModel.getProperty("/pages/").length;
+            const sNewPagePath = `/pages/${iPageCount}`;
+            this._oPagesModel._setProperty(sNewPagePath, oModelForPage);
+            ushellUtils.setPerformanceMark(["FLP-Pages-Service-loadPage-end[", sPageId, "]"].join(""));
+
+            return sNewPagePath;
+        } catch (oError) {
+            Log.error("Pages - loadPage: Failed to gather site data.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -257,27 +252,28 @@ sap.ui.define([
      *
      * @private
      */
-    Pages.prototype.loadPages = function (aPageIds) {
-        return this._oCdmServicePromise
-            .then(function (oCdmService) {
-                // load and cache all the pages with a single request
-                return oCdmService.getPages(aPageIds);
-            })
-            .then(function () {
-                return Promise.all(
-                    aPageIds.map(function (sPageId) {
-                        // single access is ok here as the data has been loaded before
-                        return this.loadPage(sPageId);
-                    }.bind(this))
-                );
-            }.bind(this))
-            .then(function (aPagePaths) {
-                var oPagePaths = {};
-                aPageIds.forEach(function (sPageId, i) {
-                    oPagePaths[sPageId] = aPagePaths[i];
-                });
-                return oPagePaths;
-            });
+    Pages.prototype.loadPages = async function (aPageIds) {
+        let oCdmService;
+        try {
+            oCdmService = await this._oCdmServicePromise;
+        } catch (oError) {
+            Log.error("Pages - loadPages: Couldn't resolve CDM Service.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
+
+        // load and cache all the pages with a single request
+        await oCdmService.getPages(aPageIds);
+
+        const aPagePaths = await Promise.all(aPageIds.map((sPageId) => {
+            // single access is ok here as the data has been loaded before
+            return this.loadPage(sPageId);
+        }));
+
+        const oPagePaths = {};
+        aPageIds.forEach((sPageId, i) => {
+            oPagePaths[sPageId] = aPagePaths[i];
+        });
+        return oPagePaths;
     };
 
     /**
@@ -296,49 +292,47 @@ sap.ui.define([
      * @param {string} [sVizId] The "vizId" of the visualization to look for.
      * @param {string} [sVizRefId] The "vizRefId" of the visualization to look for.
      *
-     * @returns {VisualizationLocation[]} An array of {@link VisualizationLocation}, retrieving every index of a visualization within a page.
+     * @returns {Promise<VisualizationLocation[]>} An array of {@link VisualizationLocation}, retrieving every index of a visualization within a page.
      */
-    Pages.prototype.findVisualization = function (sPageId, sSectionId, sVizId, sVizRefId) {
-        return this._oCdmServicePromise
-            .catch(function (oError) {
-                Log.error("Pages - findVisualization: Personalization cannot be saved: CDM Service cannot be retrieved.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (oCdmService) {
-                return Promise.all([
-                    this.loadPage(sPageId),
-                    oCdmService.getCachedVisualizations(),
-                    oCdmService.getApplications()
-                ])
-                    .then(function (aResults) {
-                        var sPagePath = aResults[0];
-                        var aPageSections = this.getModel().getProperty(sPagePath + "/sections") || [];
-                        return aPageSections.reduce(function (accumulatorSections, section, sectionIndex) {
-                            if (sSectionId && section.id !== sSectionId) {
-                                return accumulatorSections;
-                            }
-                            var aVizIndexes = section.visualizations.reduce(function (accumulatorVisualizations, viz, vizIndex) {
-                                if (sVizId && viz.vizId === sVizId ||
-                                    sVizRefId && viz.id === sVizRefId) {
-                                    accumulatorVisualizations.push(vizIndex);
-                                }
-                                return accumulatorVisualizations;
-                            }, []);
-                            if (aVizIndexes.length) {
-                                accumulatorSections.push({
-                                    pageId: sPageId,
-                                    sectionIndex: sectionIndex,
-                                    vizIndexes: aVizIndexes
-                                });
-                            }
-                            return accumulatorSections;
-                        }, []);
-                    }.bind(this))
-                    .catch(function (oError) {
-                        Log.error("Pages - findVisualization: Couldn't load page, get visualizations or applications.", oError, this.COMPONENT_NAME);
-                        return Promise.reject(oError);
-                    }.bind(this));
-            }.bind(this));
+    Pages.prototype.findVisualization = async function (sPageId, sSectionId, sVizId, sVizRefId) {
+        let oCdmService;
+        try {
+            oCdmService = await this._oCdmServicePromise;
+        } catch (oError) {
+            Log.error("Pages - findVisualization: Personalization cannot be saved: CDM Service cannot be retrieved.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
+
+        try {
+            const sPagePath = await this.loadPage(sPageId);
+            await oCdmService.getCachedVisualizations();
+            await oCdmService.getApplications();
+
+            const aPageSections = this.getModel().getProperty(`${sPagePath}/sections`) || [];
+            return aPageSections.reduce((accumulatorSections, section, sectionIndex) => {
+                if (sSectionId && section.id !== sSectionId) {
+                    return accumulatorSections;
+                }
+                const aVizIndexes = section.visualizations.reduce((accumulatorVisualizations, viz, vizIndex) => {
+                    if (sVizId && viz.vizId === sVizId ||
+                        sVizRefId && viz.id === sVizRefId) {
+                        accumulatorVisualizations.push(vizIndex);
+                    }
+                    return accumulatorVisualizations;
+                }, []);
+                if (aVizIndexes.length) {
+                    accumulatorSections.push({
+                        pageId: sPageId,
+                        sectionIndex: sectionIndex,
+                        vizIndexes: aVizIndexes
+                    });
+                }
+                return accumulatorSections;
+            }, []);
+        } catch (oError) {
+            Log.error("Pages - findVisualization: Couldn't load page, get visualizations or applications.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -355,7 +349,7 @@ sap.ui.define([
      *
      * @private
      */
-    Pages.prototype.moveVisualization = function (iPageIndex, iSourceSectionIndex, iSourceVisualizationIndex, iTargetSectionIndex, iTargetVisualizationIndex) {
+    Pages.prototype.moveVisualization = async function (iPageIndex, iSourceSectionIndex, iSourceVisualizationIndex, iTargetSectionIndex, iTargetVisualizationIndex) {
         // Do nothing if visualization is moved on itself.
         if (iSourceSectionIndex === iTargetSectionIndex && iSourceVisualizationIndex === iTargetVisualizationIndex) {
             return Promise.resolve({
@@ -364,15 +358,15 @@ sap.ui.define([
         }
 
         this.setPersonalizationActive(true);
-        var oPage = this._oPagesModel.getProperty("/pages/" + iPageIndex);
-        var sPageId = oPage.id;
-        var aSections = oPage.sections;
-        var oSourceSection = aSections[iSourceSectionIndex];
-        var oTargetSection = aSections[iTargetSectionIndex];
-        var sSourceSectionId = oSourceSection.id;
-        var sTargetSectionId = oTargetSection.id;
-        var oMovedVisualization = oSourceSection.visualizations[iSourceVisualizationIndex];
-        var sMovedVisualizationId = oMovedVisualization.id;
+        const oPage = this._oPagesModel.getProperty(`/pages/${iPageIndex}`);
+        const sPageId = oPage.id;
+        const aSections = oPage.sections;
+        const oSourceSection = aSections[iSourceSectionIndex];
+        const oTargetSection = aSections[iTargetSectionIndex];
+        const sSourceSectionId = oSourceSection.id;
+        const sTargetSectionId = oTargetSection.id;
+        const oMovedVisualization = oSourceSection.visualizations[iSourceVisualizationIndex];
+        const sMovedVisualizationId = oMovedVisualization.id;
 
         // Update visualizations reference to enable recalculation of visualizations.length which enables hide of section
         oSourceSection.visualizations = oSourceSection.visualizations.concat([]);
@@ -387,13 +381,13 @@ sap.ui.define([
         }
         oTargetSection.visualizations.splice(iTargetVisualizationIndex, 0, oMovedVisualization);
 
-        var iPreviousVisualizationIndex;
+        let iPreviousVisualizationIndex;
         if (oTargetSection.visualizations[iTargetVisualizationIndex]) {
             iPreviousVisualizationIndex = iTargetVisualizationIndex - 1;
         } else {
             iPreviousVisualizationIndex = oTargetSection.visualizations.length - 2;
         }
-        var sPreviousVisualizationId;
+        let sPreviousVisualizationId;
         if (oTargetSection.visualizations[iPreviousVisualizationIndex]) {
             sPreviousVisualizationId = oTargetSection.visualizations[iPreviousVisualizationIndex].id;
         }
@@ -406,55 +400,55 @@ sap.ui.define([
         this._oPagesModel.refresh();
 
         // Modify the personalized page in the CDM 3.1 site
-        return this._oCdmServicePromise
-            .then(function (oCdmService) {
-                return oCdmService.getPage(sPageId);
-            })
-            .catch(function (oError) {
-                Log.error("Pages - moveVisualization: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (oCdmPage) {
-                var oSourceSectionInPage = oCdmPage.payload.sections[sSourceSectionId];
-                var aSourceVizOrder = oSourceSectionInPage.layout.vizOrder;
-                var oSourceViz = oSourceSectionInPage.viz;
-
-                var oTargetSectionInPage = oCdmPage.payload.sections[sTargetSectionId];
-                var aTargetVizOrder = oTargetSectionInPage.layout.vizOrder;
-                var oTargetViz = oTargetSectionInPage.viz;
-
-                var oMovedVisualizationClone = deepClone(oSourceViz[sMovedVisualizationId]);
-
-                var iSourceVizOrderIndex = aSourceVizOrder.indexOf(sMovedVisualizationId);
-                aSourceVizOrder.splice(iSourceVizOrderIndex, 1);
-
-                // It can happen that the vizOrder array contains visualization ids that are filtered out for the pages model.
-                // Therefore, we need to determine the index in the vizOrder array: search for the index of the previous viz and increment by one.
-                var iTargetVizOrderIndex = sPreviousVisualizationId ? aTargetVizOrder.indexOf(sPreviousVisualizationId) + 1 : 0;
-                aTargetVizOrder.splice(iTargetVizOrderIndex, 0, sMovedVisualizationId);
-
-                if (sSourceSectionId !== sTargetSectionId) {
-                    delete oSourceViz[sMovedVisualizationId];
-                    oTargetViz[sMovedVisualizationId] = oMovedVisualizationClone;
-                }
+        let oCdmPage;
+        try {
+            const oCdmService = await this._oCdmServicePromise;
+            oCdmPage = await oCdmService.getPage(sPageId);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            Log.error("Pages - moveVisualization: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
 
-                // If the default section becomes empty, delete it
-                if (oSourceSectionInPage.default && !Object.keys(oSourceViz).length) {
-                    delete oCdmPage.payload.sections[sSourceSectionId]; // delete section from sections
-                    oCdmPage.payload.layout.sectionOrder.splice(iSourceSectionIndex, 1); // delete index from sectionOrder
-                }
+        try {
+            const oSourceSectionInPage = oCdmPage.payload.sections[sSourceSectionId];
+            const aSourceVizOrder = oSourceSectionInPage.layout.vizOrder;
+            const oSourceViz = oSourceSectionInPage.viz;
 
-                return this._conditionalSavePersonalization(sPageId);
-            }.bind(this))
-            .then(function () {
-                return {
-                    visualizationIndex: iTargetVisualizationIndex
-                };
-            })
-            .catch(function (oError) {
-                this.setPersonalizationActive(false);
-                return Promise.reject(oError);
-            }.bind(this));
+            const oTargetSectionInPage = oCdmPage.payload.sections[sTargetSectionId];
+            const aTargetVizOrder = oTargetSectionInPage.layout.vizOrder;
+            const oTargetViz = oTargetSectionInPage.viz;
+
+            const oMovedVisualizationClone = deepClone(oSourceViz[sMovedVisualizationId]);
+
+            const iSourceVizOrderIndex = aSourceVizOrder.indexOf(sMovedVisualizationId);
+            aSourceVizOrder.splice(iSourceVizOrderIndex, 1);
+
+            // It can happen that the vizOrder array contains visualization ids that are filtered out for the pages model.
+            // Therefore, we need to determine the index in the vizOrder array: search for the index of the previous viz and increment by one.
+            const iTargetVizOrderIndex = sPreviousVisualizationId ? aTargetVizOrder.indexOf(sPreviousVisualizationId) + 1 : 0;
+            aTargetVizOrder.splice(iTargetVizOrderIndex, 0, sMovedVisualizationId);
+
+            if (sSourceSectionId !== sTargetSectionId) {
+                delete oSourceViz[sMovedVisualizationId];
+                oTargetViz[sMovedVisualizationId] = oMovedVisualizationClone;
+            }
+
+            // If the default section becomes empty, delete it
+            if (oSourceSectionInPage.default && !Object.keys(oSourceViz).length) {
+                delete oCdmPage.payload.sections[sSourceSectionId]; // delete section from sections
+                oCdmPage.payload.layout.sectionOrder.splice(iSourceSectionIndex, 1); // delete index from sectionOrder
+            }
+
+            await this._conditionalSavePersonalization(sPageId);
+
+            return {
+                visualizationIndex: iTargetVisualizationIndex
+            };
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -464,14 +458,14 @@ sap.ui.define([
      * @param {int} iSourceSectionIndex The index of the section from where the visualization is deleted.
      * @param {int} iSourceVisualizationIndex The index of the deleted visualization.
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      *
      * @since 1.75.0
      * @private
      */
-    Pages.prototype.deleteVisualization = function (iPageIndex, iSourceSectionIndex, iSourceVisualizationIndex) {
-        var oPageModel = this._oPagesModel.getProperty("/pages/" + iPageIndex);
-        var oSectionModel = oPageModel.sections[iSourceSectionIndex];
+    Pages.prototype.deleteVisualization = async function (iPageIndex, iSourceSectionIndex, iSourceVisualizationIndex) {
+        const oPageModel = this._oPagesModel.getProperty(`/pages/${iPageIndex}`);
+        const oSectionModel = oPageModel.sections[iSourceSectionIndex];
 
         // If the default section becomes empty, delete it
         if (oSectionModel.default && oSectionModel.visualizations.length < 2) {
@@ -479,33 +473,34 @@ sap.ui.define([
         }
 
         this.setPersonalizationActive(true);
-        var aSourceSectionVisualizations = oSectionModel.visualizations;
-        var oRemovedVisualization = aSourceSectionVisualizations[iSourceVisualizationIndex];
+        const aSourceSectionVisualizations = oSectionModel.visualizations;
+        const oRemovedVisualization = aSourceSectionVisualizations[iSourceVisualizationIndex];
         aSourceSectionVisualizations.splice(iSourceVisualizationIndex, 1);
         this._oPagesModel.refresh();
 
-        return this._oCdmServicePromise
-            .then(function (oCDMService) {
-                return oCDMService.getPage(oPageModel.id);
-            })
-            .catch(function (oError) {
-                Log.error("Pages - deleteVisualization: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (oPage) {
-                var aSectionVizOrder = oPage.payload.sections[oSectionModel.id].layout.vizOrder;
-                var oVizRefs = oPage.payload.sections[oSectionModel.id].viz;
-                var iRemovedVisualizationIndex = aSectionVizOrder.indexOf(oRemovedVisualization.id);
-                delete oVizRefs[oRemovedVisualization.id];
-                if (iRemovedVisualizationIndex > -1) {
-                    aSectionVizOrder.splice(iRemovedVisualizationIndex, 1);
-                }
-                return this._conditionalSavePersonalization(oPage.identification.id);
-            }.bind(this))
-            .catch(function (oError) {
-                this.setPersonalizationActive(false);
-                return Promise.reject(oError);
-            }.bind(this));
+        let oPage;
+        try {
+            const oCDMService = await this._oCdmServicePromise;
+            oPage = await oCDMService.getPage(oPageModel.id);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            Log.error("Pages - deleteVisualization: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
+
+        try {
+            const aSectionVizOrder = oPage.payload.sections[oSectionModel.id].layout.vizOrder;
+            const oVizRefs = oPage.payload.sections[oSectionModel.id].viz;
+            const iRemovedVisualizationIndex = aSectionVizOrder.indexOf(oRemovedVisualization.id);
+            delete oVizRefs[oRemovedVisualization.id];
+            if (iRemovedVisualizationIndex > -1) {
+                aSectionVizOrder.splice(iRemovedVisualizationIndex, 1);
+            }
+            return await this._conditionalSavePersonalization(oPage.identification.id);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -521,10 +516,9 @@ sap.ui.define([
      * @private
      */
     Pages.prototype._getSectionIndex = function (sPagePath, sSectionId) {
-        var aSections = this.getModel().getProperty(sPagePath + "/sections") || [];
-        var i = 0;
+        const aSections = this.getModel().getProperty(`${sPagePath}/sections`) || [];
 
-        for (; i < aSections.length; i += 1) {
+        for (let i = 0; i < aSections.length; i += 1) {
             if (aSections[i].id === sSectionId) {
                 return i;
             }
@@ -549,16 +543,16 @@ sap.ui.define([
      * @private
      */
     Pages.prototype._getVisualizationData = async function (sPageId, sVizId, oVisualizations, oAdditionalVizData, oApplications, oVizTypes, oSystemContext) {
-        var oVisualizationReference = oAdditionalVizData || {
+        const oVisualizationReference = oAdditionalVizData || {
             vizId: sVizId
         };
 
-        var oSite = {
+        const oSite = {
             applications: oApplications,
             visualizations: oVisualizations,
             vizTypes: oVizTypes
         };
-        var oVizData = await readUtils.getVizData(oSite, oVisualizationReference, oSystemContext);
+        const oVizData = await readUtils.getVizData(oSite, oVisualizationReference, oSystemContext);
         if (!oVizData.id) {
             oVizData.id = this._generateId(sPageId);
         }
@@ -575,7 +569,7 @@ sap.ui.define([
      * @param {string} sVizId The id of the visualization to add.
      * @param {string} sDisplayFormatHint The form factor of the visualization to add.
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      *
      * @since 1.75.0
      *
@@ -606,7 +600,7 @@ sap.ui.define([
             const [sPagePath, oVisualizations, oApplications, oVizTypes] = aResult;
 
             const iSectionIndex = this._getSectionIndex(sPagePath, sSectionId);
-            const aSection = this.getModel().getProperty(sPagePath + "/sections") || [];
+            const aSection = this.getModel().getProperty(`${sPagePath}/sections`) || [];
             const oVisualizationData = await this._getVisualizationData(sPageId, sVizId, oVisualizations, null, oApplications, oVizTypes);
 
             if (sDisplayFormatHint) { // save with the same displayFormatHint in case of copy (Add to My Home)
@@ -625,7 +619,7 @@ sap.ui.define([
             if (iSectionIndex !== undefined || iDefaultSectionIndex !== undefined) {
                 this.setPersonalizationActive(true);
                 const iSectionPathIndex = iSectionIndex !== undefined ? iSectionIndex : iDefaultSectionIndex || 0;
-                const sVisualizationsPath = sPagePath + "/sections/" + iSectionPathIndex + "/visualizations";
+                const sVisualizationsPath = `${sPagePath}/sections/${iSectionPathIndex}/visualizations`;
 
                 this.getModel().getProperty(sVisualizationsPath).push(oVisualizationData);
                 this.getModel().refresh();
@@ -653,12 +647,11 @@ sap.ui.define([
 
             // Create a new default section together with the visualization if there is no default section yet
             const iPageIndex = parseInt(sPagePath.split("/")[2], 10);
-            return this.addSection(iPageIndex, 0, {
+            return await this.addSection(iPageIndex, 0, {
                 title: resources.i18n.getText("DefaultSection.Title"),
                 default: true,
                 visualizations: [oVisualizationData]
             });
-
         } catch (oError) {
             this.setPersonalizationActive(false);
             throw oError;
@@ -671,13 +664,13 @@ sap.ui.define([
      * @param {string} sPageId The id of the page the visualization should be added to.
      * @param {string|null} [sSectionId] The id of the section the visualization should be added to. If null is given, the default section is used.
      * @param {sap.ushell.services.Pages.Visualization} oVizData An object containing the vizData from the model.
-     * @returns {Promise<undefined>} A promise resolving when the copy action was completed.
+     * @returns {Promise} A promise resolving when the copy action was completed.
      *
      * @private
      * @since 1.94.0
      */
     Pages.prototype.copyVisualization = function (sPageId, sSectionId, oVizData) {
-        var bIsBookmark = oVizData.isBookmark;
+        const bIsBookmark = oVizData.isBookmark;
 
         if (!bIsBookmark) {
             return this.addVisualization(sPageId, sSectionId, oVizData.vizId, oVizData.displayFormatHint);
@@ -704,23 +697,23 @@ sap.ui.define([
      * @param {int} iSourceSectionIndex The index of the moved section.
      * @param {int} iTargetSectionIndex The new index of the moved section.
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      *
      * @since 1.75.0
      *
      * @private
      */
-    Pages.prototype.moveSection = function (iPageIndex, iSourceSectionIndex, iTargetSectionIndex) {
+    Pages.prototype.moveSection = async function (iPageIndex, iSourceSectionIndex, iTargetSectionIndex) {
         if (iSourceSectionIndex === iTargetSectionIndex) {
             return Promise.resolve();
         }
 
         this.setPersonalizationActive(true);
 
-        var sPageId = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/id");
-        var aSections = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/sections");
-        var oMovedSection = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/sections/" + iSourceSectionIndex);
-        var sMovedSectionId = oMovedSection.id;
+        const sPageId = this._oPagesModel.getProperty(`/pages/${iPageIndex}/id`);
+        const aSections = this._oPagesModel.getProperty(`/pages/${iPageIndex}/sections`);
+        const oMovedSection = this._oPagesModel.getProperty(`/pages/${iPageIndex}/sections/${iSourceSectionIndex}`);
+        const sMovedSectionId = oMovedSection.id;
 
         // Remove the section
         aSections.splice(iSourceSectionIndex, 1);
@@ -735,26 +728,27 @@ sap.ui.define([
 
         this._oPagesModel.refresh();
 
-        return this._oCdmServicePromise
-            .then(function (oCdmService) {
-                return oCdmService.getPage(sPageId);
-            })
-            .catch(function (oError) {
-                Log.error("Pages - moveSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (oPage) {
-                var aSectionOrder = oPage.payload.layout.sectionOrder;
+        let oPage;
+        try {
+            const oCdmService = await this._oCdmServicePromise;
+            oPage = await oCdmService.getPage(sPageId);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            Log.error("Pages - moveSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
 
-                aSectionOrder.splice(aSectionOrder.indexOf(sMovedSectionId), 1);
-                aSectionOrder.splice(iTargetSectionIndex, 0, sMovedSectionId);
+        try {
+            const aSectionOrder = oPage.payload.layout.sectionOrder;
 
-                return this._conditionalSavePersonalization(sPageId);
-            }.bind(this))
-            .catch(function (oError) {
-                this.setPersonalizationActive(false);
-                return Promise.reject(oError);
-            }.bind(this));
+            aSectionOrder.splice(aSectionOrder.indexOf(sMovedSectionId), 1);
+            aSectionOrder.splice(iTargetSectionIndex, 0, sMovedSectionId);
+
+            return await this._conditionalSavePersonalization(sPageId);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -764,20 +758,20 @@ sap.ui.define([
      * @param {int} iSectionIndex The index of the added section.
      * @param {object} [oSectionProperties] Properties of the added section.
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      *
      * @since 1.75.0
      *
      * @private
      */
-    Pages.prototype.addSection = function (iPageIndex, iSectionIndex, oSectionProperties) {
+    Pages.prototype.addSection = async function (iPageIndex, iSectionIndex, oSectionProperties) {
         this.setPersonalizationActive(true);
 
-        var oSectionReference = oSectionProperties || {};
-        var aSections = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/sections");
-        var sPageId = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/id");
+        const oSectionReference = oSectionProperties || {};
+        const aSections = this._oPagesModel.getProperty(`/pages/${iPageIndex}/sections`);
+        const sPageId = this._oPagesModel.getProperty(`/pages/${iPageIndex}/id`);
 
-        var oNewSection = {
+        const oNewSection = {
             id: oSectionReference.id !== undefined ? oSectionReference.id : this._generateId(sPageId),
             title: oSectionReference.title !== undefined ? oSectionReference.title : "",
             visible: oSectionReference.visible !== undefined ? oSectionReference.visible : true,
@@ -791,58 +785,58 @@ sap.ui.define([
 
         this._oPagesModel.refresh();
 
-        return this._oCdmServicePromise
-            .then(function (oCdmService) {
-                return oCdmService.getPage(sPageId);
-            })
-            .catch(function (oError) {
-                Log.error("Pages - addSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (oPage) {
-                var oSection = {
-                    id: oNewSection.id,
-                    title: oNewSection.title,
-                    visible: oNewSection.visible,
-                    preset: oNewSection.preset,
-                    locked: oNewSection.locked,
-                    default: oNewSection.default,
-                    layout: {
-                        vizOrder: []
-                    },
-                    viz: {}
-                };
+        let oPage;
+        try {
+            const oCdmService = await this._oCdmServicePromise;
+            oPage = await oCdmService.getPage(sPageId);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            Log.error("Pages - addSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
+
+        try {
+            const oSection = {
+                id: oNewSection.id,
+                title: oNewSection.title,
+                visible: oNewSection.visible,
+                preset: oNewSection.preset,
+                locked: oNewSection.locked,
+                default: oNewSection.default,
+                layout: {
+                    vizOrder: []
+                },
+                viz: {}
+            };
 
-                if (oNewSection.visualizations) {
-                    var i = 0;
-                    var oVizData;
-
-                    for (; i < oNewSection.visualizations.length; i++) {
-                        oVizData = oNewSection.visualizations[i];
-                        oSection.layout.vizOrder.push(oVizData.id);
-                        if (oVizData.isBookmark) {
-                            oSection.viz[oVizData.id] = readUtils.getVizRef(oVizData);
-                        } else {
-                            oSection.viz[oVizData.id] = {
-                                id: oVizData.id,
-                                vizId: oVizData.vizId
-                            };
-                            if (oVizData.displayFormatHint) { // save with the same displayFormatHint in case of copy (Add to My Home)
-                                oSection.viz[oVizData.id].displayFormatHint = oVizData.displayFormatHint;
-                            }
+            if (oNewSection.visualizations) {
+                let oVizData;
+
+                for (let i = 0; i < oNewSection.visualizations.length; i++) {
+                    oVizData = oNewSection.visualizations[i];
+                    oSection.layout.vizOrder.push(oVizData.id);
+                    if (oVizData.isBookmark) {
+                        oSection.viz[oVizData.id] = readUtils.getVizRef(oVizData);
+                    } else {
+                        oSection.viz[oVizData.id] = {
+                            id: oVizData.id,
+                            vizId: oVizData.vizId
+                        };
+                        if (oVizData.displayFormatHint) { // save with the same displayFormatHint in case of copy (Add to My Home)
+                            oSection.viz[oVizData.id].displayFormatHint = oVizData.displayFormatHint;
                         }
                     }
                 }
+            }
 
-                oPage.payload.layout.sectionOrder.splice(iSectionIndex, 0, oNewSection.id);
-                oPage.payload.sections[oNewSection.id] = oSection;
+            oPage.payload.layout.sectionOrder.splice(iSectionIndex, 0, oNewSection.id);
+            oPage.payload.sections[oNewSection.id] = oSection;
 
-                return this._conditionalSavePersonalization(sPageId);
-            }.bind(this))
-            .catch(function (oError) {
-                this.setPersonalizationActive(false);
-                return Promise.reject(oError);
-            }.bind(this));
+            return await this._conditionalSavePersonalization(sPageId);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -851,38 +845,39 @@ sap.ui.define([
      * @param {int} iPageIndex The index of the page containing the deleted section.
      * @param {int} iSectionIndex The index of deleted section.
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      *
      * @since 1.75.0
      *
      * @private
      */
-    Pages.prototype.deleteSection = function (iPageIndex, iSectionIndex) {
+    Pages.prototype.deleteSection = async function (iPageIndex, iSectionIndex) {
         this.setPersonalizationActive(true);
 
-        var sPageId = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/id");
-        var aSections = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/sections");
-        var sSectionId = aSections[iSectionIndex].id;
+        const sPageId = this._oPagesModel.getProperty(`/pages/${iPageIndex}/id`);
+        const aSections = this._oPagesModel.getProperty(`/pages/${iPageIndex}/sections`);
+        const sSectionId = aSections[iSectionIndex].id;
         aSections.splice(iSectionIndex, 1);
         this._oPagesModel.refresh();
 
-        return this._oCdmServicePromise
-            .then(function (oCdmService) {
-                return oCdmService.getPage(sPageId);
-            })
-            .catch(function (oError) {
-                Log.error("Pages - deleteSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (oPage) {
-                delete oPage.payload.sections[sSectionId];
-                oPage.payload.layout.sectionOrder.splice(iSectionIndex, 1);
-                return this._conditionalSavePersonalization(sPageId);
-            }.bind(this))
-            .catch(function (oError) {
-                this.setPersonalizationActive(false);
-                return Promise.reject(oError);
-            }.bind(this));
+        let oPage;
+        try {
+            const oCdmService = await this._oCdmServicePromise;
+            oPage = await oCdmService.getPage(sPageId);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            Log.error("Pages - deleteSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
+
+        try {
+            delete oPage.payload.sections[sSectionId];
+            oPage.payload.layout.sectionOrder.splice(iSectionIndex, 1);
+            return await this._conditionalSavePersonalization(sPageId);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -892,18 +887,18 @@ sap.ui.define([
      * @param {int} iSectionIndex The index of the section.
      * @param {boolean} bVisibility The new visibility value.
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      *
      * @since 1.75.0
      *
      * @private
      */
-    Pages.prototype.setSectionVisibility = function (iPageIndex, iSectionIndex, bVisibility) {
+    Pages.prototype.setSectionVisibility = async function (iPageIndex, iSectionIndex, bVisibility) {
         this.setPersonalizationActive(true);
 
-        var sPageId = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/id");
-        var sSectionId = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/sections/" + iSectionIndex + "/id");
-        var oSection = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/sections/" + iSectionIndex);
+        const sPageId = this._oPagesModel.getProperty(`/pages/${iPageIndex}/id`);
+        const sSectionId = this._oPagesModel.getProperty(`/pages/${iPageIndex}/sections/${iSectionIndex}/id`);
+        const oSection = this._oPagesModel.getProperty(`/pages/${iPageIndex}/sections/${iSectionIndex}`);
 
         if (oSection.visible === bVisibility) {
             return Promise.resolve();
@@ -912,22 +907,23 @@ sap.ui.define([
         oSection.visible = bVisibility;
         this._oPagesModel.refresh();
 
-        return this._oCdmServicePromise
-            .then(function (oCdmService) {
-                return oCdmService.getPage(sPageId);
-            })
-            .catch(function (oError) {
-                Log.error("Pages - setSectionVisibility: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (oPage) {
-                oPage.payload.sections[sSectionId].visible = bVisibility;
-                return this._conditionalSavePersonalization(sPageId);
-            }.bind(this))
-            .catch(function (oError) {
-                this.setPersonalizationActive(false);
-                return Promise.reject(oError);
-            }.bind(this));
+        let oPage;
+        try {
+            const oCdmService = await this._oCdmServicePromise;
+            oPage = await oCdmService.getPage(sPageId);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            Log.error("Pages - setSectionVisibility: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
+
+        try {
+            oPage.payload.sections[sSectionId].visible = bVisibility;
+            return await this._conditionalSavePersonalization(sPageId);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -937,35 +933,36 @@ sap.ui.define([
      * @param {int} iSectionIndex The index of the section.
      * @param {string} sNewTitle The new title value.
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      *
      * @since 1.75.0
      * @private
      */
-    Pages.prototype.renameSection = function (iPageIndex, iSectionIndex, sNewTitle) {
+    Pages.prototype.renameSection = async function (iPageIndex, iSectionIndex, sNewTitle) {
         this.setPersonalizationActive(true);
 
-        var oPageModel = this._oPagesModel.getProperty("/pages/" + iPageIndex);
-        var oSectionModel = oPageModel.sections[iSectionIndex];
+        const oPageModel = this._oPagesModel.getProperty(`/pages/${iPageIndex}`);
+        const oSectionModel = oPageModel.sections[iSectionIndex];
         oSectionModel.title = sNewTitle;
         this._oPagesModel.refresh();
 
-        return this._oCdmServicePromise
-            .then(function (oCDMService) {
-                return oCDMService.getPage(oPageModel.id);
-            })
-            .catch(function (oError) {
-                Log.error("Pages - renameSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (oPage) {
-                oPage.payload.sections[oSectionModel.id].title = sNewTitle;
-                return this._conditionalSavePersonalization(oPage.identification.id);
-            }.bind(this))
-            .catch(function (oError) {
-                this.setPersonalizationActive(false);
-                return Promise.reject(oError);
-            }.bind(this));
+        let oPage;
+        try {
+            const oCDMService = await this._oCdmServicePromise;
+            oPage = await oCDMService.getPage(oPageModel.id);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            Log.error("Pages - renameSection: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
+
+        try {
+            oPage.payload.sections[oSectionModel.id].title = sNewTitle;
+            return await this._conditionalSavePersonalization(oPage.identification.id);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -974,91 +971,78 @@ sap.ui.define([
      * @param {int} iPageIndex The index of the page containing the section.
      * @param {int} iSectionIndex The index of the section.
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      *
      * @since 1.75.0
      *
      * @private
      */
-    Pages.prototype.resetSection = function (iPageIndex, iSectionIndex) {
+    Pages.prototype.resetSection = async function (iPageIndex, iSectionIndex) {
         this.setPersonalizationActive(true);
 
-        var sPageId = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/id");
-        var sSectionId = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/sections/" + iSectionIndex + "/id");
+        const sPageId = this._oPagesModel.getProperty(`/pages/${iPageIndex}/id`);
+        const sSectionId = this._oPagesModel.getProperty(`/pages/${iPageIndex}/sections/${iSectionIndex}/id`);
 
-        return this._oCdmServicePromise
-            .then(function (oCdmService) {
-                return Promise.all([
-                    oCdmService.getCachedVisualizations(),
-                    oCdmService.getApplications(),
-                    oCdmService.getPage(sPageId),
-                    oCdmService.getOriginalPage(sPageId),
-                    oCdmService.getCachedVizTypes()
-                ]);
-            })
-            .catch(function (oError) {
-                Log.error("Pages - resetSection: Personalization cannot be saved: Failed to gather data from CDM Service.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (aResults) {
-                var oVisualizations = aResults[0];
-                var oApplications = aResults[1];
-                var oCdmPage = aResults[2];
-                var oOriginalCdmPage = aResults[3];
-                var oVizTypes = aResults[4];
-
-                return Promise.all([
-                    this._getModelForPage(oOriginalCdmPage, oVisualizations, oApplications, oVizTypes),
-                    oCdmPage,
-                    oOriginalCdmPage
-                ]);
-            }.bind(this))
-            .then(function (aResults) {
-                var oOriginalPageModel = aResults[0];
-                var oCdmPage = aResults[1];
-                var oOriginalCdmPage = aResults[2];
-
-                var oOriginalSectionModel = deepClone(oOriginalPageModel.sections.find(function (section) {
-                    return section.id === sSectionId;
-                }), 20);
-
-                var aOriginalVizIds = oOriginalSectionModel.visualizations.map(function (oVisualization) {
-                    return oVisualization.id;
-                });
+        let oVisualizations;
+        let oApplications;
+        let oCdmPage;
+        let oOriginalCdmPage;
+        let oVizTypes;
+        try {
+            const oCdmService = await this._oCdmServicePromise;
+            oVisualizations = await oCdmService.getCachedVisualizations();
+            oApplications = await oCdmService.getApplications();
+            oCdmPage = await oCdmService.getPage(sPageId);
+            oOriginalCdmPage = await oCdmService.getOriginalPage(sPageId);
+            oVizTypes = await oCdmService.getCachedVizTypes();
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            Log.error("Pages - resetSection: Personalization cannot be saved: Failed to gather data from CDM Service.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
 
-                // the following loop ensures unique ids for viz references within a page according to adr-1011
-                var oCurrentPageModel = this._oPagesModel.getProperty("/pages/" + iPageIndex);
-                oCurrentPageModel.sections.forEach(function (oCurrentSectionModel) {
-                    // Check in other sections if there is any visualization having a same id as in the reset section, if yes, generate a new id for this visualization.
-                    if (oOriginalSectionModel.id !== oCurrentSectionModel.id) {
-                        oCurrentSectionModel.visualizations.forEach(function (oVisualization) {
-                            if (aOriginalVizIds.indexOf(oVisualization.id) !== -1) {
-                                var sNewId = this._generateId(sPageId);
-
-                                var oVizRef = deepClone(oCdmPage.payload.sections[oCurrentSectionModel.id].viz[oVisualization.id]);
-                                delete oCdmPage.payload.sections[oCurrentSectionModel.id].viz[oVisualization.id];
-                                var iVizOrderIndex = oCdmPage.payload.sections[oCurrentSectionModel.id].layout.vizOrder.indexOf(oVizRef.id);
-
-                                oVizRef.id = sNewId;
-                                oCdmPage.payload.sections[oCurrentSectionModel.id].viz[sNewId] = oVizRef;
-                                oCdmPage.payload.sections[oCurrentSectionModel.id].layout.vizOrder[iVizOrderIndex] = sNewId;
-
-                                oVisualization.id = sNewId;
-                            }
-                        }.bind(this));
-                    }
-                }.bind(this));
-
-                this._oPagesModel._setProperty("/pages/" + iPageIndex + "/sections/" + iSectionIndex, oOriginalSectionModel);
-
-                // Reset the CDM3.1 Site
-                oCdmPage.payload.sections[oOriginalSectionModel.id] = oOriginalCdmPage.payload.sections[oOriginalSectionModel.id];
-                return this._conditionalSavePersonalization(oCdmPage.identification.id);
-            }.bind(this))
-            .catch(function (oError) {
-                this.setPersonalizationActive(false);
-                return Promise.reject(oError);
-            }.bind(this));
+        try {
+            const oOriginalPageModel = await this._getModelForPage(oOriginalCdmPage, oVisualizations, oApplications, oVizTypes);
+            const oOriginalSectionModel = deepClone(oOriginalPageModel.sections.find((section) => {
+                return section.id === sSectionId;
+            }), 20);
+
+            const aOriginalVizIds = oOriginalSectionModel.visualizations.map((oVisualization) => {
+                return oVisualization.id;
+            });
+
+            // the following loop ensures unique ids for viz references within a page according to adr-1011
+            const oCurrentPageModel = this._oPagesModel.getProperty(`/pages/${iPageIndex}`);
+            oCurrentPageModel.sections.forEach((oCurrentSectionModel) => {
+                // Check in other sections if there is any visualization having a same id as in the reset section, if yes, generate a new id for this visualization.
+                if (oOriginalSectionModel.id !== oCurrentSectionModel.id) {
+                    oCurrentSectionModel.visualizations.forEach((oVisualization) => {
+                        if (aOriginalVizIds.indexOf(oVisualization.id) !== -1) {
+                            const sNewId = this._generateId(sPageId);
+
+                            const oVizRef = deepClone(oCdmPage.payload.sections[oCurrentSectionModel.id].viz[oVisualization.id]);
+                            delete oCdmPage.payload.sections[oCurrentSectionModel.id].viz[oVisualization.id];
+                            const iVizOrderIndex = oCdmPage.payload.sections[oCurrentSectionModel.id].layout.vizOrder.indexOf(oVizRef.id);
+
+                            oVizRef.id = sNewId;
+                            oCdmPage.payload.sections[oCurrentSectionModel.id].viz[sNewId] = oVizRef;
+                            oCdmPage.payload.sections[oCurrentSectionModel.id].layout.vizOrder[iVizOrderIndex] = sNewId;
+
+                            oVisualization.id = sNewId;
+                        }
+                    });
+                }
+            });
+
+            this._oPagesModel._setProperty(`/pages/${iPageIndex}/sections/${iSectionIndex}`, oOriginalSectionModel);
+
+            // Reset the CDM3.1 Site
+            oCdmPage.payload.sections[oOriginalSectionModel.id] = oOriginalCdmPage.payload.sections[oOriginalSectionModel.id];
+            return await this._conditionalSavePersonalization(oCdmPage.identification.id);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -1066,57 +1050,46 @@ sap.ui.define([
      *
      * @param {int} iPageIndex The index of the page.
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      *
      * @since 1.75.0
      *
      * @private
      */
-    Pages.prototype.resetPage = function (iPageIndex) {
+    Pages.prototype.resetPage = async function (iPageIndex) {
         this.setPersonalizationActive(true);
 
-        var sPageId = this._oPagesModel.getProperty("/pages/" + iPageIndex + "/id");
+        const sPageId = this._oPagesModel.getProperty(`/pages/${iPageIndex}/id`);
 
-        return this._oCdmServicePromise
-            .then(function (oCdmService) {
-                return Promise.all([
-                    oCdmService.getCachedVisualizations(),
-                    oCdmService.getApplications(),
-                    oCdmService.getPage(sPageId),
-                    oCdmService.getOriginalPage(sPageId),
-                    oCdmService.getCachedVizTypes()
-                ]);
-            })
-            .catch(function (oError) {
-                Log.error("Pages - resetPage: Personalization cannot be saved: Failed to gather data from CDM Service.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (aResults) {
-                var oVisualizations = aResults[0];
-                var oApplications = aResults[1];
-                var oCdmPage = aResults[2];
-                var oOriginalCdmPage = aResults[3];
-                var oVizTypes = aResults[4];
-                return Promise.all([
-                    this._getModelForPage(oOriginalCdmPage, oVisualizations, oApplications, oVizTypes),
-                    oCdmPage,
-                    oOriginalCdmPage
-                ]);
-            }.bind(this))
-            .then(function (aResults) {
-                var oOriginalPageModel = aResults[0];
-                var oCdmPage = aResults[1];
-                var oOriginalCdmPage = aResults[2];
-                this._oPagesModel._setProperty("/pages/" + iPageIndex, oOriginalPageModel);
-
-                // Reset the CDM3.1 Site
-                oCdmPage.payload = deepClone(oOriginalCdmPage.payload);
-                return this._conditionalSavePersonalization(oCdmPage.identification.id);
-            }.bind(this))
-            .catch(function (oError) {
-                this.setPersonalizationActive(false);
-                return Promise.reject(oError);
-            }.bind(this));
+        let oVisualizations;
+        let oApplications;
+        let oCdmPage;
+        let oOriginalCdmPage;
+        let oVizTypes;
+        try {
+            const oCdmService = await this._oCdmServicePromise;
+            oVisualizations = await oCdmService.getCachedVisualizations();
+            oApplications = await oCdmService.getApplications();
+            oCdmPage = await oCdmService.getPage(sPageId);
+            oOriginalCdmPage = await oCdmService.getOriginalPage(sPageId);
+            oVizTypes = await oCdmService.getCachedVizTypes();
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            Log.error("Pages - resetPage: Personalization cannot be saved: Failed to gather data from CDM Service.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
+
+        try {
+            const oOriginalPageModel = await this._getModelForPage(oOriginalCdmPage, oVisualizations, oApplications, oVizTypes);
+            this._oPagesModel._setProperty(`/pages/${iPageIndex}`, oOriginalPageModel);
+
+            // Reset the CDM3.1 Site
+            oCdmPage.payload = deepClone(oOriginalCdmPage.payload);
+            return await this._conditionalSavePersonalization(oCdmPage.identification.id);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -1145,53 +1118,50 @@ sap.ui.define([
      * In case no page id was provided and if {@link #enableImplicitSave} was set to false, all unsaved modified pages are saved.
      * @param {string} [sPageId] the id of the page which should be saved
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      * @see #enableImplicitSave()
      *
      * @since 1.74.0
      * @private
      */
-    Pages.prototype.savePersonalization = function (sPageId) {
-        var aPages;
+    Pages.prototype.savePersonalization = async function (sPageId) {
+        let aPages;
         if (!sPageId) {
             aPages = deepClone(this._aPagesToBeSaved);
         } else {
             aPages = [sPageId];
         }
 
-        return this._oCdmServicePromise
-            .then(function (oCdmService) {
-                return Promise.all(aPages.map(function (sPage) {
-                    // Remove page from list because the current state will be saved
-                    var iIndex = this._aPagesToBeSaved.indexOf(sPage);
-                    this._aPagesToBeSaved.splice(iIndex, 1);
-
-                    return new Promise(function (resolve, reject) {
-                        oCdmService.save(sPage).then(resolve, reject);
-                    })
-                        .catch(function (oError) {
-                            // Add page back to list because it wasn't saved
-                            if (this._aPagesToBeSaved.indexOf(sPage) === -1) {
-                                this._aPagesToBeSaved.push(sPage);
-                            }
-                            return Promise.reject(oError);
-                        }.bind(this));
-                }.bind(this)));
-            }.bind(this))
-            .then(function () {
-                this._bDirtyState = false;
-            }.bind(this))
-            .catch(function (oError) {
-                Log.error("Pages - savePersonalization: Personalization cannot be saved: CDM Service cannot be retrieved or the save process encountered an error.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this));
+        try {
+            const oCdmService = await this._oCdmServicePromise;
+            await Promise.all(aPages.map((sPage) => {
+                // Remove page from list because the current state will be saved
+                const iIndex = this._aPagesToBeSaved.indexOf(sPage);
+                this._aPagesToBeSaved.splice(iIndex, 1);
+
+                return new Promise((resolve, reject) => {
+                    oCdmService.save(sPage).then(resolve, reject);
+                }).catch((oError) => {
+                    // Add page back to list because it wasn't saved
+                    if (this._aPagesToBeSaved.indexOf(sPage) === -1) {
+                        this._aPagesToBeSaved.push(sPage);
+                    }
+                    return Promise.reject(oError);
+                });
+            }));
+
+            this._bDirtyState = false;
+        } catch (oError) {
+            Log.error("Pages - savePersonalization: Personalization cannot be saved: CDM Service cannot be retrieved or the save process encountered an error.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
     };
 
     /**
      * Saves the personalization depending on the default of the implicit save
      * @param {string} sPageId the id of the page which should be saved
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      *
      * @since 1.85.0
      * @private
@@ -1276,33 +1246,31 @@ sap.ui.define([
      *
      * @param {int} pageIndex The index of the page containing the section.
      * @param {int} sectionIndex The index of the section containing the visualizations.
-     * @returns {Promise<undefined>} Promise which resolves after all visualizations have been checked (and removed).
+     * @returns {Promise} Promise which resolves after all visualizations have been checked (and removed).
      *
      * @since 1.90.0
      * @private
      */
-    Pages.prototype.removeUnsupportedVisualizations = function (pageIndex, sectionIndex) {
-        return this._oCSTRServicePromise.then(function (oCSTRService) {
-            var aVisualizations = this.getModel().getProperty("/pages/" + pageIndex + "/sections/" + sectionIndex + "/visualizations/");
+    Pages.prototype.removeUnsupportedVisualizations = async function (pageIndex, sectionIndex) {
+        const oCSTRService = await this._oCSTRServicePromise;
+        const aVisualizations = this.getModel().getProperty(`/pages/${pageIndex}/sections/${sectionIndex}/visualizations/`);
 
-            var aPromises = [];
+        const aPromises = [];
 
-            for (var i = aVisualizations.length - 1; i >= 0; --i) {
-                aPromises.push(this._isIntentSupported(aVisualizations[i], oCSTRService)
-                    .then(function (index, bIntentSupported) {
-                        if (!bIntentSupported) {
-                            aVisualizations.splice(index, 1);
-                        }
-                        return bIntentSupported;
-                    }.bind(this, i)));
-            }
-
-            return Promise.all(aPromises).then(function (aResults) {
-                if (aResults.indexOf(false) !== -1) {
-                    this.getModel().refresh();
+        for (let i = aVisualizations.length - 1; i >= 0; --i) {
+            aPromises.push(this._isIntentSupported(aVisualizations[i], oCSTRService).then(((index, bIntentSupported) => {
+                if (!bIntentSupported) {
+                    aVisualizations.splice(index, 1);
                 }
-            }.bind(this));
-        }.bind(this));
+                return bIntentSupported;
+            }).bind(this, i)));
+        }
+
+        const aResults = await Promise.all(aPromises);
+
+        if (aResults.indexOf(false) !== -1) {
+            this.getModel().refresh();
+        }
     };
 
     /**
@@ -1378,7 +1346,7 @@ sap.ui.define([
      * @param {string} [sectionId] The id of the section to which the bookmark should be added.
      * @param {string} [sContentProviderId] The contentProviderId or undefined outside the cFLP
      *
-     * @returns {Promise<undefined>} Promise which resolves after the personalization was saved.
+     * @returns {Promise} Promise which resolves after the personalization was saved.
      *
      * @since 1.75.0
      *
@@ -1483,19 +1451,19 @@ sap.ui.define([
             // Add visualization to existing default section, update model & site, save personalization
             oSectionToAdd.visualizations.push(oVizData);
             this._oPagesModel.refresh();
-            let oPage;
+            let oCDMPage;
             try {
-                oPage = await oCdmService.getPage(pageId);
+                oCDMPage = await oCdmService.getPage(pageId);
             } catch (oError) {
                 Log.error("Pages - addBookmarkToPage: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
                 throw oError;
             }
-            const oSection = oPage.payload.sections[oSectionToAdd.id];
+            const oSection = oCDMPage.payload.sections[oSectionToAdd.id];
             oSection.layout.vizOrder.push(oVizData.id);
             oSection.viz[oVizData.id] = readUtils.getVizRef(oVizData);
 
             // Save
-            return this._conditionalSavePersonalization(pageId);
+            return await this._conditionalSavePersonalization(pageId);
         } catch (oError) {
             this.setPersonalizationActive(false);
             throw oError;
@@ -1507,22 +1475,17 @@ sap.ui.define([
      * Currently, the returned Promise does not wait for the visitorFunctions to finish asynchronous tasks!
      *
      * @param {function} fnVisitor The visitor function
-     * @returns {Promise<undefined>} A Promise that resolves once all the pages were visited
+     * @returns {Promise} A Promise that resolves once all the pages were visited
      *
      * @since 1.82.0
      * @private
      */
-    Pages.prototype._visitPages = function (fnVisitor) {
-        return this._oCdmServicePromise
-            .then(function (oCdmService) {
-                return oCdmService.getAllPages();
-            })
-            .then(function (aPages) {
-                aPages = aPages || [];
-                aPages.forEach(function (oPage) {
-                    fnVisitor(oPage);
-                });
-            });
+    Pages.prototype._visitPages = async function (fnVisitor) {
+        const oCdmService = await this._oCdmServicePromise;
+        const aPages = await oCdmService.getAllPages() || [];
+        aPages.forEach((oPage) => {
+            fnVisitor(oPage);
+        });
     };
 
     /**
@@ -1530,15 +1493,15 @@ sap.ui.define([
      * Currently, the returned Promise does not wait for the visitorFunctions to finish asynchronous tasks!
      *
      * @param {function} fnVisitor The visitor function
-     * @returns {Promise<undefined>} A Promise that resolves once all the pages were visited
+     * @returns {Promise} A Promise that resolves once all the pages were visited
      *
      * @since 1.82.0
      * @private
      */
     Pages.prototype._visitSections = function (fnVisitor) {
-        return this._visitPages(function (oPage) {
-            var oSections = oPage.payload && oPage.payload.sections || {};
-            Object.keys(oSections).forEach(function (sKey) {
+        return this._visitPages((oPage) => {
+            const oSections = oPage.payload && oPage.payload.sections || {};
+            Object.keys(oSections).forEach((sKey) => {
                 fnVisitor(oSections[sKey], oPage);
             });
         });
@@ -1549,15 +1512,15 @@ sap.ui.define([
      * Currently the returned Promise does not wait for the visitorFunctions to finish asynchronous tasks!
      *
      * @param {function} fnVisitor The visitor function
-     * @returns {Promise<undefined>} A Promise that resolves once all the pages were visited
+     * @returns {Promise} A Promise that resolves once all the pages were visited
      *
      * @since 1.82.0
      * @private
      */
     Pages.prototype._visitVizReferences = function (fnVisitor) {
-        return this._visitSections(function (oSection, oPage) {
-            var oVizReferences = oSection.viz || {};
-            Object.keys(oVizReferences).forEach(function (sKey) {
+        return this._visitSections((oSection, oPage) => {
+            const oVizReferences = oSection.viz || {};
+            Object.keys(oVizReferences).forEach((sKey) => {
                 fnVisitor(oVizReferences[sKey], oSection, oPage);
             });
         });
@@ -1578,29 +1541,26 @@ sap.ui.define([
      * @since 1.82.0
      * @private
      */
-    Pages.prototype._findBookmarks = function (oIdentifier) {
+    Pages.prototype._findBookmarks = async function (oIdentifier) {
         // for bookmarks it is sufficient to check the vizReferences as the properties of interest
         // don't come from other CDM entities like app or visualization
-        var aVizReferences = [];
-        return Promise.resolve()
-            .then(function () {
-                var oTarget = utilsCdm.toTargetFromHash(oIdentifier.url);
-                oTarget = readUtils.harmonizeTarget(oTarget);
-                return this._visitVizReferences(function (oVizReference, oSection, oPage) {
-                    if (oVizReference.isBookmark &&
-                        oIdentifier.vizType === oVizReference.vizType &&
-                        (oVizReference.contentProviderId || "") === (oIdentifier.contentProviderId || "") &&
-                        utilsCdm.isSameTarget(oTarget, oVizReference.target)) {
-                        aVizReferences.push({
-                            vizRefId: oVizReference.id,
-                            sectionId: oSection.id,
-                            pageId: oPage.identification.id
-                        });
-                    }
-                }).then(function () {
-                    return aVizReferences;
+        const aVizReferences = [];
+
+        let oTarget = utilsCdm.toTargetFromHash(oIdentifier.url);
+        oTarget = readUtils.harmonizeTarget(oTarget);
+        await this._visitVizReferences((oVizReference, oSection, oPage) => {
+            if (oVizReference.isBookmark &&
+                oIdentifier.vizType === oVizReference.vizType &&
+                (oVizReference.contentProviderId || "") === (oIdentifier.contentProviderId || "") &&
+                utilsCdm.isSameTarget(oTarget, oVizReference.target)) {
+                aVizReferences.push({
+                    vizRefId: oVizReference.id,
+                    sectionId: oSection.id,
+                    pageId: oPage.identification.id
                 });
-            }.bind(this));
+            }
+        });
+        return aVizReferences;
     };
 
     /**
@@ -1617,11 +1577,9 @@ sap.ui.define([
      * @since 1.82.0
      * @private
      */
-    Pages.prototype.countBookmarks = function (oIdentifier) {
-        return this._findBookmarks(oIdentifier)
-            .then(function (aFoundBookmarks) {
-                return aFoundBookmarks.length;
-            });
+    Pages.prototype.countBookmarks = async function (oIdentifier) {
+        const aFoundBookmarks = await this._findBookmarks(oIdentifier);
+        return aFoundBookmarks.length;
     };
 
     /**
@@ -1641,41 +1599,37 @@ sap.ui.define([
      * @since 1.82.0
      * @private
      */
-    Pages.prototype.deleteBookmarks = function (oIdentifier, pageId, sectionId) {
-        var iDeletionCounter = 0;
-        return this._findBookmarks(oIdentifier)
-            .then(function (aVizReferencesToDelete) {
-                // the deleteVisualization function is not mass capable so we make sure that the
-                // calls are sequentialized so that there can be no race conditions
-                return aVizReferencesToDelete.reduce(function (oDeleteChain, oIds) {
-                    if (pageId && oIds.pageId !== pageId) {
-                        return oDeleteChain;
-                    }
-                    if (sectionId && oIds.sectionId !== sectionId) {
-                        return oDeleteChain;
-                    }
-                    return oDeleteChain
-                        .then(function () {
-                            return this.findVisualization(oIds.pageId, oIds.sectionId, null, oIds.vizRefId);
-                        }.bind(this))
-                        .then(function (aLocation) {
-                            // the vizRef ID is unique on a page so there can be only one result
-                            var oLocation = aLocation[0];
-                            var iPageIndex = this.getPageIndex(oLocation.pageId);
-                            return this.deleteVisualization(iPageIndex, oLocation.sectionIndex, oLocation.vizIndexes[0]);
-                        }.bind(this))
-                        .then(function () {
-                            iDeletionCounter = iDeletionCounter + 1;
-                        })
-                        .catch(function () {
-                            // as deleteVisualization is not mass capable it is not possible to implement an all or nothing
-                            // error handling therefore only the number of successful deletions is returned
-                        });
-                }.bind(this), Promise.resolve());
-            }.bind(this))
-            .then(function () {
-                return iDeletionCounter;
-            });
+    Pages.prototype.deleteBookmarks = async function (oIdentifier, pageId, sectionId) {
+        let iDeletionCounter = 0;
+        const aVizReferencesToDelete = await this._findBookmarks(oIdentifier);
+        // the deleteVisualization function is not mass capable so we make sure that the
+        // calls are sequentialized so that there can be no race conditions
+        await aVizReferencesToDelete.reduce((oDeleteChain, oIds) => {
+            if (pageId && oIds.pageId !== pageId) {
+                return oDeleteChain;
+            }
+            if (sectionId && oIds.sectionId !== sectionId) {
+                return oDeleteChain;
+            }
+            return oDeleteChain
+                .then(() => {
+                    return this.findVisualization(oIds.pageId, oIds.sectionId, null, oIds.vizRefId);
+                })
+                .then((aLocation) => {
+                    // the vizRef ID is unique on a page so there can be only one result
+                    const oLocation = aLocation[0];
+                    const iPageIndex = this.getPageIndex(oLocation.pageId);
+                    return this.deleteVisualization(iPageIndex, oLocation.sectionIndex, oLocation.vizIndexes[0]);
+                })
+                .then(() => {
+                    iDeletionCounter = iDeletionCounter + 1;
+                })
+                .catch(() => {
+                    // as deleteVisualization is not mass capable it is not possible to implement an all or nothing
+                    // error handling therefore only the number of successful deletions is returned
+                });
+        }, Promise.resolve());
+        return iDeletionCounter;
     };
 
     /**
@@ -1694,68 +1648,65 @@ sap.ui.define([
      * @since 1.83.0
      * @private
      */
-    Pages.prototype.updateBookmarks = function (oIdentifier, oParameters) {
+    Pages.prototype.updateBookmarks = async function (oIdentifier, oParameters) {
         if (!oIdentifier || !oIdentifier.url || typeof oIdentifier.url !== "string") {
             Log.error("Fail to update bookmark. No valid URL");
             return Promise.reject("Invalid URL provided");
         }
         if (!oParameters || typeof oParameters !== "object") {
-            Log.error("Fail to update bookmark. No valid parameters, URL is: " + oIdentifier.url);
+            Log.error(`Fail to update bookmark. No valid parameters, URL is: ${oIdentifier.url}`);
             return Promise.reject("Missing parameters");
         }
-        var iUpdateCounter = 0;
-        return Promise.all([
+        let iUpdateCounter = 0;
+        const aResult = await Promise.all([
             this._findBookmarks(oIdentifier)
-        ])
-            .then(function (aResult) {
-                var aVizReferencesToUpdate = aResult[0];
-
-                // the updateVisualization function is not mass capable so we make sure that the
-                // calls are sequentialized so that there can be no race conditions
-                return aVizReferencesToUpdate.reduce(function (oUpdateChain, oIds) {
-                    return oUpdateChain
-                        .then(function () {
-                            return this.findVisualization(oIds.pageId, oIds.sectionId, null, oIds.vizRefId);
-                        }.bind(this))
-                        .then(function (aLocation) {
-                            // the vizRef ID is unique on a page so there can be only one result
-                            var oLocation = aLocation[0];
-                            var iPageIndex = this.getPageIndex(oLocation.pageId);
-
-                            // map the parameters of the bookmark service API to the properties of a visualization
-                            var oVisualizationData = {
-                                subtitle: oParameters.subtitle,
-                                icon: oParameters.icon,
-                                info: oParameters.info,
-                                numberUnit: oParameters.numberUnit,
-                                indicatorDataSource: {
-                                    path: oParameters.serviceUrl,
-                                    refresh: oParameters.serviceRefreshInterval
-                                },
-                                vizConfig: oParameters.vizConfig
-                            };
-                            // prevent that title and url can be cleared by setting them to "" as they are mandatory
-                            if (oParameters.title) {
-                                oVisualizationData.title = oParameters.title;
-                            }
-                            if (oParameters.url) {
-                                oVisualizationData.target = readUtils.harmonizeTarget(utilsCdm.toTargetFromHash(oParameters.url));
-                            }
-
-                            return this.updateVisualization(iPageIndex, oLocation.sectionIndex, oLocation.vizIndexes[0], oVisualizationData);
-                        }.bind(this))
-                        .then(function () {
-                            iUpdateCounter = iUpdateCounter + 1;
-                        })
-                        .catch(function () {
-                            // as updateVisualization is not mass capable it is not possible to implement an all or nothing
-                            // error handling therefore only the number of successful updates is returned
-                        });
-                }.bind(this), Promise.resolve());
-            }.bind(this))
-            .then(function () {
-                return iUpdateCounter;
-            });
+        ]);
+        const aVizReferencesToUpdate = aResult[0];
+
+        // the updateVisualization function is not mass capable so we make sure that the
+        // calls are sequentialized so that there can be no race conditions
+        await aVizReferencesToUpdate.reduce((oUpdateChain, oIds) => {
+            return oUpdateChain
+                .then(() => {
+                    return this.findVisualization(oIds.pageId, oIds.sectionId, null, oIds.vizRefId);
+                })
+                .then((aLocation) => {
+                    // the vizRef ID is unique on a page so there can be only one result
+                    const oLocation = aLocation[0];
+                    const iPageIndex = this.getPageIndex(oLocation.pageId);
+
+                    // map the parameters of the bookmark service API to the properties of a visualization
+                    const oVisualizationData = {
+                        subtitle: oParameters.subtitle,
+                        icon: oParameters.icon,
+                        info: oParameters.info,
+                        numberUnit: oParameters.numberUnit,
+                        indicatorDataSource: {
+                            path: oParameters.serviceUrl,
+                            refresh: oParameters.serviceRefreshInterval
+                        },
+                        vizConfig: oParameters.vizConfig
+                    };
+                    // prevent that title and url can be cleared by setting them to "" as they are mandatory
+                    if (oParameters.title) {
+                        oVisualizationData.title = oParameters.title;
+                    }
+                    if (oParameters.url) {
+                        oVisualizationData.target = readUtils.harmonizeTarget(utilsCdm.toTargetFromHash(oParameters.url));
+                    }
+
+                    return this.updateVisualization(iPageIndex, oLocation.sectionIndex, oLocation.vizIndexes[0], oVisualizationData);
+                })
+                .then(() => {
+                    iUpdateCounter = iUpdateCounter + 1;
+                })
+                .catch(() => {
+                    // as updateVisualization is not mass capable it is not possible to implement an all or nothing
+                    // error handling therefore only the number of successful updates is returned
+                });
+        }, Promise.resolve());
+
+        return iUpdateCounter;
     };
 
     /**
@@ -1791,7 +1742,7 @@ sap.ui.define([
             oCdmService.getCachedVizTypes()
         ]);
 
-        const oPageModel = this._oPagesModel.getProperty("/pages/" + iPageIndex);
+        const oPageModel = this._oPagesModel.getProperty(`/pages/${iPageIndex}`);
         const oSectionModel = oPageModel.sections[iSourceSectionIndex];
         const aSourceSectionVisualizations = oSectionModel.visualizations;
         let oUpdatedVisualization = aSourceSectionVisualizations[iSourceVisualizationIndex];
@@ -1866,34 +1817,35 @@ sap.ui.define([
      * @param {string} sVizRefId The the vizReference ID
      * @param {sap.ushell.services.Pages.Visualization} oUpdatedVisualization The updated visualization properties
      *
-     * @returns {Promise<undefined>} The promise resolves when the personalization was saved successfully
+     * @returns {Promise} The promise resolves when the personalization was saved successfully
      *
      * @since 1.83
      * @private
      */
-    Pages.prototype._updateVisualizationCDMData = function (sPageId, sSectionId, sVizRefId, oUpdatedVisualization) {
-        return this._oCdmServicePromise
-            .then(function (oCDMService) {
-                return oCDMService.getPage(sPageId);
-            })
-            .catch(function (oError) {
-                Log.error("Pages - updateVisualization: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
-                return Promise.reject(oError);
-            }.bind(this))
-            .then(function (oPage) {
-                var oVizRef = oPage.payload.sections[sSectionId].viz[sVizRefId];
-                // This makes sure that only valid properties end up in the vizReference
-                var oUpdatedVizRefProperties = readUtils.getVizRef(oUpdatedVisualization);
-                oUpdatedVizRefProperties.vizConfig = oUpdatedVisualization.vizConfig;
-                // Add only changed properties to the vizReference. See also updateVisualization.
-                extend(oVizRef, oUpdatedVizRefProperties);
-
-                return this._conditionalSavePersonalization(oPage.identification.id);
-            }.bind(this))
-            .catch(function (oError) {
-                this.setPersonalizationActive(false);
-                return Promise.reject(oError);
-            }.bind(this));
+    Pages.prototype._updateVisualizationCDMData = async function (sPageId, sSectionId, sVizRefId, oUpdatedVisualization) {
+        let oPage;
+        try {
+            const oCDMService = await this._oCdmServicePromise;
+            oPage = await oCDMService.getPage(sPageId);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            Log.error("Pages - updateVisualization: Personalization cannot be saved: CDM Service or Page cannot be retrieved.", oError, this.COMPONENT_NAME);
+            return Promise.reject(oError);
+        }
+
+        try {
+            const oVizRef = oPage.payload.sections[sSectionId].viz[sVizRefId];
+            // This makes sure that only valid properties end up in the vizReference
+            const oUpdatedVizRefProperties = readUtils.getVizRef(oUpdatedVisualization);
+            oUpdatedVizRefProperties.vizConfig = oUpdatedVisualization.vizConfig;
+            // Add only changed properties to the vizReference. See also updateVisualization.
+            extend(oVizRef, oUpdatedVizRefProperties);
+
+            return await this._conditionalSavePersonalization(oPage.identification.id);
+        } catch (oError) {
+            this.setPersonalizationActive(false);
+            return Promise.reject(oError);
+        }
     };
 
     /**
@@ -1917,4 +1869,4 @@ sap.ui.define([
 
     Pages.hasNoAdapter = true;
     return Pages;
-}, /*export=*/ true);
+}, /* export=*/ true);