@sapui5/sap.ushell 1.136.3 → 1.138.0

package/src/main/js/sap/ushell/adapters/cdm/v3/FlpLaunchPageAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's LaunchPageAdapter for the
  *               'CDM' platform - Version 3 (V3)
  *
- * @version 1.136.3
+ * @version 1.138.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/v3/_LaunchPage/readHome",
@@ -29,7 +29,7 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell/EventHub",
     "sap/ushell/Container"
-], function (
+], (
     oReadHomePageUtils,
     oModifyHomePageUtils,
     oReadCatalog,
@@ -52,16 +52,16 @@ sap.ui.define([
     Log,
     EventHub,
     Container
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.GenericTileMode
-    var oGenericTileMode = mobileLibrary.GenericTileMode;
+    const oGenericTileMode = mobileLibrary.GenericTileMode;
 
     /* global hasher */
 
-    var STATIC_TILE_COMPONENT_NAME = "sap.ushell.components.tiles.cdm.applauncher";
-    var DYNAMIC_TILE_COMPONENT_NAME = "sap.ushell.components.tiles.cdm.applauncherdynamic";
+    const STATIC_TILE_COMPONENT_NAME = "sap.ushell.components.tiles.cdm.applauncher";
+    const DYNAMIC_TILE_COMPONENT_NAME = "sap.ushell.components.tiles.cdm.applauncherdynamic";
 
     /**
      * This method MUST be called by the Unified Shell's container only.
@@ -83,10 +83,10 @@ sap.ui.define([
         Promise.all([
             Container.getServiceAsync("URLParsing"),
             this.oCDMServicePromise
-        ]).then(function (aServices) {
+        ]).then((aServices) => {
             this.oURLParsingService = aServices[0]; // It is not used internally. Keep it for back compatibility.
             this.oCDMService = aServices[1];
-        }.bind(this));
+        });
 
         /**
          * Returns the tile resolution result in the context of a given site.
@@ -111,8 +111,8 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this._getTileFromHashInContextOfSite = function (fnResolver, oCatalogTilePromiseCache, sIntent) {
-            var oDeferred = new jQuery.Deferred();
-            var oCatalogTilePromise = oCatalogTilePromiseCache[sIntent];
+            const oDeferred = new jQuery.Deferred();
+            let oCatalogTilePromise = oCatalogTilePromiseCache[sIntent];
 
             if (!oCatalogTilePromise) {
                 // only call resolve if it was not resolved before
@@ -122,15 +122,15 @@ sap.ui.define([
                 oCatalogTilePromiseCache[sIntent] = oCatalogTilePromise;
             }
 
-            oCatalogTilePromise.done(function (oTileIntentResolutionResult) {
-                var oTileResolutionResult = {
+            oCatalogTilePromise.done((oTileIntentResolutionResult) => {
+                const oTileResolutionResult = {
                     tileIntent: sIntent,
                     tileResolutionResult: oTileIntentResolutionResult
                 };
 
                 oDeferred.resolve(oTileResolutionResult);
-            }).fail(function (sErrorMsg) {
-                oDeferred.reject("Hash '" + sIntent + "' could not be resolved to a tile. " + sErrorMsg);
+            }).fail((sErrorMsg) => {
+                oDeferred.reject(`Hash '${sIntent}' could not be resolved to a tile. ${sErrorMsg}`);
             });
 
             return oDeferred.promise();
@@ -150,9 +150,9 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this._getTileFromHash = function (sIntent) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
-            Container.getServiceAsync("ClientSideTargetResolution").then(function (oCstrService) {
+            Container.getServiceAsync("ClientSideTargetResolution").then((oCstrService) => {
                 function fnResolveTile (...args) {
                     const oDeferred = new jQuery.Deferred();
                     oCstrService.resolveTileIntent(...args)
@@ -167,7 +167,7 @@ sap.ui.define([
                 this._getTileFromHashInContextOfSite(fnResolveTile, this._mCatalogTilePromises, sIntent)
                     .done(oDeferred.resolve)
                     .fail(oDeferred.reject);
-            }.bind(this));
+            });
 
             return oDeferred.promise();
         };
@@ -182,7 +182,7 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this._getTileForUrl = function (oTile) {
-            var oTileComponentLoadInfo = {
+            const oTileComponentLoadInfo = {
                 componentName: oTile.indicatorDataSource ? DYNAMIC_TILE_COMPONENT_NAME : STATIC_TILE_COMPONENT_NAME
             };
             return {
@@ -206,7 +206,7 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this._prepareTileHash = function (oTile) {
-            var oParams = {};
+            const oParams = {};
 
             if (this._isCatalogTile(oTile)) {
                 return oTile.tileIntent;
@@ -214,14 +214,14 @@ sap.ui.define([
 
             if (this._isGroupTile(oTile) && oTile.target) {
                 // TODO use hash from _mResolvedTiles if tile has been already resolved
-                var aRawParams = oTile.target.parameters || [];
-                aRawParams.forEach(function (oParameter) {
+                const aRawParams = oTile.target.parameters || [];
+                aRawParams.forEach((oParameter) => {
                     if (oParameter.name && oParameter.value) {
                         oParams[oParameter.name] = [oParameter.value];
                     }
                 });
 
-                var oTarget = {
+                const oTarget = {
                     target: {
                         semanticObject: oTile.target.semanticObject,
                         action: oTile.target.action
@@ -230,7 +230,7 @@ sap.ui.define([
                     appSpecificRoute: oTile.target.appSpecificRoute
                 };
 
-                return "#" + urlParsing.constructShellHash(oTarget);
+                return `#${urlParsing.constructShellHash(oTarget)}`;
             }
             return undefined;
         };
@@ -244,9 +244,9 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.getDefaultGroup = function () {
-            var oDeferred = new jQuery.Deferred();
-            var oAssureLoadedPromise;
-            var that = this;
+            const oDeferred = new jQuery.Deferred();
+            let oAssureLoadedPromise;
+            const that = this;
             // check whether assureLoaded was already called.
             // The default group is not set before.
             if (!this._oDefaultGroup) {
@@ -255,11 +255,11 @@ sap.ui.define([
 
             if (oAssureLoadedPromise) {
                 oAssureLoadedPromise
-                    .then(function () {
+                    .then(() => {
                         oDeferred.resolve(that._oDefaultGroup);
                     })
-                    .catch(function (sMessage) {
-                        oDeferred.reject("Failed to access default group. " + sMessage);
+                    .catch((sMessage) => {
+                        oDeferred.reject(`Failed to access default group. ${sMessage}`);
                     });
             } else {
                 oDeferred.resolve(that._oDefaultGroup);
@@ -283,19 +283,19 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.addGroup = function (sTitle) {
-            var oDeferred = new jQuery.Deferred();
-            var sGeneratedId;
-            var that = this;
+            const oDeferred = new jQuery.Deferred();
+            let sGeneratedId;
+            const that = this;
 
             if (!this._isValidTitle(sTitle)) {
                 return oDeferred.reject("No valid group title").promise();
             }
 
-            var sGenericErrorMessage = "Failed to add the group with title '" + sTitle + "' to the homepage. ";
+            const sGenericErrorMessage = `Failed to add the group with title '${sTitle}' to the homepage. `;
 
             // add group to site
             this.oCDMService.getSite()
-                .done(function (oSite) {
+                .done((oSite) => {
                     sGeneratedId = oUshellUtils.generateUniqueId(oReadHomePageUtils.getGroupIdsFromSite(oSite));
 
                     // append the group at the end
@@ -303,15 +303,15 @@ sap.ui.define([
 
                     // store personalization
                     that.oCDMService.save()
-                        .done(function () {
+                        .done(() => {
                             delete that._ensureLoadedDeferred;
                             oDeferred.resolve(oSite.groups[sGeneratedId], sGeneratedId);
                         })
-                        .fail(function (sErrorMsg0) {
+                        .fail((sErrorMsg0) => {
                             oDeferred.reject(sErrorMsg0);
                         });
                 })
-                .fail(function (sErrorMsg) {
+                .fail((sErrorMsg) => {
                     oDeferred.reject(sGenericErrorMessage + sErrorMsg);
                 });
 
@@ -331,8 +331,8 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.setGroupTitle = function (oGroup, sNewTitle) {
-            var that = this;
-            var oDeferred = new jQuery.Deferred();
+            const that = this;
+            const oDeferred = new jQuery.Deferred();
 
             if (typeof oGroup !== "object" || !oReadHomePageUtils.getGroupId(oGroup)) {
                 return oDeferred.reject("Unexpected group value").promise();
@@ -340,29 +340,29 @@ sap.ui.define([
             if (!that._isValidTitle(sNewTitle)) {
                 return oDeferred.reject("Unexpected oGroup title value").promise();
             }
-            var sGenericErrorMessage = "Failed to set new title for group with id '" +
-                oReadHomePageUtils.getGroupId(oGroup) + "'. ";
+            const sGenericErrorMessage = `Failed to set new title for group with id '${
+                oReadHomePageUtils.getGroupId(oGroup)}'. `;
 
             // necessary in case the renaming operation fails
-            var sOldTitle = oReadHomePageUtils.getGroupTitle(oGroup);
+            const sOldTitle = oReadHomePageUtils.getGroupTitle(oGroup);
 
             this.oCDMService.getSite()
-                .done(function (oSite) {
+                .done((oSite) => {
                     // adapt title
                     if (oGroup) {
                         oModifyHomePageUtils.setGroupTitle(oGroup, sNewTitle);
                     }
                     // save personalization
                     that.oCDMService.save()
-                        .done(function () {
+                        .done(() => {
                             oDeferred.resolve();
                         })
-                        .fail(function (sErrorMsg) {
+                        .fail((sErrorMsg) => {
                             Log.error(sErrorMsg);
                             oDeferred.reject(sOldTitle);
                         });
                 })
-                .fail(function (sError) {
+                .fail((sError) => {
                     oDeferred.reject(sOldTitle, sGenericErrorMessage + sError);
                 });
 
@@ -383,28 +383,28 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.hideGroups = function (aHiddenGroupIds) {
-            var oDeferred = new jQuery.Deferred();
-            var oCdmSiteService = this.oCDMService;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
 
             if (aHiddenGroupIds && Array.isArray(aHiddenGroupIds)) {
-                var sGenericErrorMessage = "Failed to hide group. ";
+                const sGenericErrorMessage = "Failed to hide group. ";
                 oCdmSiteService.getSite()
-                    .done(function (oSite) {
-                        oReadHomePageUtils.getGroupsArrayFromSite(oSite).forEach(function (oGroup) {
-                            var bIsInList = Array.prototype.indexOf.call(aHiddenGroupIds, oReadHomePageUtils.getGroupId(oGroup)) === -1;
+                    .done((oSite) => {
+                        oReadHomePageUtils.getGroupsArrayFromSite(oSite).forEach((oGroup) => {
+                            const bIsInList = Array.prototype.indexOf.call(aHiddenGroupIds, oReadHomePageUtils.getGroupId(oGroup)) === -1;
                             oModifyHomePageUtils.setGroupVisibility(oGroup, bIsInList);
                         });
 
                         // persist personalization
                         oCdmSiteService.save()
-                            .done(function () {
+                            .done(() => {
                                 oDeferred.resolve();
                             })
-                            .fail(function (oErrorMsg0) {
-                                oDeferred.reject("Hiding of groups did not work as expected - " + oErrorMsg0);
+                            .fail((oErrorMsg0) => {
+                                oDeferred.reject(`Hiding of groups did not work as expected - ${oErrorMsg0}`);
                             });
                     })
-                    .fail(function (sError) {
+                    .fail((sError) => {
                         oDeferred.reject(sGenericErrorMessage + sError);
                     });
             } else {
@@ -427,19 +427,19 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.moveGroup = function (oGroup, nNewIndex) {
-            var oDeferred = new jQuery.Deferred();
-            var oCdmSiteService = this.oCDMService;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
 
             if (!oGroup || !oReadHomePageUtils.getGroupId(oGroup) || nNewIndex < 0) {
                 return oDeferred.reject("Unable to move groups - invalid parameters").promise();
             }
 
-            var sGenericErrorMessage = "Failed to move group with id '" + oGroup.identification.id + "'. ";
+            const sGenericErrorMessage = `Failed to move group with id '${oGroup.identification.id}'. `;
             // move group inside the site object
             oCdmSiteService.getSite()
-                .done(function (oSite) {
-                    var aGroupsOrder = oReadHomePageUtils.getGroupIdsFromSite(oSite);
-                    var sGroupId = oReadHomePageUtils.getGroupId(oGroup);
+                .done((oSite) => {
+                    const aGroupsOrder = oReadHomePageUtils.getGroupIdsFromSite(oSite);
+                    const sGroupId = oReadHomePageUtils.getGroupId(oGroup);
 
                     if (!aGroupsOrder) {
                         return oDeferred.reject("groupsOrder not found - abort operation of adding a group.");
@@ -448,7 +448,7 @@ sap.ui.define([
                     }
 
                     // move group inside the groupsOrder array
-                    var aGroupsOrderAfterMove = oUshellUtils.moveElementInsideOfArray(aGroupsOrder, aGroupsOrder.indexOf(sGroupId), nNewIndex);
+                    const aGroupsOrderAfterMove = oUshellUtils.moveElementInsideOfArray(aGroupsOrder, aGroupsOrder.indexOf(sGroupId), nNewIndex);
 
                     if (!aGroupsOrderAfterMove) {
                         return oDeferred.reject("invalid move group operation - abort.");
@@ -458,15 +458,15 @@ sap.ui.define([
 
                     // store personalization
                     oCdmSiteService.save()
-                        .done(function () {
+                        .done(() => {
                             oDeferred.resolve();
                         })
-                        .fail(function (sErrorMsg) {
+                        .fail((sErrorMsg) => {
                             oDeferred.reject(sErrorMsg);
                         });
                     return undefined;
                 })
-                .fail(function (sError) {
+                .fail((sError) => {
                     oDeferred.reject(sGenericErrorMessage + sError);
                 });
             return oDeferred.promise();
@@ -483,33 +483,33 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.removeGroup = function (oGroup) {
-            var oDeferred = new jQuery.Deferred();
-            var oCdmSiteService = this.oCDMService;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
 
             if (typeof oGroup !== "object") {
                 return oDeferred.reject("invalid group parameter").promise();
             }
-            var sGroupId = oReadHomePageUtils.getGroupId(oGroup);
+            const sGroupId = oReadHomePageUtils.getGroupId(oGroup);
             if (!sGroupId) {
                 return oDeferred.reject("group without id given").promise();
             }
 
-            var sGenericErrorMessage = "Failed to remove group with id '" + sGroupId + "'. ";
+            const sGenericErrorMessage = `Failed to remove group with id '${sGroupId}'. `;
 
             // remove group from site object
             oCdmSiteService.getSite()
-                .done(function (oSite) {
+                .done((oSite) => {
                     oModifyHomePageUtils.removeGroupFromSite(oSite, oGroup);
 
                     oCdmSiteService.save()
-                        .done(function () {
+                        .done(() => {
                             oDeferred.resolve();
                         })
-                        .fail(function (sErrorMsg) {
+                        .fail((sErrorMsg) => {
                             oDeferred.reject(sErrorMsg);
                         });
                 })
-                .fail(function (sError) {
+                .fail((sError) => {
                     oDeferred.reject(sGenericErrorMessage + sError);
                 });
 
@@ -529,22 +529,22 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.resetGroup = function (oGroup) {
-            var oDeferred = new jQuery.Deferred();
-            var oCdmSiteService = this.oCDMService;
-            var aSiteGroupsBackup = [];
-            var that = this;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
+            const aSiteGroupsBackup = [];
+            const that = this;
 
             if (typeof oGroup === "object" && oReadHomePageUtils.getGroupId(oGroup)) {
-                var sGroupId = oReadHomePageUtils.getGroupId(oGroup);
-                var sGenericErrorMessage = "Failed to reset group with id '" + sGroupId + "'. ";
+                const sGroupId = oReadHomePageUtils.getGroupId(oGroup);
+                const sGenericErrorMessage = `Failed to reset group with id '${sGroupId}'. `;
 
                 oCdmSiteService.getSite()
-                    .done(function (oSite) {
+                    .done((oSite) => {
                         deepExtend(aSiteGroupsBackup, oReadHomePageUtils.getGroupsArrayFromSite(oSite));
 
                         if (that.isGroupRemovable(oGroup) === false) {
                             oCdmSiteService.getGroupFromOriginalSite(sGroupId)
-                                .done(function (oGroupFromOriginalSite) {
+                                .done((oGroupFromOriginalSite) => {
                                     // overwrite respective group in site with the one returned by the original site
                                     if (typeof oSite === "object" && oReadHomePageUtils.getGroupFromSite(oSite, sGroupId)) {
                                         oModifyHomePageUtils.overwriteGroup(oSite, oGroupFromOriginalSite, sGroupId);
@@ -552,21 +552,21 @@ sap.ui.define([
 
                                     // persist personalization
                                     oCdmSiteService.save()
-                                        .done(function () {
+                                        .done(() => {
                                             oDeferred.resolve(oGroupFromOriginalSite);
                                         })
-                                        .fail(function (sErrorMsg1) {
-                                            oDeferred.reject("Group could not be reset - " + sErrorMsg1, aSiteGroupsBackup);
+                                        .fail((sErrorMsg1) => {
+                                            oDeferred.reject(`Group could not be reset - ${sErrorMsg1}`, aSiteGroupsBackup);
                                         });
                                 })
-                                .fail(function (sErrorMsg) {
-                                    oDeferred.reject("Group could not be reset - " + sErrorMsg, aSiteGroupsBackup);
+                                .fail((sErrorMsg) => {
+                                    oDeferred.reject(`Group could not be reset - ${sErrorMsg}`, aSiteGroupsBackup);
                                 });
                         } else {
                             oDeferred.reject("Group could not be reset as it was created by the user", aSiteGroupsBackup);
                         }
                     })
-                    .fail(function (sError) {
+                    .fail((sError) => {
                         // reject with the original groups cannot be done in this case as
                         // loading of site failed
                         oDeferred.reject(sGenericErrorMessage + sError, []);
@@ -602,7 +602,7 @@ sap.ui.define([
          *  supported, and <code>false</code> if not.
          * @deprecated since 1.120
          */
-        this.isLinkPersonalizationSupported = function (/*oTile*/) {
+        this.isLinkPersonalizationSupported = function (/* oTile */) {
             return true;
         };
 
@@ -629,7 +629,7 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.refreshTile = function (oTile) {
-            var oResolvedTile = this._mResolvedTiles[oTile.id];
+            const oResolvedTile = this._mResolvedTiles[oTile.id];
 
             if (oResolvedTile) {
                 if (oResolvedTile.tileComponent) {
@@ -670,12 +670,12 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.getTileView = function (oGroupTile) {
-            var that = this;
-            return new jQuery.Deferred(function (oDeferred) {
-                return that._getTileView(oGroupTile, false).then(function (oTileUI) {
+            const that = this;
+            return new jQuery.Deferred((oDeferred) => {
+                return that._getTileView(oGroupTile, false).then((oTileUI) => {
                     oDeferred.resolve(oTileUI);
-                }, function (sReason) {
-                    var sErrorMessage = "Tile with ID '" + oGroupTile.id + "' could not be initialized" + (sReason ? ":\n" + sReason : ".");
+                }, (sReason) => {
+                    const sErrorMessage = `Tile with ID '${oGroupTile.id}' could not be initialized${sReason ? `:\n${sReason}` : "."}`;
 
                     Log.error(sErrorMessage, null, oGroupTile.tileType);
                     oDeferred.reject(sErrorMessage);
@@ -695,10 +695,10 @@ sap.ui.define([
          * @private
          */
         this._getCatalogTileViewControl = function (oCatalogTile) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             if (typeof oCatalogTile !== "object") {
-                var sErrorMessage = "Invalid input parameter passed to _getCatalogTileView: " + oCatalogTile;
+                const sErrorMessage = `Invalid input parameter passed to _getCatalogTileView: ${oCatalogTile}`;
                 Log.error(sErrorMessage);
                 return oDeferred.reject(sErrorMessage).promise();
             }
@@ -727,10 +727,10 @@ sap.ui.define([
          * @private
          */
         this._createLinkInstance = function (oTile, bIsCatalogTile, sNavigationMode, fnGenericTile, oResources) {
-            var sTileTitle;
-            var sTileSubTitle = this.getTileSubtitle(oTile);
+            let sTileTitle;
+            const sTileSubTitle = this.getTileSubtitle(oTile);
 
-            var GenericTile = fnGenericTile;
+            const GenericTile = fnGenericTile;
 
             // should only be called after tile has been resolved
             if (bIsCatalogTile === true) {
@@ -740,27 +740,27 @@ sap.ui.define([
             }
 
             // By using the LineMode, the GenericTile is displayed as a Link
-            var linkTileControl = new GenericTile({
+            const linkTileControl = new GenericTile({
                 mode: oGenericTileMode.LineMode,
                 subheader: sTileSubTitle,
                 header: sTileTitle,
                 url: WindowUtils.getLeanURL(this.getTileTarget(oTile)),
-                //TODO: The below code is for POC only, should be removed once UI5 provide action buttons for line mode
+                // TODO: The below code is for POC only, should be removed once UI5 provide action buttons for line mode
                 press: function (oEvent) {
                     this._genericTilePressHandler(oTile, oEvent);
                 }.bind(this)
             });
             if (sNavigationMode) {
-                var sTranslatedNavMode = oResources.i18n.getText(sNavigationMode + "NavigationMode");
-                //According to ACC-257 aria-label should start with the navigation mode, then the tile content
-                linkTileControl.setAriaLabel(sTranslatedNavMode + " " + sTileTitle + " " + sTileSubTitle);
+                const sTranslatedNavMode = oResources.i18n.getText(`${sNavigationMode}NavigationMode`);
+                // According to ACC-257 aria-label should start with the navigation mode, then the tile content
+                linkTileControl.setAriaLabel(`${sTranslatedNavMode} ${sTileTitle} ${sTileSubTitle}`);
             }
             this._mResolvedTiles[oTile.id].linkTileControl = linkTileControl;
             return linkTileControl;
         };
 
         this._genericTilePressHandler = function (oTile, oEvent) {
-            var sTargetURL;
+            let sTargetURL;
 
             if (oEvent.getSource().getScope && oEvent.getSource().getScope() === "Display") {
                 sTargetURL = this.getTileTarget(oTile);
@@ -781,6 +781,85 @@ sap.ui.define([
             }
         };
 
+        /**
+         * Updates the properties of a bookmark tile during its composition.
+         * @param {object} oTile JSON Object that holds the properties of a bookmark tile.
+         * @param {object} oParameters Properties to merge into the bookmark tile
+         * @param {object} oTarget The navigation target as a JSON object.
+         *
+         * @deprecated since 1.120
+         */
+        function updateTileComposition (oTile, oParameters, oTarget) {
+            // Avoid modifying callers reference.
+            oParameters = deepExtend({}, oParameters);
+
+            if (oTarget) {
+                oTile.target = oTarget;
+            }
+
+            if (oParameters.title || oParameters.title === "") {
+                oTile.title = oParameters.title;
+            }
+
+            if (oParameters.icon || oParameters.icon === "") {
+                oTile.icon = oParameters.icon;
+            }
+
+            if (oParameters.subtitle || oParameters.subtitle === "") {
+                oTile.subTitle = oParameters.subtitle;
+            }
+
+            if (oParameters.info || oParameters.info === "") {
+                oTile.info = oParameters.info;
+            }
+
+            if (oParameters.numberUnit || oParameters.numberUnit === "") {
+                oTile.numberUnit = oParameters.numberUnit;
+            }
+
+            if (oParameters.dataSource) {
+                oTile.dataSource = {
+                    type: oParameters.dataSource.type,
+                    settings: {
+                        odataVersion: ObjectPath.get(["dataSource", "settings", "odataVersion"], oParameters)
+                    }
+                };
+            }
+
+            if (oParameters.serviceUrl) {
+                oTile.indicatorDataSource = {
+                    path: oParameters.serviceUrl
+                };
+            }
+
+            if (oTile.indicatorDataSource && (oParameters.serviceRefreshInterval || oParameters.serviceRefreshInterval === 0)) {
+                oTile.indicatorDataSource.refresh = oParameters.serviceRefreshInterval;
+            }
+
+            if (oParameters.vizConfig) {
+                oTile.vizConfig = oParameters.vizConfig;
+            }
+        }
+
+        /**
+         * Compose a new tile
+         * @param {object} oParameters Parameters
+         * @param {object} oTarget Target
+         * @returns {object} Tile
+         * @deprecated since 1.120
+         */
+        function composeNewTile (oParameters, oTarget) {
+            // TODO Collect all tile ids to pass them as an arry to
+            // generateUniqueId
+            const oTile = {
+                id: oUshellUtils.generateUniqueId([])
+            };
+
+            updateTileComposition(oTile, oParameters, oTarget);
+
+            return oTile;
+        }
+
         /**
          * Adds a tile to the homepage. Furthermore the personalization will be
          * persisted for the end user.
@@ -797,14 +876,14 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.addTile = function (oCatalogTile, oGroup) {
-            var oDeferred = new jQuery.Deferred();
-            var oCdmSiteService = this.oCDMService;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
 
             if (!oGroup) {
                 oGroup = this._oDefaultGroup;
             }
 
-            var oGroupTile = composeNewTile();
+            const oGroupTile = composeNewTile();
             oGroupTile.vizId = oCatalogTile.vizId;
 
             // add new tile to list of resolved tiles
@@ -814,22 +893,22 @@ sap.ui.define([
                 isLink: false
             };
             oCdmSiteService.getSite()
-                .done(function (oSite) {
+                .done((oSite) => {
                     // We should think about the reasons why it's not safe to
                     // do the following, even though it's more succint:
                     //     oGroup.payload.tiles.push(oTile);
                     oSite.groups[oGroup.identification.id].payload.tiles.push(oGroupTile);
                     oCdmSiteService.save()
-                        .done(function () {
+                        .done(() => {
                             oDeferred.resolve(oGroupTile);
                         })
-                        .fail(function (sReason) {
+                        .fail((sReason) => {
                             oDeferred.reject(sReason);
                         });
                 })
-                .fail(function (sError) {
-                    var sGenericErrorMessage = "Failed to add tile with id '" + oGroupTile.id +
-                        "' to group with id '" + oGroup.identification.id + "'. ";
+                .fail((sError) => {
+                    const sGenericErrorMessage = `Failed to add tile with id '${oGroupTile.id
+                    }' to group with id '${oGroup.identification.id}'. `;
                     oDeferred.reject(sGenericErrorMessage + sError);
                 });
 
@@ -852,20 +931,20 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.removeTile = function (oGroup, oTile, iIndex) {
-            var oCdmSiteService = this.oCDMService;
-            var oDeferred = new jQuery.Deferred();
-            var that = this;
+            const oCdmSiteService = this.oCDMService;
+            const oDeferred = new jQuery.Deferred();
+            const that = this;
 
             if (!oGroup || typeof oGroup !== "object" || !oGroup.identification || !oGroup.identification.id ||
                 !oTile || typeof oTile !== "object" || !oTile.id) {
                 return oDeferred.reject({}, "Failed to remove tile. No valid input parameters passed to removeTile method.").promise();
             }
 
-            var sGenericErrorMessage = "Failed to remove tile with id '" + oTile.id + "' from group with id '" + oGroup.identification.id + "'. ";
+            const sGenericErrorMessage = `Failed to remove tile with id '${oTile.id}' from group with id '${oGroup.identification.id}'. `;
 
             oCdmSiteService.getSite()
-                .done(function (oSite) {
-                    var oPayload;
+                .done((oSite) => {
+                    let oPayload;
 
                     // succinctly convert iIndex to number
                     iIndex = +iIndex;
@@ -876,10 +955,10 @@ sap.ui.define([
                         oDeferred.reject(oSite.groups[oGroup.identification.id], sGenericErrorMessage);
                     }
 
-                    //according to the tile type set oPayload tile / links to be truncated.
-                    var sPayloadType = that.getTileType(oTile) === that.TileType.Link ? "links" : "tiles";
+                    // according to the tile type set oPayload tile / links to be truncated.
+                    const sPayloadType = that.getTileType(oTile) === that.TileType.Link ? "links" : "tiles";
 
-                    //In case the target is a link convert the iTargetIndex to the index of links payload.
+                    // In case the target is a link convert the iTargetIndex to the index of links payload.
                     if (that.getTileType(oTile) === that.TileType.Link) {
                         iIndex -= oPayload.tiles.length;
                     }
@@ -888,21 +967,21 @@ sap.ui.define([
                         // remove element in group
                         oPayload[sPayloadType].splice(iIndex, 1);
                     } else {
-                        oPayload[sPayloadType] = oPayload[sPayloadType].filter(function (oGroupElement) {
+                        oPayload[sPayloadType] = oPayload[sPayloadType].filter((oGroupElement) => {
                             return oGroupElement.id !== oTile.id;
                         });
                     }
 
                     oCdmSiteService.save()
-                        .done(function () {
+                        .done(() => {
                             oDeferred.resolve();
                         })
-                        .fail(function (sErrorMsg) {
+                        .fail((sErrorMsg) => {
                             Log.error(sErrorMsg);
                             oDeferred.reject(oSite.groups[oGroup.identification.id], sErrorMsg);
                         });
                 })
-                .fail(function (sError) {
+                .fail((sError) => {
                     // Reject an empty group object, as site with correct group data could not get accessed
                     oDeferred.reject({}, sGenericErrorMessage + sError);
                 });
@@ -932,9 +1011,9 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.moveTile = function (oTile, iSourceIndex, iTargetIndex, oSourceGroup, oTargetGroup, newTileType) {
-            var oDeferred = new jQuery.Deferred();
-            var oCdmSiteService = this.oCDMService;
-            var that = this;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
+            const that = this;
 
             if (!oTile || isEmptyObject(oTile) ||
                 iSourceIndex === undefined || iSourceIndex < 0 ||
@@ -944,30 +1023,30 @@ sap.ui.define([
                 return oDeferred.reject("Invalid input parameters").promise();
             }
 
-            var sGenericErrorMessage = "Failed to move tile with id '" + oTile.id + "'. ";
+            const sGenericErrorMessage = `Failed to move tile with id '${oTile.id}'. `;
 
             oCdmSiteService.getSite()
-                .done(function (oSite) {
-                    var sOrigTileType = that.getTileType(oTile) === that.TileType.Link ? "links" : "tiles";
+                .done((oSite) => {
+                    const sOrigTileType = that.getTileType(oTile) === that.TileType.Link ? "links" : "tiles";
 
-                    //if newTileType is not defined convert to the same type.
+                    // if newTileType is not defined convert to the same type.
                     if (!newTileType) {
                         newTileType = that._mResolvedTiles[oTile.id].isLink ? "link" : "tile";
                     }
 
-                    var sTargetPayloadType = newTileType === "link" ? "links" : "tiles";
+                    const sTargetPayloadType = newTileType === "link" ? "links" : "tiles";
 
                     // change the _mResolvedTiles tile type.
                     if (sOrigTileType !== sTargetPayloadType && that._mResolvedTiles[oTile.id]) {
                         that._mResolvedTiles[oTile.id].isLink = newTileType === "link"; // currently only bookmark tiles can be created
                     }
 
-                    //In case the target is a link convert the iTargetIndex to the index of links payload.
+                    // In case the target is a link convert the iTargetIndex to the index of links payload.
                     if (sTargetPayloadType === "links") {
                         iTargetIndex -= oSite.groups[oTargetGroup.identification.id].payload.tiles.length;
                     }
 
-                    //In case the source is a link convert the index to the index of links payload.
+                    // In case the source is a link convert the index to the index of links payload.
                     if (sOrigTileType === "links") {
                         iSourceIndex -= oSite.groups[oSourceGroup.identification.id].payload.tiles.length;
                     }
@@ -976,7 +1055,7 @@ sap.ui.define([
                     if (oSourceGroup.identification.id === oTargetGroup.identification.id) {
                         // within a group
                         if (iSourceIndex !== iTargetIndex || sOrigTileType !== sTargetPayloadType) {
-                            var oGroupPayload = oSite.groups[oTargetGroup.identification.id].payload;
+                            const oGroupPayload = oSite.groups[oTargetGroup.identification.id].payload;
                             oGroupPayload[sOrigTileType].splice(iSourceIndex, 1); // remove tile at source index
                             oGroupPayload[sTargetPayloadType].splice(iTargetIndex, 0, oTile); // add tile at target index
                         } else {
@@ -990,16 +1069,16 @@ sap.ui.define([
                     }
 
                     oCdmSiteService.save()
-                        .done(function () {
+                        .done(() => {
                             oDeferred.resolve(oTile);
                         })
-                        .fail(function (sError) {
+                        .fail((sError) => {
                             Log.error(sGenericErrorMessage + sError);
                             oDeferred.reject(sGenericErrorMessage + sError);
                         });
                     return undefined;
                 })
-                .fail(function (sError) {
+                .fail((sError) => {
                     Log.error(sGenericErrorMessage + sError);
                     oDeferred.reject(sGenericErrorMessage + sError);
                 });
@@ -1033,21 +1112,21 @@ sap.ui.define([
          *  the order with which the catalogs are returned.
          */
         this.getCatalogs = function () {
-            var that = this;
-            var oDeferred = new jQuery.Deferred();
-            var aCatalogs = [];
+            const that = this;
+            const oDeferred = new jQuery.Deferred();
+            const aCatalogs = [];
 
             function processCatalog (oCdmSite, sCatalogId, aCatalogs, oGetCatalogsDeferred) {
-                var oCatalog = oCdmSite.catalogs[sCatalogId];
+                const oCatalog = oCdmSite.catalogs[sCatalogId];
                 aCatalogs.push(oCatalog);
                 oGetCatalogsDeferred.notify(oCatalog);
             }
 
             // setTimeout is required here. Otherwise the the oDeferred.notify() would
             // be a synchronous call, which would cause wrong behavior in some scenarios
-            Container.getServiceAsync("CommonDataModel").then(function (oCDMSiteService) {
-                oCDMSiteService.getSite().done(function (oSite) {
-                    Object.keys(oSite.catalogs).forEach(function (sCatalogId) {
+            Container.getServiceAsync("CommonDataModel").then((oCDMSiteService) => {
+                oCDMSiteService.getSite().done((oSite) => {
+                    Object.keys(oSite.catalogs).forEach((sCatalogId) => {
                         processCatalog(oSite, sCatalogId, aCatalogs, oDeferred);
                     });
                     // In our tests we use indices to access specific
@@ -1079,11 +1158,11 @@ sap.ui.define([
                 return false;
             }
 
-            var aNonStartableInbounds = [
+            const aNonStartableInbounds = [
                 "Shell-plugin",
                 "Shell-bootConfig" // just in case
             ];
-            if (aNonStartableInbounds.indexOf(oInbound.semanticObject + "-" + oInbound.action) > -1) {
+            if (aNonStartableInbounds.indexOf(`${oInbound.semanticObject}-${oInbound.action}`) > -1) {
                 // This is a special intent which is not startable
                 return false;
             }
@@ -1104,16 +1183,16 @@ sap.ui.define([
          * @private
          */
         this._isStartableVisualization = function (oVisualization, oInbound) {
-            var oInboundParameters = ObjectPath.get("signature.parameters", oInbound);
+            const oInboundParameters = ObjectPath.get("signature.parameters", oInbound);
             if (!oInboundParameters) {
                 return true;
             }
 
-            var oVisualizationParameters = ObjectPath.get("parameters", oReadVisualization.getTarget(oVisualization));
+            const oVisualizationParameters = ObjectPath.get("parameters", oReadVisualization.getTarget(oVisualization));
 
             // check for matching filter parameters
-            return Object.keys(oInboundParameters).every(function (sInboundParameter) {
-                var oInboundParameter = oInboundParameters[sInboundParameter];
+            return Object.keys(oInboundParameters).every((sInboundParameter) => {
+                const oInboundParameter = oInboundParameters[sInboundParameter];
 
                 // don't filter out legacy URL applications that use the intent Shell-launchURL to model URL tiles
                 if (sInboundParameter === "sap-external-url") {
@@ -1126,8 +1205,8 @@ sap.ui.define([
                     return true;
                 }
 
-                var sExpectedFilterValue = oInboundParameter.filter.value;
-                var sSuppliedParameterValue = ObjectPath.get([sInboundParameter, "value", "value"], oVisualizationParameters);
+                const sExpectedFilterValue = oInboundParameter.filter.value;
+                const sSuppliedParameterValue = ObjectPath.get([sInboundParameter, "value", "value"], oVisualizationParameters);
 
                 if (sExpectedFilterValue !== sSuppliedParameterValue) {
                     return false;
@@ -1154,12 +1233,12 @@ sap.ui.define([
          * @private
          */
         this._toHashFromInbound = function (oInbound) {
-            var sConstructedHash = oUtilsCdm.toHashFromInbound(oInbound);
+            const sConstructedHash = oUtilsCdm.toHashFromInbound(oInbound);
 
             if (!sConstructedHash) {
                 return undefined;
             }
-            return "#" + sConstructedHash;
+            return `#${sConstructedHash}`;
         };
 
         /**
@@ -1191,88 +1270,49 @@ sap.ui.define([
          * @private
          */
         this._toHashFromOutbound = function (oOutbound) {
-            var sConstructedHash = oUtilsCdm.toHashFromOutbound(oOutbound);
+            const sConstructedHash = oUtilsCdm.toHashFromOutbound(oOutbound);
 
             if (!sConstructedHash) {
                 return undefined;
             }
-            return "#" + sConstructedHash;
-        };
-
-        /**
-         * Delivers the catalog tiles for a given catalog
-         *
-         * @param {object} oCatalog
-         *  Catalog
-         * @returns {jQuery.Promise}
-         *  In case of success the done handler will be called with an array
-         *  of catalog tiles.
-         */
-        this.getCatalogTiles = function (oCatalog) {
-            var that = this;
-            var oDeferred = new jQuery.Deferred();
-
-            if (typeof oCatalog !== "object" || oCatalog === null) {
-                return oDeferred.reject("Invalid input parameter '" + oCatalog + "' passed to getCatalogTiles.").promise();
-            }
-
-            // Direct open of search calls getCatalogTiles before the adapter is intialized, do not use this.oCDMService
-            this.oCDMServicePromise.then(function (oCDMService) {
-                oCDMService.getSite()
-                    .done(function (oSite) {
-                        getCatalogTilesFromSite.call(that, oCatalog, oSite)
-                            .done(oDeferred.resolve)
-                            .fail(oDeferred.reject);
-                    })
-                    .fail(function (sErrorMessage2) {
-                        oDeferred.reject("Failed to get site: " + sErrorMessage2);
-                    });
-            });
-
-            return oDeferred.promise();
+            return `#${sConstructedHash}`;
         };
 
         function getCatalogTilesFromSite (oCatalog, oSite) {
-            var that = this;
-            var oDeferred = new jQuery.Deferred();
+            const that = this;
+            const oDeferred = new jQuery.Deferred();
 
-            setTimeout(function () {
+            setTimeout(() => {
                 // calculate async
-                var aCatalogTiles = ((oCatalog.payload && oCatalog.payload.viz) || [])
-                    .reduce(function (aReturnedCatalogTiles, sVisualizationId) {
-                        var sAppId;
-                        var oVisualization;
-                        var sVisualizationTypeId;
-                        var oVisualizationType;
-                        var oAppDescriptor;
-                        var oInboundResult;
-                        var sHash;
-                        var oMapped;
-                        var sNavigationMode;
-                        var oOutbound;
-                        var oTileResolutionResult;
-                        var oCatalogTile;
-                        var sExternalUrl;
-                        var sApplicationType;
-                        var sAdditionalInformation;
-                        var bIsApplicationTypeConfiguredInPlace;
-                        var oEnableInPlaceForClassicUIsConfig;
-                        var aTechnicalAttributes;
+                const aCatalogTiles = ((oCatalog.payload && oCatalog.payload.viz) || [])
+                    .reduce((aReturnedCatalogTiles, sVisualizationId) => {
+                        let oAppDescriptor;
+                        let oInboundResult;
+                        let sHash;
+                        let oMapped;
+                        let sNavigationMode;
+                        let oOutbound;
+                        let sExternalUrl;
+                        let sApplicationType;
+                        let sAdditionalInformation;
+                        let bIsApplicationTypeConfiguredInPlace;
+                        let oEnableInPlaceForClassicUIsConfig;
+                        let aTechnicalAttributes;
 
                         // Get visualization and type
                         if (!sVisualizationId) {
                             return aReturnedCatalogTiles;
                         }
 
-                        oVisualization = oReadVisualization.get(oSite, sVisualizationId);
+                        const oVisualization = oReadVisualization.get(oSite, sVisualizationId);
                         if (!oVisualization) {
                             return aReturnedCatalogTiles;
                         }
 
-                        sVisualizationTypeId = oReadVisualization.getTypeId(oVisualization);
-                        oVisualizationType = oReadVisualization.getType(oSite, sVisualizationTypeId);
+                        const sVisualizationTypeId = oReadVisualization.getTypeId(oVisualization);
+                        const oVisualizationType = oReadVisualization.getType(oSite, sVisualizationTypeId);
 
-                        sAppId = oReadVisualization.getAppId(oVisualization);
+                        const sAppId = oReadVisualization.getAppId(oVisualization);
 
                         if (sAppId) {
                             // Read its target app descriptor and inbound
@@ -1311,7 +1351,7 @@ sap.ui.define([
                             aTechnicalAttributes = oReadApplications.getTechnicalAttributes(oAppDescriptor);
                         } else {
                             // Resolve tile via visualization's configuration
-                            var oConfig = oReadVisualization.getConfig(oVisualization);
+                            const oConfig = oReadVisualization.getConfig(oVisualization);
                             if (oConfig === undefined) {
                                 return aReturnedCatalogTiles;
                             }
@@ -1323,7 +1363,7 @@ sap.ui.define([
                             }
                         }
 
-                        oTileResolutionResult = oMapped.tileResolutionResult;
+                        const oTileResolutionResult = oMapped.tileResolutionResult;
                         oTileResolutionResult.navigationMode = sNavigationMode;
                         oTileResolutionResult.technicalAttributes = aTechnicalAttributes;
 
@@ -1341,7 +1381,7 @@ sap.ui.define([
                             );
                         }
 
-                        oCatalogTile = {
+                        const oCatalogTile = {
                             id: sVisualizationId, // reuse the vizId as it is stable and unique
                             vizId: sVisualizationId,
                             tileIntent: sExternalUrl || sHash,
@@ -1367,6 +1407,39 @@ sap.ui.define([
             return oDeferred.promise();
         }
 
+        /**
+         * Delivers the catalog tiles for a given catalog
+         *
+         * @param {object} oCatalog
+         *  Catalog
+         * @returns {jQuery.Promise}
+         *  In case of success the done handler will be called with an array
+         *  of catalog tiles.
+         */
+        this.getCatalogTiles = function (oCatalog) {
+            const that = this;
+            const oDeferred = new jQuery.Deferred();
+
+            if (typeof oCatalog !== "object" || oCatalog === null) {
+                return oDeferred.reject(`Invalid input parameter '${oCatalog}' passed to getCatalogTiles.`).promise();
+            }
+
+            // Direct open of search calls getCatalogTiles before the adapter is intialized, do not use this.oCDMService
+            this.oCDMServicePromise.then((oCDMService) => {
+                oCDMService.getSite()
+                    .done((oSite) => {
+                        getCatalogTilesFromSite.call(that, oCatalog, oSite)
+                            .done(oDeferred.resolve)
+                            .fail(oDeferred.reject);
+                    })
+                    .fail((sErrorMessage2) => {
+                        oDeferred.reject(`Failed to get site: ${sErrorMessage2}`);
+                    });
+            });
+
+            return oDeferred.promise();
+        };
+
         /**
          * Returns the catalog's technical error message in case it could not be loaded.
          * <p>
@@ -1552,8 +1625,8 @@ sap.ui.define([
          *  Keywords of respective catalog tile
          */
         this.getCatalogTileKeywords = function (oGroupTileOrCatalogTile) {
-            var aKeywords = [];
-            var oResolvedTile = oGroupTileOrCatalogTile;
+            const aKeywords = [];
+            let oResolvedTile = oGroupTileOrCatalogTile;
 
             if (!oResolvedTile) {
                 Log.error(
@@ -1594,8 +1667,8 @@ sap.ui.define([
          *  Technical attributes of respective catalog tile
          */
         this.getCatalogTileTechnicalAttributes = function (oGroupTileOrCatalogTile) {
-            var aTechnicalAttributes = [];
-            var oResolvedTile = oGroupTileOrCatalogTile;
+            const aTechnicalAttributes = [];
+            let oResolvedTile = oGroupTileOrCatalogTile;
 
             if (!oResolvedTile) {
                 Log.error(
@@ -1619,6 +1692,114 @@ sap.ui.define([
             return aTechnicalAttributes;
         };
 
+        /**
+         * Create tile parameters
+         * @param {object} oIntentParams Intent parameters
+         * @returns {object} Tile parameters
+         * @deprecated since 1.120
+         */
+        function createTileParametersFromIntentParams (oIntentParams) {
+            return Object.keys(oIntentParams).map((sKey) => {
+                const sValue = oIntentParams[sKey] && oIntentParams[sKey][0];
+
+                return {
+                    name: sKey,
+                    // sValue maybe undefined.
+                    value: sValue || ""
+                };
+            });
+        }
+
+        /**
+         * Create a new target
+         * @param {object} oIntent Intent
+         * @returns {object} Target
+         * @deprecated since 1.120
+         */
+        function createNewTargetFromIntent (oIntent) {
+            const oTarget = {
+                semanticObject: oIntent.semanticObject,
+                action: oIntent.action,
+                parameters: createTileParametersFromIntentParams(oIntent.params)
+            };
+
+            if (oIntent.appSpecificRoute) {
+                // do not loose the inner-app hash (e.g. &/ShoppingCart(12345))
+                // BCP 1670533333
+                oTarget.appSpecificRoute = oIntent.appSpecificRoute;
+            }
+
+            return oTarget;
+        }
+
+        /**
+         * Create a new target
+         * @param {string} sUrl Url
+         * @returns {object} target to the given URL.
+         * @deprecated since 1.120
+         */
+        function createNewTargetFromUrl (sUrl) {
+            return { url: sUrl };
+        }
+
+        /**
+         * Convert parameters to a string
+         * @param {Array} aList List of parameters
+         * @returns {string} a string, combining each of the given parameters and values, sorted.
+         * @deprecated since 1.120
+         */
+        function transformParameterListToString (aList) {
+            return aList
+                .map((oParameter) => {
+                    return oParameter.name + oParameter.value;
+                })
+                .sort()
+                .join();
+        }
+
+        /**
+         * Compare parameters
+         * @param {Array} aParameters Array of parameters
+         * @param {Array} aOthers Array of parameters
+         * @returns {boolean} whether the parameters are the same (perhaps in a different order)
+         * @deprecated since 1.120
+         */
+        function isSameParameters (aParameters, aOthers) {
+            aParameters = aParameters || [];
+            aOthers = aOthers || [];
+
+            if (aParameters.length === aOthers.length) {
+                const sFirst = transformParameterListToString(aParameters);
+                const sOther = transformParameterListToString(aOthers);
+                return sFirst === sOther;
+            }
+
+            return false;
+        }
+
+        /**
+         * Check if the same target
+         * @param {object} oTarget Target
+         * @param {object} oOther Other target
+         * @returns {boolean} whether the target is the same
+         * @deprecated since 1.120
+         */
+        function isSameTarget (oTarget, oOther) {
+            if (oTarget && oOther) {
+                if (oTarget.url) {
+                    // url bookmark tile
+                    return oTarget.url === oOther.url;
+                }
+
+                return oTarget.semanticObject === oOther.semanticObject
+                    && oTarget.action === oOther.action
+                    && isSameParameters(oTarget.parameters, oOther.parameters)
+                    && oTarget.appSpecificRoute === oOther.appSpecificRoute;
+            }
+
+            return oTarget === oOther;
+        }
+
         /**
          * Counts <b>all</b> bookmarks pointing to the given URL from all of the user's groups.
          * The count is performed by visiting each matching bookmark and executing the optional
@@ -1636,6 +1817,8 @@ sap.ui.define([
          *   the respective tile as argument.
          * @param {string} [sVizType]
          *  (added with 1.83) The visualization type (viz type) which was used to create the bookmark using {@link #addCustomBookmark}.
+         * @param {string} [sContentProviderId]
+         *  the content provider id.
          *
          * @returns {object}
          *   A <code>jQuery.Deferred</code> object's promise which informs about success or failure
@@ -1649,8 +1832,8 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this._visitBookmarks = function (sUrl, fnVisitor, sVizType, sContentProviderId) {
-            var oReferenceTarget;
-            var oIntent = urlParsing.parseShellHash(sUrl);
+            let oReferenceTarget;
+            const oIntent = urlParsing.parseShellHash(sUrl);
 
             if (oIntent) {
                 // oUrlParser.parseShellHash was successful
@@ -1660,16 +1843,16 @@ sap.ui.define([
                 oReferenceTarget = createNewTargetFromUrl(sUrl);
             }
 
-            return this.oCDMService.getSite().then(function (oSite) {
-                var oGroups = oSite.groups;
+            return this.oCDMService.getSite().then((oSite) => {
+                const oGroups = oSite.groups;
 
-                var aTiles = Object.keys(oGroups)
-                    .filter(function (sKey) {
+                const aTiles = Object.keys(oGroups)
+                    .filter((sKey) => {
                         // Always ignore locked groups.
                         return !oGroups[sKey].payload.locked;
                     })
-                    .map(function (sKey) {
-                        return oGroups[sKey].payload.tiles.filter(function (oTile) {
+                    .map((sKey) => {
+                        return oGroups[sKey].payload.tiles.filter((oTile) => {
                             // Consider only matching bookmark tiles. VizType is only set for custom bookmark tiles.
                             return oTile.isBookmark
                                 && oTile.vizType === sVizType
@@ -1677,7 +1860,7 @@ sap.ui.define([
                                 && isSameTarget(oReferenceTarget, oTile.target);
                         });
                     })
-                    .reduce(function (aAllTiles, aCurrentGroupTiles) {
+                    .reduce((aAllTiles, aCurrentGroupTiles) => {
                         Array.prototype.push.apply(aAllTiles, aCurrentGroupTiles);
                         return aAllTiles;
                     }, []);
@@ -1686,12 +1869,31 @@ sap.ui.define([
                     return aTiles.length;
                 }
 
-                return jQuery.when(aTiles.map(fnVisitor)).then(function () {
+                return jQuery.when(aTiles.map(fnVisitor)).then(() => {
                     return aTiles.length;
                 });
             });
         };
 
+        /**
+         * Compose a new bookmark tile in home mode
+         * @param {object} oParameters Parameters
+         * @param {object} oTarget Target
+         * @param {string} sContentProviderId Content provider ID
+         * @returns {object} bookmark tile object.
+         * @deprecated since 1.120
+         */
+        function composeNewBookmarkTile (oParameters, oTarget, sContentProviderId) {
+            const oTile = composeNewTile(oParameters, oTarget);
+
+            oTile.isBookmark = true;
+            if (sContentProviderId) {
+                oTile.contentProvider = sContentProviderId;
+            }
+
+            return oTile;
+        }
+
         /**
          * Adds a bookmark to the user's home page.
          * Given a specific group the bookmark is added to the group,
@@ -1770,17 +1972,17 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.addBookmark = function (oParameters, oGroup, sContentProviderId) {
-            var that = this;
+            const that = this;
 
-            return new jQuery.Deferred(function (oDeferred) {
-                var oCdmSiteService = that.oCDMService;
+            return new jQuery.Deferred((oDeferred) => {
+                const oCdmSiteService = that.oCDMService;
 
                 jQuery.when(oGroup || that.getDefaultGroup(), oCdmSiteService.getSite())
-                    .done(function (oGroup, oSite) {
-                        var oTarget;
-                        var oIntent = urlParsing.parseShellHash(oParameters.url);
-                        var oResolveTilePromise;
-                        var bIsUrlBookmarkTile = false;
+                    .done((oGroup, oSite) => {
+                        let oTarget;
+                        const oIntent = urlParsing.parseShellHash(oParameters.url);
+                        let oResolveTilePromise;
+                        let bIsUrlBookmarkTile = false;
 
                         if (!oIntent) {
                             oTarget = createNewTargetFromUrl(oParameters.url);
@@ -1789,7 +1991,7 @@ sap.ui.define([
                             oTarget = createNewTargetFromIntent(oIntent);
                         }
 
-                        var oTile = composeNewBookmarkTile(
+                        const oTile = composeNewBookmarkTile(
                             oParameters,
                             oTarget,
                             sContentProviderId
@@ -1804,27 +2006,27 @@ sap.ui.define([
                         }
 
                         oResolveTilePromise
-                            .done(function (oNewResolvedTile) {
+                            .done((oNewResolvedTile) => {
                                 oNewResolvedTile.isLink = false; // currently only bookmark tiles can be created
                                 that._mResolvedTiles[oTile.id] = oNewResolvedTile;
 
                                 // add tile to the side and save
                                 oSite.groups[oGroup.identification.id].payload.tiles.push(oTile);
                                 oCdmSiteService.save()
-                                    .done(function () {
+                                    .done(() => {
                                         oDeferred.resolve(oTile);
                                     })
-                                    .fail(function (sReason) {
+                                    .fail((sReason) => {
                                         oDeferred.reject(sReason);
                                     });
                             })
-                            .fail(function (sErrorMsg) {
+                            .fail((sErrorMsg) => {
                                 // Note: do not add error message to that._mFailedResolvedTiles[oTile.id]
                                 // as the tile was not created which makes the cache useless
-                                oDeferred.reject("Bookmark creation failed because: " + sErrorMsg);
+                                oDeferred.reject(`Bookmark creation failed because: ${sErrorMsg}`);
                             });
                     })
-                    .fail(function (sReason) {
+                    .fail((sReason) => {
                         oDeferred.reject(sReason);
                     });
             }).promise();
@@ -1868,24 +2070,24 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.addCustomBookmark = function (oBookmarkConfig, oTargetGroup, sContentProviderId) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             Promise.all([
                 Container.getServiceAsync("URLParsing"),
                 Container.getServiceAsync("CommonDataModel")
-            ]).then(function (aResults) {
-                var oUrlParsing = aResults[0];
-                var oCdmSiteService = aResults[1];
+            ]).then((aResults) => {
+                const oUrlParsing = aResults[0];
+                const oCdmSiteService = aResults[1];
 
                 jQuery.when(oTargetGroup || this.getDefaultGroup(), oCdmSiteService.getSite())
-                    .done(function (oGroup, oSite) {
-                        var oIntent = oUrlParsing.parseShellHash(oBookmarkConfig.url);
-                        var bIsUrlBookmarkTile = (oIntent === undefined);
+                    .done((oGroup, oSite) => {
+                        const oIntent = oUrlParsing.parseShellHash(oBookmarkConfig.url);
+                        const bIsUrlBookmarkTile = (oIntent === undefined);
 
-                        var oTarget = bIsUrlBookmarkTile ? createNewTargetFromUrl(oBookmarkConfig.url) : createNewTargetFromIntent(oIntent);
+                        const oTarget = bIsUrlBookmarkTile ? createNewTargetFromUrl(oBookmarkConfig.url) : createNewTargetFromIntent(oIntent);
 
                         // building a grouptile but with vizConfig like a visualization
-                        var oTile = {
+                        const oTile = {
                             id: oUshellUtils.generateUniqueId([]),
                             vizType: oBookmarkConfig.vizType,
                             title: oBookmarkConfig.title,
@@ -1907,26 +2109,26 @@ sap.ui.define([
                         }
 
                         this._resolveTileByVizId(oTile, oSite)
-                            .done(function (oNewResolvedTile) {
+                            .done((oNewResolvedTile) => {
                                 oNewResolvedTile.isLink = false; // currently only bookmark tiles can be created
                                 this._mResolvedTiles[oTile.id] = oNewResolvedTile;
 
                                 // add tile to the site and save
                                 oSite.groups[oGroup.identification.id].payload.tiles.push(oTile);
                                 oCdmSiteService.save()
-                                    .done(function () {
+                                    .done(() => {
                                         oDeferred.resolve(oTile);
                                     })
                                     .fail(oDeferred.reject);
-                            }.bind(this))
-                            .fail(function (sErrorMsg) {
+                            })
+                            .fail((sErrorMsg) => {
                                 // Note: do not add error message to that._mFailedResolvedTiles[oTile.id]
                                 // as the tile was not created which makes the cache useless
-                                oDeferred.reject("Bookmark creation failed because: " + sErrorMsg);
+                                oDeferred.reject(`Bookmark creation failed because: ${sErrorMsg}`);
                             });
-                    }.bind(this))
+                    })
                     .fail(oDeferred.reject);
-            }.bind(this));
+            });
 
             return oDeferred.promise();
         };
@@ -1940,6 +2142,8 @@ sap.ui.define([
          *
          * @param {string} sUrl
          *   The URL of the bookmarks to be counted, exactly as specified to {@link #addBookmark}.
+         * @param {string} [sContentProviderId]
+         *   the content provider id.
          * @returns {object}
          *   A <code>jQuery.Deferred</code> object's promise which informs about success or failure
          *   of this asynchronous operation. In case of success, the count of existing bookmarks
@@ -1975,9 +2179,9 @@ sap.ui.define([
                 return Promise.reject("countCustomBookmarks: Required parameter is missing: oIdentifier.vizType");
             }
 
-            return new Promise(function (resolve, reject) {
+            return new Promise((resolve, reject) => {
                 this._visitBookmarks(oIdentifier.url, undefined, oIdentifier.vizType, oIdentifier.contentProviderId).done(resolve).fail(reject);
-            }.bind(this));
+            });
         };
 
         /**
@@ -2004,7 +2208,8 @@ sap.ui.define([
          *
          * @param {string} [sVizType]
          *   (added with 1.83) The visualization type (viz type) which was used to create the bookmark using {@link #addCustomBookmark}.
-         *
+         * @param {string} [sContentProviderId]
+         *   the content provider id.
          * @returns {object}
          *   A <code>jQuery.Deferred</code> object's promise which informs about success or failure
          *   of this asynchronous operation.  In case of success, the number of updated bookmarks
@@ -2018,19 +2223,19 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.updateBookmarks = function (sUrl, oParameters, sVizType, sContentProviderId) {
-            var oCdmSiteService = this.oCDMService;
+            const oCdmSiteService = this.oCDMService;
 
-            var mResolvedTiles = this._mResolvedTiles;
+            const mResolvedTiles = this._mResolvedTiles;
 
             // Visitor function that updates each encountered bookmark tile as necessary.
             function updateEach (oTile) {
-                return new jQuery.Deferred(function (oDeferred) {
-                    var oNewTarget;
-                    var bTileViewPropertiesChanged = false;
-                    var oChangedTileViewProperties = {};
+                return new jQuery.Deferred((oDeferred) => {
+                    let oNewTarget;
+                    let bTileViewPropertiesChanged = false;
+                    const oChangedTileViewProperties = {};
 
                     if (oParameters.url || oParameters.url === "") {
-                        var oIntent = urlParsing.parseShellHash(oParameters.url);
+                        const oIntent = urlParsing.parseShellHash(oParameters.url);
                         if (!oIntent) {
                             // url bookmark tile
                             oNewTarget = createNewTargetFromUrl(oParameters.url);
@@ -2071,8 +2276,8 @@ sap.ui.define([
                     updateTileComposition(oTile, oParameters, oNewTarget);
 
                     if (bTileViewPropertiesChanged && mResolvedTiles[oTile.id]) {
-                        var oTileComponent = mResolvedTiles[oTile.id].tileComponent;
-                        //tileComponent is defined in the getTileView method. In case of the direct start, tileComponent is not defined
+                        const oTileComponent = mResolvedTiles[oTile.id].tileComponent;
+                        // tileComponent is defined in the getTileView method. In case of the direct start, tileComponent is not defined
                         if (oTileComponent) {
                             oTileComponent.tileSetVisualProperties(oChangedTileViewProperties);
                         }
@@ -2085,8 +2290,8 @@ sap.ui.define([
             // When save is successful, return count of updated bookmarks,
             // otherwise the rejected promise due to the failed save operation is returned.
             return this._visitBookmarks(sUrl, updateEach, sVizType, sContentProviderId)
-                .then(function (iUpdatedCount) {
-                    return oCdmSiteService.save().then(function () {
+                .then((iUpdatedCount) => {
+                    return oCdmSiteService.save().then(() => {
                         return iUpdatedCount;
                     });
                 });
@@ -2142,9 +2347,9 @@ sap.ui.define([
                 return Promise.reject("updateCustomBookmarks: The bookmark url cannot be an empty string");
             }
 
-            return new Promise(function (resolve, reject) {
+            return new Promise((resolve, reject) => {
                 this.updateBookmarks(oIdentifier.url, oBookmarkConfig, oIdentifier.vizType, oIdentifier.contentProviderId).done(resolve).fail(reject);
-            }.bind(this));
+            });
         };
 
         /**
@@ -2154,6 +2359,8 @@ sap.ui.define([
          *   The URL of the bookmarks to be deleted, exactly as specified to {@link #addBookmark}.
          * @param {string} [sVizType]
          *   (added with 1.83) The visualization type (viz type) which was used to create the bookmark using {@link #addCustomBookmark}.
+         * @param {string} [sContentProviderId]
+         *   the content provider id.
          *
          * @returns {object}
          *   A <code>jQuery.Deferred</code> object's promise which informs about success or failure
@@ -2166,9 +2373,9 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this.deleteBookmarks = function (sUrl, sVizType, sContentProviderId) {
-            var oCDMService = this.oCDMService;
-            var oIntent = urlParsing.parseShellHash(sUrl);
-            var oReferenceTarget;
+            const oCDMService = this.oCDMService;
+            const oIntent = urlParsing.parseShellHash(sUrl);
+            let oReferenceTarget;
 
             if (oIntent) {
                 // oUrlParser.parseShellHash was successful
@@ -2178,15 +2385,15 @@ sap.ui.define([
                 oReferenceTarget = createNewTargetFromUrl(sUrl);
             }
 
-            return oCDMService.getSite().then(function (oSite) {
-                var oGroups = oSite.groups;
+            return oCDMService.getSite().then((oSite) => {
+                const oGroups = oSite.groups;
 
-                var iDeletedTiles = Object.keys(oGroups)
-                    .map(function (sKey) {
-                        var oPayload = oGroups[sKey].payload;
-                        var iCountGroupTilesToDelete = 0;
+                const iDeletedTiles = Object.keys(oGroups)
+                    .map((sKey) => {
+                        const oPayload = oGroups[sKey].payload;
+                        let iCountGroupTilesToDelete = 0;
 
-                        oPayload.tiles = oPayload.tiles.filter(function (oTile) {
+                        oPayload.tiles = oPayload.tiles.filter((oTile) => {
                             if (oTile.isBookmark
                                 && oTile.vizType === sVizType // vizType is only set for custom bookmark tiles.
                                 && (oTile.contentProvider || "") === (sContentProviderId || "")
@@ -2200,13 +2407,13 @@ sap.ui.define([
 
                         return iCountGroupTilesToDelete;
                     })
-                    .reduce(function (aggregateSum, groupSum) {
+                    .reduce((aggregateSum, groupSum) => {
                         aggregateSum += groupSum;
 
                         return aggregateSum;
                     }, 0);
 
-                return oCDMService.save().then(function () {
+                return oCDMService.save().then(() => {
                     return iDeletedTiles;
                 });
             });
@@ -2236,9 +2443,9 @@ sap.ui.define([
                 return Promise.reject("deleteCustomBookmarks: Required parameter is missing: oIdentifier.vizType");
             }
 
-            return new Promise(function (resolve, reject) {
+            return new Promise((resolve, reject) => {
                 this.deleteBookmarks(oIdentifier.url, oIdentifier.vizType, oIdentifier.contentProviderId).done(resolve).fail(reject);
-            }.bind(this));
+            });
         };
 
         /**
@@ -2277,18 +2484,18 @@ sap.ui.define([
          * @private
          */
         this._onTileSettingsSave = function (oTile, oSettingsView) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             if (!oTile || !oTile.id || !oSettingsView) {
                 return oDeferred.reject().promise();
             }
 
-            var sNewTitle = oSettingsView.oTitleInput.getValue();
-            var sNewSubtitle = oSettingsView.oSubTitleInput.getValue();
-            var sNewInfo = oSettingsView.oInfoInput.getValue();
-            var sOldTitle = this.getTileTitle(oTile);
-            var sOldInfo = this.getTileInfo(oTile);
-            var sOldSubtitle = this.getTileSubtitle(oTile);
+            const sNewTitle = oSettingsView.oTitleInput.getValue();
+            const sNewSubtitle = oSettingsView.oSubTitleInput.getValue();
+            const sNewInfo = oSettingsView.oInfoInput.getValue();
+            const sOldTitle = this.getTileTitle(oTile);
+            const sOldInfo = this.getTileInfo(oTile);
+            const sOldSubtitle = this.getTileSubtitle(oTile);
 
             // Check whether the end user changed the title or subtitle.
             // If nothing changed, return.
@@ -2299,7 +2506,7 @@ sap.ui.define([
                 return oDeferred.resolve().promise();
             }
 
-            var oUpdatedVisualTileProperties = {};
+            const oUpdatedVisualTileProperties = {};
             if (sOldTitle !== sNewTitle) {
                 oUpdatedVisualTileProperties.title = sNewTitle;
                 // Add new properties also to tile for next startup
@@ -2334,20 +2541,20 @@ sap.ui.define([
                     this._mResolvedTiles[oTile.id].linkTileControl.setSubheader(oUpdatedVisualTileProperties.subtitle);
                 }
                 if ((oUpdatedVisualTileProperties.title) || (oUpdatedVisualTileProperties.subtitle)) {
-                    //rerender the link to see the changes immediately
+                    // rerender the link to see the changes immediately
                     this._mResolvedTiles[oTile.id].linkTileControl.invalidate();
                 }
             }
 
             // Persist personalization changes
             Container.getServiceAsync("CommonDataModel")
-                .then(function (oCdmService) {
+                .then((oCdmService) => {
                     oCdmService.save()
-                        .fail(function (sErrorMsg0) {
+                        .fail((sErrorMsg0) => {
                             Log.error(sErrorMsg0);
-                            oDeferred.reject("Could not save personalization changes: " + sErrorMsg0);
+                            oDeferred.reject(`Could not save personalization changes: ${sErrorMsg0}`);
                         })
-                        .done(function () {
+                        .done(() => {
                             oDeferred.resolve();
                         });
                 });
@@ -2365,11 +2572,11 @@ sap.ui.define([
          *
          */
         this.getTileActions = function (oTile) {
-            var aTileActions = [];
+            const aTileActions = [];
 
             if (this._isGroupTile(oTile) && !this._isFailedGroupTile(oTile)) {
                 // Create necessary model for dialog to pass actual properties
-                var oModel = new JSONModel({
+                const oModel = new JSONModel({
                     config: {
                         display_title_text: this.getTileTitle(oTile),
                         display_subtitle_text: this.getTileSubtitle(oTile),
@@ -2378,226 +2585,20 @@ sap.ui.define([
                 });
 
                 // Get tile settings action
-                var oTileSettingsAction = oUtils.getTileSettingsAction(oModel, this._onTileSettingsSave.bind(this, oTile), this.getTileType(oTile));
+                const oTileSettingsAction = oUtils.getTileSettingsAction(oModel, this._onTileSettingsSave.bind(this, oTile), this.getTileType(oTile));
                 aTileActions.push(oTileSettingsAction);
             }
             return aTileActions;
         };
 
-        /**
-         * Compose a new bookmark tile in home mode
-         * @param {object} oParameters Parameters
-         * @param {object} oTarget Target
-         * @param {string} sContentProviderId Content provider ID
-         * @returns {object}
-         * @deprecated since 1.120
-         */
-        function composeNewBookmarkTile (oParameters, oTarget, sContentProviderId) {
-            var oTile = composeNewTile(oParameters, oTarget);
-
-            oTile.isBookmark = true;
-            if (sContentProviderId) {
-                oTile.contentProvider = sContentProviderId;
-            }
-
-            return oTile;
-        }
-
-        /**
-         * Compose a new tile
-         * @param {object} oParameters Parameters
-         * @param {object} oTarget Target
-         * @returns {object} Tile
-         * @deprecated since 1.120
-         */
-        function composeNewTile (oParameters, oTarget) {
-            // TODO Collect all tile ids to pass them as an arry to
-            // generateUniqueId
-            var oTile = {
-                id: oUshellUtils.generateUniqueId([])
-            };
-
-            updateTileComposition(oTile, oParameters, oTarget);
-
-            return oTile;
-        }
-
-        /**
-         * Updates the properties of a bookmark tile during its composition.
-         * @param {object} oTile JSON Object that holds the properties of a bookmark tile.
-         * @param {object} oParameters Properties to merge into the bookmark tile
-         * @param {object} oTarget The navigation target as a JSON object.
-         *
-         * @deprecated since 1.120
-         */
-        function updateTileComposition (oTile, oParameters, oTarget) {
-            // Avoid modifying callers reference.
-            oParameters = deepExtend({}, oParameters);
-
-            if (oTarget) {
-                oTile.target = oTarget;
-            }
-
-            if (oParameters.title || oParameters.title === "") {
-                oTile.title = oParameters.title;
-            }
-
-            if (oParameters.icon || oParameters.icon === "") {
-                oTile.icon = oParameters.icon;
-            }
-
-            if (oParameters.subtitle || oParameters.subtitle === "") {
-                oTile.subTitle = oParameters.subtitle;
-            }
-
-            if (oParameters.info || oParameters.info === "") {
-                oTile.info = oParameters.info;
-            }
-
-            if (oParameters.numberUnit || oParameters.numberUnit === "") {
-                oTile.numberUnit = oParameters.numberUnit;
-            }
-
-            if (oParameters.dataSource) {
-                oTile.dataSource = {
-                    type: oParameters.dataSource.type,
-                    settings: {
-                        odataVersion: ObjectPath.get(["dataSource", "settings", "odataVersion"], oParameters)
-                    }
-                };
-            }
-
-            if (oParameters.serviceUrl) {
-                oTile.indicatorDataSource = {
-                    path: oParameters.serviceUrl
-                };
-            }
-
-            if (oTile.indicatorDataSource && (oParameters.serviceRefreshInterval || oParameters.serviceRefreshInterval === 0)) {
-                oTile.indicatorDataSource.refresh = oParameters.serviceRefreshInterval;
-            }
-
-            if (oParameters.vizConfig) {
-                oTile.vizConfig = oParameters.vizConfig;
-            }
-        }
-
-        /**
-         * Check if the same target
-         * @param {object} oTarget Target
-         * @param {object} oOther Other target
-         * @returns {boolean}
-         * @deprecated since 1.120
-         */
-        function isSameTarget (oTarget, oOther) {
-            if (oTarget && oOther) {
-                if (oTarget.url) {
-                    // url bookmark tile
-                    return oTarget.url === oOther.url;
-                }
-
-                return oTarget.semanticObject === oOther.semanticObject
-                    && oTarget.action === oOther.action
-                    && isSameParameters(oTarget.parameters, oOther.parameters)
-                    && oTarget.appSpecificRoute === oOther.appSpecificRoute;
-            }
-
-            return oTarget === oOther;
-        }
-
-        /**
-         * Compare parameters
-         * @param {Array} aParameters Array of parameters
-         * @param {Array} aOthers Array of parameters
-         * @returns {boolean}
-         * @deprecated since 1.120
-         */
-        function isSameParameters (aParameters, aOthers) {
-            aParameters = aParameters || [];
-            aOthers = aOthers || [];
-
-            if (aParameters.length === aOthers.length) {
-                var sFirst = transformParameterListToString(aParameters);
-                var sOther = transformParameterListToString(aOthers);
-                return sFirst === sOther;
-            }
-
-            return false;
-        }
-
-        /**
-         * Convert parameters to a string
-         * @param {Array} aList List of parameters
-         * @returns {string}
-         * @deprecated since 1.120
-         */
-        function transformParameterListToString (aList) {
-            return aList
-                .map(function (oParameter) {
-                    return oParameter.name + oParameter.value;
-                })
-                .sort()
-                .join();
-        }
-
-        /**
-         * Create a new target
-         * @param {string} sUrl Url
-         * @returns {string}
-         * @deprecated since 1.120
-         */
-        function createNewTargetFromUrl (sUrl) {
-            return { url: sUrl };
-        }
-
-        /**
-         * Create a new target
-         * @param {object} oIntent Intent
-         * @returns {object} Target
-         * @deprecated since 1.120
-         */
-        function createNewTargetFromIntent (oIntent) {
-            var oTarget = {
-                semanticObject: oIntent.semanticObject,
-                action: oIntent.action,
-                parameters: createTileParametersFromIntentParams(oIntent.params)
-            };
-
-            if (oIntent.appSpecificRoute) {
-                // do not loose the inner-app hash (e.g. &/ShoppingCart(12345))
-                // BCP 1670533333
-                oTarget.appSpecificRoute = oIntent.appSpecificRoute;
-            }
-
-            return oTarget;
-        }
-
-        /**
-         * Create tile parameters
-         * @param {object} oIntentParams Intent parameters
-         * @returns {object} Tile parameters
-         * @deprecated since 1.120
-         */
-        function createTileParametersFromIntentParams (oIntentParams) {
-            return Object.keys(oIntentParams).map(function (sKey) {
-                var sValue = oIntentParams[sKey] && oIntentParams[sKey][0];
-
-                return {
-                    name: sKey,
-                    // sValue maybe undefined.
-                    value: sValue || ""
-                };
-            });
-        }
-
         /**
          * Get site data (used in home page mode only)
-         * @returns {Promise}
+         * @returns {Promise} the site data inside a promise.
          * @deprecated since 1.120
          */
         this._getSiteData = function () {
-            var oPromise = new Promise(function (fnResolve, fnReject) {
-                Container.getServiceAsync("CommonDataModel").then(function (oCDMService) {
+            const oPromise = new Promise((fnResolve, fnReject) => {
+                Container.getServiceAsync("CommonDataModel").then((oCDMService) => {
                     oCDMService.getSite()
                         .done(fnResolve)
                         .fail(fnReject);
@@ -2615,7 +2616,7 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         this._addDefaultGroup = function (aGroups, oSite) {
-            var oDefaultGroup = oReadHomePageUtils.getDefaultGroup(aGroups);
+            let oDefaultGroup = oReadHomePageUtils.getDefaultGroup(aGroups);
 
             if (!oDefaultGroup) {
                 // the default group is not added by an admin but must be automatically
@@ -2628,7 +2629,7 @@ sap.ui.define([
                 // the FLP, oCdmSiteService.save() is skipped. This means the default
                 // group is added on EVERY start-up until save() is called in a different use case
                 // e.g. a tile was added.
-                oSite = oModifyHomePageUtils.addGroupToSite(oSite, oDefaultGroup, /*index*/ 0);
+                oSite = oModifyHomePageUtils.addGroupToSite(oSite, oDefaultGroup, /* index */ 0);
 
                 // get groups again as the default group was just added
                 aGroups = oReadHomePageUtils.getGroupsArrayFromSite(oSite);