@sapui5/sap.ushell 1.136.3 → 1.138.1

package/src/main/js/sap/ushell/adapters/cdm/LaunchPageAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's LaunchPageAdapter for the
  *               'CDM' platform - Version 2 (V2)
  * @deprecated since 1.100
- * @version 1.136.3
+ * @version 1.138.1
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/_LaunchPage/readHome",
@@ -34,7 +34,7 @@ sap.ui.define([
     "sap/ushell/UI5ComponentType",
     "sap/ushell/EventHub",
     "sap/ushell/Container"
-], function (
+], (
     oReadHomePageUtils,
     oModifyHomePageUtils, // TODO should be loaded lazy only when really needed
     oReadCatalogUtils,
@@ -62,16 +62,16 @@ sap.ui.define([
     UI5ComponentType,
     EventHub,
     Container
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.GenericTileMode
-    var oGenericTileMode = oMobileLibrary.GenericTileMode;
+    const oGenericTileMode = oMobileLibrary.GenericTileMode;
 
     /* global hasher */
 
-    var oLogger = Log.getLogger("sap/ushell/adapters/cdm/LaunchPageAdapter"),
-        oLogLevel = Log.Level;
+    const oLogger = Log.getLogger("sap/ushell/adapters/cdm/LaunchPageAdapter");
+    const oLogLevel = Log.Level;
 
     /**
      * This method MUST be called by the Unified Shell's container only.
@@ -90,9 +90,9 @@ sap.ui.define([
      * @deprecated since 1.100
      */
     function LaunchPageAdapter (oUnused, sParameter, oAdapterConfiguration) {
-        var _oDefaultGroup,
-            sStaticTileComponent = "sap.ushell.components.tiles.cdm.applauncher",
-            sDynamicTileComponent = "sap.ushell.components.tiles.cdm.applauncherdynamic";
+        let _oDefaultGroup;
+        const sStaticTileComponent = "sap.ushell.components.tiles.cdm.applauncher";
+        const sDynamicTileComponent = "sap.ushell.components.tiles.cdm.applauncherdynamic";
 
         this._mResolvedTiles = {};
         this._mCatalogTilePromises = {};
@@ -102,12 +102,12 @@ sap.ui.define([
         Promise.all([
             Container.getServiceAsync("URLParsing"),
             Container.getServiceAsync("CommonDataModel")
-        ]).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));
+        });
 
-        //TODO: Rectify Log.error calls and pass correct parameters
+        // TODO: Rectify Log.error calls and pass correct parameters
         // https://ui5.sap.com/#/api/module:sap/base/Log%23methods/sap/base/Log.error
 
         /**
@@ -135,7 +135,7 @@ sap.ui.define([
          */
         this.isSiteSupported = function (oSite) {
             // Check if site has the expected CDM version
-            if (!!oSite._version
+            if (oSite._version
                 && Version(oSite._version).compareTo(this.getCdmVersionsSupported().max) > 0) {
                 Log.fatal("Invalid CDM site version: Only sites up to version 2.0.0 are supported");
                 return false;
@@ -159,14 +159,14 @@ sap.ui.define([
          *  of group objects, in case the groups could not be loaded the array is empty.
          */
         this.getGroups = function () {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             this._assureLoaded()
-                .done(function (aGroups) {
+                .done((aGroups) => {
                     oUshellUtils.setPerformanceMark("FLP - homepage groups processed");
                     oDeferred.resolve(aGroups);
                 })
-                .fail(function () {
+                .fail(() => {
                     // resolve with an empty array in case no groups could be loaded
                     oDeferred.resolve([]);
                 });
@@ -196,8 +196,8 @@ sap.ui.define([
          * @private
          */
         this._getTileFromHashInContextOfSite = function (fnResolver, oCatalogTilePromiseCache, sIntent) {
-            var oDeferred = new jQuery.Deferred(),
-                oCatalogTilePromise = oCatalogTilePromiseCache[sIntent];
+            const oDeferred = new jQuery.Deferred();
+            let oCatalogTilePromise = oCatalogTilePromiseCache[sIntent];
 
             if (!oCatalogTilePromise) {
                 // only call resolve if it was not resolved before
@@ -207,15 +207,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();
@@ -235,9 +235,9 @@ sap.ui.define([
          * @private
          */
         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)
@@ -252,7 +252,7 @@ sap.ui.define([
                 this._getTileFromHashInContextOfSite(fnResolveTile, this._mCatalogTilePromises, sIntent)
                     .done(oDeferred.resolve)
                     .fail(oDeferred.reject);
-            }.bind(this));
+            });
 
             return oDeferred.promise();
         };
@@ -267,9 +267,9 @@ sap.ui.define([
          * @private
          */
         this._getTileForUrl = function (oTile) {
-            var sTileComponentLoadInfo = oTile.indicatorDataSource ? "#Shell-dynamicTile" : "#Shell-staticTile";
+            const sTileComponentLoadInfo = oTile.indicatorDataSource ? "#Shell-dynamicTile" : "#Shell-staticTile";
             return {
-                tileIntent: "#", //TODO this is not a good intent for arbitrary URL tiles, is it?
+                tileIntent: "#", // TODO this is not a good intent for arbitrary URL tiles, is it?
                 tileResolutionResult: {
                     tileComponentLoadInfo: sTileComponentLoadInfo,
                     isCustomTile: false
@@ -290,9 +290,9 @@ sap.ui.define([
          * @private
          */
         this._assureGroupItemsResolved = function (oGroup, oSite) {
-            var aPromises = [],
-                aResolvedTilesPromises,
-                aResolvedLinksPromises;
+            const aPromises = [];
+            let aResolvedTilesPromises;
+            let aResolvedLinksPromises;
 
             // Tiles
             if (oGroup.payload && oGroup.payload.tiles) {
@@ -326,7 +326,7 @@ sap.ui.define([
         this._assureGroupTilesResolved = function (aGroupTiles, oSite) {
             return (aGroupTiles || []).map(function (oTile, iIndex) {
                 return this._resolveGroupTile(oTile, oSite)
-                    .then(function (oResolvedTileOutcome) {
+                    .then((oResolvedTileOutcome) => {
                         oResolvedTileOutcome.isLink = false;
 
                         return oResolvedTileOutcome;
@@ -349,7 +349,7 @@ sap.ui.define([
         this._assureGroupLinksResolved = function (aGroupLinks, oSite) {
             return (aGroupLinks || []).map(function (oLink) {
                 return this._resolveGroupTile(oLink, oSite)
-                    .then(function (oResolvedLinkOutcome) {
+                    .then((oResolvedLinkOutcome) => {
                         oResolvedLinkOutcome.isLink = true;
 
                         return oResolvedLinkOutcome;
@@ -379,9 +379,9 @@ sap.ui.define([
          *  to the fail handler which will be called in this case.
          */
         this._resolveGroupTile = function (oTile, oSite) {
-            var mSuccessCache = this._mResolvedTiles;
-            var mFailureCache = this._mFailedResolvedTiles;
-            var oResultPromise;
+            const mSuccessCache = this._mResolvedTiles;
+            const mFailureCache = this._mFailedResolvedTiles;
+            let oResultPromise;
 
             function updateCaches (oResolvedTile) {
                 mSuccessCache[oTile.id] = oResolvedTile;
@@ -394,7 +394,7 @@ sap.ui.define([
             }
 
             function isUrlLauncherTile (oTile) {
-                var oTarget = oTile.target;
+                const oTarget = oTile.target;
 
                 return oTarget
                     && oTarget.semanticObject === "Shell"
@@ -423,9 +423,9 @@ sap.ui.define([
                 oResultPromise = this._resolveTileByAppId(oTile, oSite);
             }
 
-            oResultPromise.done(function (oResolvedTile) {
+            oResultPromise.done((oResolvedTile) => {
                 updateCaches(oResolvedTile);
-            }).fail(function (vFailureInfo) {
+            }).fail((vFailureInfo) => {
                 mFailureCache[oTile.id] = vFailureInfo;
             });
 
@@ -446,12 +446,6 @@ sap.ui.define([
          *  to the fail handler which will be called in this case.
          */
         this._resolveTileByAppId = function (oTile, oSite) {
-            var sAppId,
-                oAppDescriptor,
-                oInboundResult,
-                oApp,
-                sHash;
-
             function reject (iLogLevel, sMessage) {
                 return new jQuery.Deferred()
                     .reject({
@@ -468,35 +462,41 @@ sap.ui.define([
                 return reject(oLogLevel.ERROR, "Cannot resolve tile: oSite must be an object");
             }
 
-            sAppId = oTile.appId || oTile.appIDHint;
+            const sAppId = oTile.appId || oTile.appIDHint;
             if (!sAppId) {
                 return reject(oLogLevel.ERROR,
                     ["Cannot resolve tile '", oTile.id, "': either appId or appIDHint must be specified"].join(""));
             }
 
-            oAppDescriptor = oSite.applications && oSite.applications[sAppId];
+            const oAppDescriptor = oSite.applications && oSite.applications[sAppId];
             if (!oAppDescriptor) {
                 return reject(oLogLevel.INFO,
-                    ["Tile '", oTile.id, "' filtered from result: no app found for appId '",
-                        sAppId, "' (dangling app reference)"].join(""));
+                    ["Tile '",
+                        oTile.id,
+                        "' filtered from result: no app found for appId '",
+                        sAppId,
+                        "' (dangling app reference)"].join(""));
             }
 
             // TODO: CDM2.0 - check if custom tile first (should not need an inbound)
             // for referenced apps, this is an error
-            oInboundResult = this._getFirstInbound(oAppDescriptor);
+            const oInboundResult = this._getFirstInbound(oAppDescriptor);
             if (!oInboundResult) {
                 return reject(oLogLevel.ERROR,
-                    ["Cannot resolve tile '", oTile.id, "': app '",
-                        sAppId, "' has no navigation inbound"].join(""));
+                    ["Cannot resolve tile '",
+                        oTile.id,
+                        "': app '",
+                        sAppId,
+                        "' has no navigation inbound"].join(""));
             }
 
-            var oMapped = oUtilsCdm.mapOne(oInboundResult.key, oInboundResult.inbound, oAppDescriptor),
-                sApplicationType = oMapped.resolutionResult.applicationType,
-                sAdditionalInformation = oMapped.resolutionResult.additionalInformation,
-                oEnableInPlaceForClassicUIsConfig = Config.last("/core/navigation/enableInPlaceForClassicUIs"),
-                bIsApplicationTypeConfiguredInPlace = oEnableInPlaceForClassicUIsConfig ? oEnableInPlaceForClassicUIsConfig[sApplicationType] : false;
+            const oMapped = oUtilsCdm.mapOne(oInboundResult.key, oInboundResult.inbound, oAppDescriptor);
+            const sApplicationType = oMapped.resolutionResult.applicationType;
+            const sAdditionalInformation = oMapped.resolutionResult.additionalInformation;
+            const oEnableInPlaceForClassicUIsConfig = Config.last("/core/navigation/enableInPlaceForClassicUIs");
+            const bIsApplicationTypeConfiguredInPlace = oEnableInPlaceForClassicUIsConfig ? oEnableInPlaceForClassicUIsConfig[sApplicationType] : false;
 
-            oApp = oMapped.tileResolutionResult;
+            const oApp = oMapped.tileResolutionResult;
             oApp.navigationMode = navigationMode.computeNavigationModeForHomepageTiles(sApplicationType, sAdditionalInformation, bIsApplicationTypeConfiguredInPlace);
             oApp.isLink = false; // TODO remove as it should go one level up
 
@@ -505,7 +505,7 @@ sap.ui.define([
                     ["Tile '", oTile.id, "' filtered from result: form factor not supported"].join(""));
             }
 
-            sHash = this._toHashFromInbound(oInboundResult.inbound);
+            const sHash = this._toHashFromInbound(oInboundResult.inbound);
 
             return jQuery.when({
                 tileResolutionResult: oApp,
@@ -523,7 +523,7 @@ sap.ui.define([
          *  true, if the form factor is supported, false otherwise
          */
         this._isFormFactorSupported = function (oAppDescriptor) {
-            var sCurrentFormFactor = oUshellUtils.getFormFactor();
+            const sCurrentFormFactor = oUshellUtils.getFormFactor();
 
             return oReadHomePageUtils.supportsFormFactor(oAppDescriptor, sCurrentFormFactor);
         };
@@ -546,8 +546,8 @@ sap.ui.define([
          */
         this._getFirstInbound = function (oAppDescriptor) {
             // TODO: CDM2.0 robust access
-            var sFirstInboundKey = Object.keys(oAppDescriptor["sap.app"].crossNavigation.inbounds).shift(),
-                oInbound = oAppDescriptor["sap.app"].crossNavigation.inbounds[sFirstInboundKey];
+            const sFirstInboundKey = Object.keys(oAppDescriptor["sap.app"].crossNavigation.inbounds).shift();
+            const oInbound = oAppDescriptor["sap.app"].crossNavigation.inbounds[sFirstInboundKey];
 
             return {
                 key: sFirstInboundKey,
@@ -569,7 +569,7 @@ sap.ui.define([
          *  to the fail handler which will be called in this case.
          */
         this._resolveTileByIntent = function (oTile, oSite) {
-            var sHash = this._prepareTileHash(oTile);
+            const sHash = this._prepareTileHash(oTile);
 
             return this._getTileFromHash(sHash);
         };
@@ -586,9 +586,9 @@ sap.ui.define([
          * @private
          */
         this._prepareTileHash = function (oTile) {
-            var oParams = {},
-                oTarget,
-                aRawParams;
+            const oParams = {};
+            let oTarget;
+            let aRawParams;
 
             if (this._isCatalogTile(oTile)) {
                 return oTile.tileIntent;
@@ -597,7 +597,7 @@ sap.ui.define([
             if (this._isGroupTile(oTile) && oTile.target) {
                 // TODO use hash from _mResolvedTiles if tile has been already resolved
                 aRawParams = oTile.target.parameters || [];
-                aRawParams.forEach(function (oParameter) {
+                aRawParams.forEach((oParameter) => {
                     if (oParameter.name && oParameter.value) {
                         oParams[oParameter.name] = [oParameter.value];
                     }
@@ -612,7 +612,7 @@ sap.ui.define([
                     appSpecificRoute: oTile.target.appSpecificRoute
                 };
 
-                return "#" + urlParsing.constructShellHash(oTarget);
+                return `#${urlParsing.constructShellHash(oTarget)}`;
             }
             return undefined;
         };
@@ -635,14 +635,14 @@ sap.ui.define([
          * @private
          */
         this._allPromisesDone = function (aPromises) {
-            var oDeferred = new jQuery.Deferred(),
-                oDeferredAlways;
+            const oDeferred = new jQuery.Deferred();
+            let oDeferredAlways;
 
             if (aPromises.length === 0) {
                 oDeferred.resolve([]);
             } else {
                 // "replace" aPromises with an array of promises which will always resolve.
-                var aNoneFailingPromises = aPromises.map(function (oPromise) {
+                const aNoneFailingPromises = aPromises.map((oPromise) => {
                     oDeferredAlways = new jQuery.Deferred();
                     oPromise.always(oDeferredAlways.resolve.bind(oDeferredAlways));
                     return oDeferredAlways.promise();
@@ -651,7 +651,7 @@ sap.ui.define([
                 // This is needed because jQuery.when will otherwise abort on the first fail and will
                 // not wait for the remaining promises.
                 jQuery.when.apply(this, aNoneFailingPromises).done(function () {
-                    var aArgs = Array.prototype.slice.call(arguments);
+                    const aArgs = Array.prototype.slice.call(arguments);
                     oDeferred.resolve(aArgs);
                 });
             }
@@ -672,28 +672,27 @@ sap.ui.define([
          * @private
          */
         this._assureLoaded = function () {
-            var that = this,
-                oDeferred;
+            const that = this;
 
             // bundle multiple requests running in parallel
             if (this._assureLoadedDeferred) {
                 return this._assureLoadedDeferred.promise();
             }
 
-            oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
             this._assureLoadedDeferred = oDeferred;
 
-            Container.getServiceAsync("CommonDataModel").then(function (oCDMSiteService) {
+            Container.getServiceAsync("CommonDataModel").then((oCDMSiteService) => {
                 oCDMSiteService.getSite()
-                    .done(function (oSite) {
+                    .done((oSite) => {
                         // Ensure site has expected CDM format
                         if (!that.isSiteSupported(oSite)) {
                             throw new Error("Invalid CDM site version: Check configuration of launchpage adapter and version of FLP site");
                         }
 
-                        var aItemPromises = [];
-                        var aGroups = oReadHomePageUtils.getGroupsArrayFromSite(oSite);
-                        var oDefaultGroup = oReadHomePageUtils.getDefaultGroup(aGroups);
+                        let aItemPromises = [];
+                        let aGroups = oReadHomePageUtils.getGroupsArrayFromSite(oSite);
+                        let oDefaultGroup = oReadHomePageUtils.getDefaultGroup(aGroups);
 
                         if (!oDefaultGroup) {
                             // the default group is not added by an admin but must be automatically
@@ -706,7 +705,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);
@@ -714,7 +713,7 @@ sap.ui.define([
 
                         _oDefaultGroup = oDefaultGroup; // TODO that should be improved
 
-                        aGroups.forEach(function (oGroup) {
+                        aGroups.forEach((oGroup) => {
                             // resolve the tile intents already now, as methods like getGroupTiles
                             // or getTileTitle are synchronously called
                             aItemPromises = that._assureGroupItemsResolved(oGroup, oSite).concat(aItemPromises); // TODO split method as well
@@ -723,7 +722,7 @@ sap.ui.define([
                         // wait for resolving of all items
                         // Note: _allPromisesDone does never reject. Therefore no fail handler is required.
                         that._allPromisesDone(aItemPromises)
-                            .done(function () {
+                            .done(() => {
                                 that._assureLoadedDeferred.resolve(aGroups);
                                 // ensure that following _assureLoaded calls get resolved with a new parameter
                                 // (otherwise it will be resolved with the "cached" groups)
@@ -732,8 +731,8 @@ sap.ui.define([
                                 that._logTileResolutionFailures(that._mFailedResolvedTiles);
                             });
                     })
-                    .fail(function (sErrorMessage0) {
-                        Log.error("Delivering homepage groups failed - " + sErrorMessage0);
+                    .fail((sErrorMessage0) => {
+                        Log.error(`Delivering homepage groups failed - ${sErrorMessage0}`);
                         that._assureLoadedDeferred.resolve([]);
                         // ensure that following _assureLoaded calls get resolved with a new parameter
                         delete that._assureLoadedDeferred;
@@ -751,21 +750,21 @@ sap.ui.define([
          * @private
          */
         this._logTileResolutionFailures = function (oFailedResolvedTiles) {
-            var oMessagesByLogLevel = {};
+            const oMessagesByLogLevel = {};
 
             if (!oFailedResolvedTiles) {
                 return;
             }
 
-            Object.keys(oLogLevel).filter(function (sLevelKey) {
-                var iLevel = oLogLevel[sLevelKey];
+            Object.keys(oLogLevel).filter((sLevelKey) => {
+                const iLevel = oLogLevel[sLevelKey];
                 return iLevel >= oLogLevel.FATAL && iLevel <= oLogLevel.ALL;
-            }).forEach(function (sLevelKey) {
+            }).forEach((sLevelKey) => {
                 oMessagesByLogLevel[oLogLevel[sLevelKey]] = "";
             });
 
-            Object.keys(oFailedResolvedTiles).forEach(function (sFailuredKey) {
-                var oFailureInfo = oFailedResolvedTiles[sFailuredKey];
+            Object.keys(oFailedResolvedTiles).forEach((sFailuredKey) => {
+                const oFailureInfo = oFailedResolvedTiles[sFailuredKey];
                 if (oFailureInfo.logLevel) {
                     oMessagesByLogLevel[oFailureInfo.logLevel] =
                         oMessagesByLogLevel[oFailureInfo.logLevel].concat(oFailureInfo.message).concat("\n");
@@ -801,8 +800,8 @@ sap.ui.define([
          * @public
          */
         this.getDefaultGroup = function () {
-            var oDeferred = new jQuery.Deferred(),
-                oAssureLoadedDeferred;
+            const oDeferred = new jQuery.Deferred();
+            let oAssureLoadedDeferred;
 
             // check whether assureLoaded was already called.
             // The default group is not set before.
@@ -812,11 +811,11 @@ sap.ui.define([
 
             if (oAssureLoadedDeferred) {
                 oAssureLoadedDeferred
-                    .done(function () {
+                    .done(() => {
                         oDeferred.resolve(_oDefaultGroup);
                     })
-                    .fail(function (sMessage) {
-                        oDeferred.reject("Failed to access default group. " + sMessage);
+                    .fail((sMessage) => {
+                        oDeferred.reject(`Failed to access default group. ${sMessage}`);
                     });
             } else {
                 oDeferred.resolve(_oDefaultGroup);
@@ -882,22 +881,21 @@ sap.ui.define([
          *  a respective error message.
          */
         this.addGroup = function (sTitle) {
-            var oDeferred = new jQuery.Deferred(),
-                oCdmSiteService = this.oCDMService,
-                sGeneratedId,
-                sGenericErrorMessage,
-                that = this;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
+            let sGeneratedId;
+            const that = this;
 
             if (!this._isValidTitle(sTitle)) {
                 return oDeferred.reject("No valid group title").promise();
             }
 
-            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
             oCdmSiteService.getSite()
-                .done(function (oSite) {
+                .done((oSite) => {
                     sGeneratedId = oUshellUtils.generateUniqueId(oReadHomePageUtils.getGroupIdsFromSite(oSite));
 
                     // append the group at the end
@@ -905,15 +903,15 @@ sap.ui.define([
 
                     // store personalization
                     oCdmSiteService.save()
-                        .done(function () {
+                        .done(() => {
                             delete that._assureLoadedDeferred;
                             oDeferred.resolve(oSite.groups[sGeneratedId], sGeneratedId);
                         })
-                        .fail(function (sErrorMsg0) {
+                        .fail((sErrorMsg0) => {
                             oDeferred.reject(sErrorMsg0);
                         });
                 })
-                .fail(function (sErrorMsg) {
+                .fail((sErrorMsg) => {
                     oDeferred.reject(sGenericErrorMessage + sErrorMsg);
                 });
 
@@ -944,11 +942,9 @@ sap.ui.define([
          *  In case of failure, the fail handler will be called with the old group title.
          */
         this.setGroupTitle = function (oGroup, sNewTitle) {
-            var that = this,
-                oDeferred = new jQuery.Deferred(),
-                oCdmSiteService = this.oCDMService,
-                sOldTitle, // necessary in case the renaming operation fails
-                sGenericErrorMessage;
+            const that = this;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
 
             if (typeof oGroup !== "object" || !oReadHomePageUtils.getGroupId(oGroup)) {
                 return oDeferred.reject("Unexpected group value").promise();
@@ -956,28 +952,28 @@ sap.ui.define([
             if (!that._isValidTitle(sNewTitle)) {
                 return oDeferred.reject("Unexpected oGroup title value").promise();
             }
-            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)}'. `;
 
-            sOldTitle = oReadHomePageUtils.getGroupTitle(oGroup);
+            const sOldTitle = oReadHomePageUtils.getGroupTitle(oGroup); // necessary in case the renaming operation fails
 
             oCdmSiteService.getSite()
-                .done(function (oSite) {
+                .done((oSite) => {
                     // adapt title
                     if (oGroup) {
                         oModifyHomePageUtils.setGroupTitle(oGroup, sNewTitle);
                     }
                     // save personalization
                     oCdmSiteService.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);
                 });
 
@@ -1009,15 +1005,15 @@ sap.ui.define([
          *  error message.
          */
         this.hideGroups = function (aHiddenGroupIds) {
-            var oDeferred = new jQuery.Deferred(),
-                oCdmSiteService = this.oCDMService,
-                sGenericErrorMessage;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
+            let sGenericErrorMessage;
 
             if (aHiddenGroupIds && Array.isArray(aHiddenGroupIds)) {
                 sGenericErrorMessage = "Failed to hide group. ";
                 oCdmSiteService.getSite()
-                    .done(function (oSite) {
-                        oReadHomePageUtils.getGroupsArrayFromSite(oSite).forEach(function (oGroup) {
+                    .done((oSite) => {
+                        oReadHomePageUtils.getGroupsArrayFromSite(oSite).forEach((oGroup) => {
                             oModifyHomePageUtils.setGroupVisibility(oGroup,
                                 aHiddenGroupIds && // group is not in list of hidden groups -> visibility === true
                                 Array.prototype.indexOf.call(aHiddenGroupIds, oReadHomePageUtils.getGroupId(oGroup)) === -1
@@ -1026,14 +1022,14 @@ sap.ui.define([
 
                         // 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 {
@@ -1068,21 +1064,19 @@ sap.ui.define([
          *  In case of failure, the fail handler will be called with a respective error message.
          */
         this.moveGroup = function (oGroup, nNewIndex) {
-            var oDeferred = new jQuery.Deferred(),
-                oCdmSiteService = this.oCDMService,
-                aGroupsOrderAfterMove,
-                sGenericErrorMessage;
+            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();
             }
 
-            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),
-                        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.");
@@ -1091,7 +1085,7 @@ sap.ui.define([
                     }
 
                     // move group inside the groupsOrder array
-                    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.");
@@ -1101,15 +1095,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();
@@ -1125,35 +1119,33 @@ sap.ui.define([
          *  In case of failure, the fail handler will be called with a respective error message.
          */
         this.removeGroup = function (oGroup) {
-            var oDeferred = new jQuery.Deferred(),
-                oCdmSiteService = this.oCDMService,
-                sGenericErrorMessage,
-                sGroupId;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
 
             if (typeof oGroup !== "object") {
                 return oDeferred.reject("invalid group parameter").promise();
             }
-            sGroupId = oReadHomePageUtils.getGroupId(oGroup);
+            const sGroupId = oReadHomePageUtils.getGroupId(oGroup);
             if (!sGroupId) {
                 return oDeferred.reject("group without id given").promise();
             }
 
-            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);
                 });
 
@@ -1172,24 +1164,24 @@ sap.ui.define([
          *  and the set of groups.
          */
         this.resetGroup = function (oGroup) {
-            var oDeferred = new jQuery.Deferred(),
-                oCdmSiteService = this.oCDMService,
-                aSiteGroupsBackup = [],
-                that = this,
-                sGenericErrorMessage,
-                sGroupId;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
+            const aSiteGroupsBackup = [];
+            const that = this;
+            let sGenericErrorMessage;
+            let sGroupId;
 
             if (typeof oGroup === "object" && oReadHomePageUtils.getGroupId(oGroup)) {
                 sGroupId = oReadHomePageUtils.getGroupId(oGroup);
-                sGenericErrorMessage = "Failed to reset group with id '" + sGroupId + "'. ";
+                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);
@@ -1197,21 +1189,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, []);
@@ -1343,9 +1335,8 @@ sap.ui.define([
          */
         this.getTileIndicatorDataSource = function (oTile) {
             // TODO works in all cases? e.g. for tiles added via addTile?
-            var oResolvedTile = this._mResolvedTiles[oTile.id],
-                oResult = {},
-                oResolutionResult;
+            const oResolvedTile = this._mResolvedTiles[oTile.id];
+            const oResult = {};
 
             // Reuse explicit information set by the user via bookmark service
             if (oTile.indicatorDataSource) {
@@ -1362,19 +1353,19 @@ sap.ui.define([
             }
 
             // Respond with ...
-            oResolutionResult = oResolvedTile.tileResolutionResult;
+            const oResolutionResult = oResolvedTile.tileResolutionResult;
             if (oResolutionResult.indicatorDataSource) {
                 // ... indicator data source
                 oResult.indicatorDataSource = deepExtend({}, oResolutionResult.indicatorDataSource);
 
                 // ... and related data source (if given)
                 if (oResolutionResult.indicatorDataSource.hasOwnProperty("dataSource")) {
-                    var sDataSourceName = oResolutionResult.indicatorDataSource.dataSource,
-                        oDataSources = oResolutionResult.dataSources;
+                    const sDataSourceName = oResolutionResult.indicatorDataSource.dataSource;
+                    const oDataSources = oResolutionResult.dataSources;
                     if (oDataSources && oDataSources.hasOwnProperty(sDataSourceName)) {
                         oResult.dataSource = deepExtend({}, oDataSources[sDataSourceName]);
                     } else {
-                        Log.warning("datasource referenced but not found for tile: " + oResolvedTile.tileIntent);
+                        Log.warning(`datasource referenced but not found for tile: ${oResolvedTile.tileIntent}`);
                     }
                 }
 
@@ -1382,10 +1373,10 @@ sap.ui.define([
                 // bust as the tile is not aware of the (applicaiton's) component URL, the mentioned paths need to be adopted.
                 // BCP: 1880246066
                 if (oUshellUtils.getMember(oResolutionResult, "runtimeInformation.componentProperties.url")) {
-                    var sPathIndicatorDataSource = oUshellUtils.getMember(oResult, "indicatorDataSource.path");
-                    var sUriDataSource = oUshellUtils.getMember(oResult, "dataSource.uri");
-                    var sUrlComponent = oUshellUtils.getMember(oResolutionResult, "runtimeInformation.componentProperties.url");
-                    var oTransformed =
+                    const sPathIndicatorDataSource = oUshellUtils.getMember(oResult, "indicatorDataSource.path");
+                    const sUriDataSource = oUshellUtils.getMember(oResult, "dataSource.uri");
+                    const sUrlComponent = oUshellUtils.getMember(oResolutionResult, "runtimeInformation.componentProperties.url");
+                    const oTransformed =
                         fnUriTransform(sPathIndicatorDataSource, sUriDataSource, sUrlComponent, this.getWindowLocationHref());
 
                     if (!oTransformed.error) {
@@ -1517,10 +1508,10 @@ sap.ui.define([
          *  String could be empty.
          */
         this.getTileTarget = function (oTile) {
-            var oResolutionResult,
-                sTileId = oReadHomePageUtils.getTileId(oTile),
-                oResolvedTile = this._mResolvedTiles[sTileId],
-                sTargetUrl;
+            let oResolutionResult;
+            const sTileId = oReadHomePageUtils.getTileId(oTile);
+            const oResolvedTile = this._mResolvedTiles[sTileId];
+            let sTargetUrl;
 
             if (oTile.target && oTile.target.url) {
                 // this seems to be a URL bookmark tile
@@ -1546,7 +1537,7 @@ sap.ui.define([
             }
 
             Log.warning(
-                "Could not find a target for Tile with id '" + sTileId + "'",
+                `Could not find a target for Tile with id '${sTileId}'`,
                 "sap.ushell.adapters.cdm.LaunchPageAdapter"
             );
             return "";
@@ -1613,7 +1604,7 @@ sap.ui.define([
          *  Tile object
          */
         this.refreshTile = function (oTile) {
-            var oResolvedTile = this._mResolvedTiles[oTile.id];
+            const oResolvedTile = this._mResolvedTiles[oTile.id];
 
             if (oResolvedTile) {
                 if (oResolvedTile.tileComponent) {
@@ -1650,7 +1641,7 @@ sap.ui.define([
          *  New visibility
          */
         this.setTileVisible = function (oTile, bNewVisible) {
-            var oResolvedTile = this._mResolvedTiles[oTile.id];
+            const oResolvedTile = this._mResolvedTiles[oTile.id];
 
             if (oResolvedTile) {
                 if (oResolvedTile.tileComponent) {
@@ -1681,12 +1672,12 @@ sap.ui.define([
          *  to the fail handler which will be called in this case.
          */
         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);
@@ -1714,12 +1705,11 @@ sap.ui.define([
          * @deprecated since 1.99. Please use {@link #_getTileUiComponentContainer} instead.
          */
         this._getTileUiComponentContainerSync = function (oTile, oResolvedTile, bIsCatalogTile) {
-            var that = this,
-                oResolutionResult,
-                oTileComponentData,
-                sNavigationMode,
-                oTileComponentInstance,
-                oConfig = {};
+            const that = this;
+            let oTileComponentData;
+            let sNavigationMode;
+            let oTileComponentInstance;
+            let oConfig = {};
 
             // should only be called after tile has been resolved
             if (bIsCatalogTile === true) {
@@ -1728,7 +1718,7 @@ sap.ui.define([
                 oTileComponentData = that._createTileComponentData(oTile, false, oResolvedTile);
             }
 
-            oResolutionResult = oResolvedTile.tileResolutionResult;
+            const oResolutionResult = oResolvedTile.tileResolutionResult;
 
             if (oResolvedTile.isLink) {
                 sNavigationMode = oResolutionResult.navigationMode;
@@ -1771,13 +1761,12 @@ sap.ui.define([
             if (oConfig.name) {
                 oConfig.async = false; // otherwise sap.ui.component will return a Promise in some cases
 
-                var oCompContainer;
                 try {
                     oTileComponentInstance = sap.ui.component(oConfig); // LEGACY API (deprecated)
                 } catch (oError) {
                     Log.error(
-                        oError.message + "\n-- An error occurred while instantiating "
-                        + "the tile component for " + oConfig.name,
+                        `${oError.message}\n-- An error occurred while instantiating `
+                        + `the tile component for ${oConfig.name}`,
                         oError.stack ? oError.stack : "",
                         "sap.ushell.adapters.cdm.LaunchPageAdapter"
                     );
@@ -1785,7 +1774,7 @@ sap.ui.define([
                     return null;
                 }
 
-                oCompContainer = new ComponentContainer({
+                const oCompContainer = new ComponentContainer({
                     component: oTileComponentInstance,
                     height: "100%"
                 });
@@ -1819,14 +1808,12 @@ sap.ui.define([
          * @private
          */
         this._getTileUiComponentContainer = function (oTile, oResolvedTile, bIsCatalogTile) {
-            var that = this,
-                oResolutionResult,
-                oTileComponentData,
-                sNavigationMode,
-                oTileComponentInstance,
-                oCompContainer,
-                bIsCustomTile,
-                oDeferred = new jQuery.Deferred();
+            const that = this;
+            let oTileComponentData;
+            let sNavigationMode;
+            let oTileComponentInstance;
+            let oCompContainer;
+            const oDeferred = new jQuery.Deferred();
 
             // should only be called after tile has been resolved
             if (bIsCatalogTile === true) {
@@ -1835,7 +1822,7 @@ sap.ui.define([
                 oTileComponentData = that._createTileComponentData(oTile, false, oResolvedTile);
             }
 
-            oResolutionResult = oResolvedTile.tileResolutionResult;
+            const oResolutionResult = oResolvedTile.tileResolutionResult;
 
             if (oResolvedTile.isLink) {
                 sNavigationMode = oResolutionResult.navigationMode;
@@ -1844,14 +1831,14 @@ sap.ui.define([
                 return oDeferred.promise();
             }
 
-            var oTileComponentProperties = this._createTileComponentProperties(
+            const oTileComponentProperties = this._createTileComponentProperties(
                 oTileComponentData,
                 oResolutionResult.tileComponentLoadInfo
             );
 
             if (!oTileComponentProperties.name) {
                 return oDeferred
-                    .reject("Cannot find name of tile component for tile with id: '" + oTile.id + "'")
+                    .reject(`Cannot find name of tile component for tile with id: '${oTile.id}'`)
                     .promise();
             }
 
@@ -1861,9 +1848,9 @@ sap.ui.define([
                 oTileComponentData.properties = oTileComponentData.properties || {};
                 oTileComponentData.properties.manifest = oTileComponentProperties.manifest;
             }
-            bIsCustomTile = this.isCustomTile(oTileComponentProperties.name);
-            var createCompContainer = function (oAppProperties) {
-                var oResolvedTile;
+            const bIsCustomTile = this.isCustomTile(oTileComponentProperties.name);
+            function createCompContainer (oAppProperties) {
+                let oResolvedTile;
                 oTileComponentInstance = oAppProperties.componentHandle.getInstance();
                 oCompContainer = new ComponentContainer({
                     component: oTileComponentInstance,
@@ -1878,8 +1865,8 @@ sap.ui.define([
                     }
                 }
                 return oCompContainer;
-            };
-            var _customTileCreateCompContainer = function (oComponentLoader) {
+            }
+            function _customTileCreateCompContainer (oComponentLoader) {
                 const oDeferred = new jQuery.Deferred();
                 oComponentLoader.createComponent({
                     loadCoreExt: bIsCustomTile, // custom tiles may need modules from core-ext-light
@@ -1891,30 +1878,30 @@ sap.ui.define([
                     applicationDependencies: oTileComponentProperties,
                     ui5ComponentName: oTileComponentProperties.name
                 },
-                    {}, // don't generate an id
-                    // TODO: clarify about having stable IDs!
-                    [], // instantiate directly,
-                    UI5ComponentType.Visualization
+                {}, // don't generate an id
+                // TODO: clarify about having stable IDs!
+                [], // instantiate directly,
+                UI5ComponentType.Visualization
                 )
                     .then((oAppProperties) => {
                         const oComponentContainer = createCompContainer(oAppProperties);
                         oDeferred.resolve(oComponentContainer);
                     })
-                    .catch(function (oError) {
+                    .catch((oError) => {
                         oDeferred.reject(oError);
                     });
                 return oDeferred.promise();
-            };
+            }
 
-            var _standardTileCreateCompContainer = function () {
-                var oComponentProperties = {
+            function _standardTileCreateCompContainer () {
+                const oComponentProperties = {
                     componentData: oTileComponentData,
                     url: oTileComponentProperties.url,
                     name: oTileComponentProperties.name,
                     async: false
                 };
                 oTileComponentInstance = sap.ui.component(oComponentProperties);
-                var oAppProperties = {
+                const oAppProperties = {
                     componentHandle: {
                         getInstance: function () {
                             return oTileComponentInstance;
@@ -1922,23 +1909,23 @@ sap.ui.define([
                     }
                 };
                 return createCompContainer(oAppProperties);
-            };
+            }
 
             if (bIsCustomTile) {
                 oEventHub.once("CoreResourcesComplementLoaded")
-                    .do(function () {
-                        Container.getServiceAsync("Ui5ComponentLoader").then(function (oComponentLoader) {
+                    .do(() => {
+                        Container.getServiceAsync("Ui5ComponentLoader").then((oComponentLoader) => {
                             _customTileCreateCompContainer(oComponentLoader)
-                                .done(function (oCompContainer) {
+                                .done((oCompContainer) => {
                                     oDeferred.resolve(oCompContainer);
                                 })
-                                .fail(function (oError) {
+                                .fail((oError) => {
                                     oDeferred.reject(oError);
                                 });
                         });
                     });
             } else {
-                var oStandardCompContainer = _standardTileCreateCompContainer();
+                const oStandardCompContainer = _standardTileCreateCompContainer();
                 oDeferred.resolve(oStandardCompContainer);
             }
 
@@ -1946,7 +1933,7 @@ sap.ui.define([
         };
 
         this._createTileComponentProperties = function (oTileComponentData, vTileComponentLoadInfo) {
-            var oTileComponentProperties = {};
+            let oTileComponentProperties = {};
             if (typeof vTileComponentLoadInfo === "string") {
                 // This is a Static or Dynamic App Launcher
                 // Consider also the indicatorDataSource from oTile, even if none is set in
@@ -1991,22 +1978,21 @@ sap.ui.define([
          * @private
          */
         this._getTileView = function (oGroupTile) {
-            var oResolvedTile,
-                sErrorMessage,
-                oDeferred = new jQuery.Deferred();
+            let sErrorMessage;
+            const oDeferred = new jQuery.Deferred();
 
             if (typeof oGroupTile !== "object" || !oGroupTile.id) {
-                sErrorMessage = "Invalid input parameter passed to _getTileView: " + oGroupTile;
+                sErrorMessage = `Invalid input parameter passed to _getTileView: ${oGroupTile}`;
                 Log.error(sErrorMessage);
                 return oDeferred.reject(sErrorMessage).promise();
             }
 
-            oResolvedTile = this._mResolvedTiles[oGroupTile.id];
+            const oResolvedTile = this._mResolvedTiles[oGroupTile.id];
             if (oResolvedTile) {
                 return this._getTileUiComponentContainer(oGroupTile, oResolvedTile, false);
             }
 
-            sErrorMessage = "No resolved tile found for tile ID: " + oGroupTile.id;
+            sErrorMessage = `No resolved tile found for tile ID: ${oGroupTile.id}`;
             Log.error(sErrorMessage);
             return oDeferred.reject(sErrorMessage).promise();
         };
@@ -2045,10 +2031,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();
             }
@@ -2070,16 +2056,16 @@ sap.ui.define([
          * returns data of tile component
          */
         this._createTileComponentData = function (oTile, bIsCatalogTile, oResolutionResult) {
-            var sTitle = bIsCatalogTile ? this.getCatalogTileTitle(oTile) : this.getTileTitle(oTile),
-                sSubTitle = bIsCatalogTile ? this.getCatalogTilePreviewSubtitle(oTile) : this.getTileSubtitle(oTile),
-                sIcon = bIsCatalogTile ? this.getCatalogTilePreviewIcon(oTile) : this.getTileIcon(oTile),
-                sInfo = bIsCatalogTile ? this.getCatalogTilePreviewInfo(oTile) : this.getTileInfo(oTile),
-                sTarget = bIsCatalogTile ? this.getCatalogTileTargetURL(oTile) : this.getTileTarget(oTile),
-                oIndicatorDataSource = this.getTileIndicatorDataSource(oTile),
-                oComponentData = {
-                    properties: {},
-                    startupParameters: {}
-                };
+            const sTitle = bIsCatalogTile ? this.getCatalogTileTitle(oTile) : this.getTileTitle(oTile);
+            const sSubTitle = bIsCatalogTile ? this.getCatalogTilePreviewSubtitle(oTile) : this.getTileSubtitle(oTile);
+            const sIcon = bIsCatalogTile ? this.getCatalogTilePreviewIcon(oTile) : this.getTileIcon(oTile);
+            const sInfo = bIsCatalogTile ? this.getCatalogTilePreviewInfo(oTile) : this.getTileInfo(oTile);
+            const sTarget = bIsCatalogTile ? this.getCatalogTileTargetURL(oTile) : this.getTileTarget(oTile);
+            const oIndicatorDataSource = this.getTileIndicatorDataSource(oTile);
+            const oComponentData = {
+                properties: {},
+                startupParameters: {}
+            };
 
             // Check whether tile is a custom tile
             if (oResolutionResult.tileResolutionResult.isCustomTile === true
@@ -2139,12 +2125,11 @@ sap.ui.define([
          * @private
          */
         this._createLinkInstance = function (oTile, bIsCatalogTile, sNavigationMode, fnGenericTile, oResources) {
-            var sTileTitle,
-                linkTileControl,
-                sTranslatedNavMode,
-                sTileSubTitle = this.getTileSubtitle(oTile);
+            let sTileTitle;
+            let sTranslatedNavMode;
+            const sTileSubTitle = this.getTileSubtitle(oTile);
 
-            var GenericTile = fnGenericTile;
+            const GenericTile = fnGenericTile;
 
             // should only be called after tile has been resolved
             if (bIsCatalogTile === true) {
@@ -2154,27 +2139,27 @@ sap.ui.define([
             }
 
             // By using the LineMode, the GenericTile is displayed as a Link
-            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) {
-                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);
+                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);
@@ -2195,36 +2180,131 @@ sap.ui.define([
             }
         };
 
+        function createTileParametersFromIntentParams (oIntentParams) {
+            return Object.keys(oIntentParams).map((sKey) => {
+                const sValue = oIntentParams[sKey] && oIntentParams[sKey][0];
+
+                return {
+                    name: sKey,
+                    value: sValue || "" // "sValue" might be undefined
+                };
+            });
+        }
+
+        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;
+        }
+
         this._addTileToSite = function (oPersonalizedSite, oGroup, oNewTile, oCdmSiteService) {
             // TODO JSDoc
             // TODO consider to change the interface so it is not needed to pass oNewTile
             //  which should be created inside this method
-            var that = this,
-                oDeferred = new jQuery.Deferred(),
-                oIntent = urlParsing.parseShellHash(oNewTile.properties.targetURL),
-                oTileToBeAdded = {
-                    id: that.getTileId(oNewTile),
-                    target: {
-                        semanticObject: oIntent.semanticObject,
-                        action: oIntent.action,
-                        parameters: createTileParametersFromIntentParams(oIntent.params)
-                    }
-                };
+            const that = this;
+            const oDeferred = new jQuery.Deferred();
+            const oIntent = urlParsing.parseShellHash(oNewTile.properties.targetURL);
+            const oTileToBeAdded = {
+                id: that.getTileId(oNewTile),
+                target: {
+                    semanticObject: oIntent.semanticObject,
+                    action: oIntent.action,
+                    parameters: createTileParametersFromIntentParams(oIntent.params)
+                }
+            };
 
             oPersonalizedSite.groups[oGroup.identification.id].payload.tiles.push(oTileToBeAdded);
 
-            //store personalization
+            // store personalization
             oCdmSiteService.save()
-                .done(function () {
+                .done(() => {
                     oDeferred.resolve(oTileToBeAdded);
                 })
-                .fail(function (sMessage) {
+                .fail((sMessage) => {
                     oDeferred.reject(sMessage);
                 });
 
             return oDeferred.promise();
         };
 
+        /**
+         * 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.
+         *
+         * @private
+         */
+        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.dataSource) {
+                oTile.dataSource = {};
+                deepExtend(oTile.dataSource, oParameters.dataSource);
+            }
+
+            if (oParameters.serviceUrl || oParameters.serviceUrl === "") {
+                oTile.indicatorDataSource = {
+                    path: oParameters.serviceUrl
+                };
+            }
+
+            if (oTile.indicatorDataSource && (oParameters.serviceRefreshInterval || oParameters.serviceRefreshInterval === 0)) {
+                oTile.indicatorDataSource.refresh
+                    = oParameters.serviceRefreshInterval;
+            }
+        }
+
+        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;
+        }
+
+        function composeNewBookmarkTile (oParameters, oTarget) {
+            const oTile = composeNewTile(oParameters, oTarget);
+
+            oTile.isBookmark = true;
+
+            return oTile;
+        }
+
         /**
          * Adds a tile to the homepage. Furthermore the personalization will be
          * persisted for the end user.
@@ -2240,16 +2320,15 @@ sap.ui.define([
          *  error message.
          */
         this.addTile = function (oCatalogTile, oGroup) {
-            var oDeferred = new jQuery.Deferred(),
-                sGenericErrorMessage,
-                oCdmSiteService = this.oCDMService,
-                oGroupTile;
+            const oDeferred = new jQuery.Deferred();
+            let sGenericErrorMessage;
+            const oCdmSiteService = this.oCDMService;
 
             if (!oGroup) {
                 oGroup = _oDefaultGroup;
             }
 
-            oGroupTile = composeNewTile();
+            const oGroupTile = composeNewTile();
             oGroupTile.appId = oCatalogTile.tileResolutionResult.appId;
             // add new tile to list of resolved tiles
             this._mResolvedTiles[oGroupTile.id] = {
@@ -2258,22 +2337,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 succinct:
                     //     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) {
-                    sGenericErrorMessage = "Failed to add tile with id '" + oGroupTile.id +
-                        "' to group with id '" + oGroup.identification.id + "'. ";
+                .fail((sError) => {
+                    sGenericErrorMessage = `Failed to add tile with id '${oGroupTile.id
+                    }' to group with id '${oGroup.identification.id}'. `;
                     oDeferred.reject(sGenericErrorMessage + sError);
                 });
 
@@ -2295,22 +2374,20 @@ sap.ui.define([
          *  In case of failure, the fail handler will be called with a collection of existing groups.
          */
         this.removeTile = function (oGroup, oTile, iIndex) {
-            var oCdmSiteService = this.oCDMService,
-                sGenericErrorMessage,
-                oDeferred = new jQuery.Deferred(),
-                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();
             }
 
-            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,
-                        sPayloadType;
+                .done((oSite) => {
+                    let oPayload;
 
                     // Succinctly convert iIndex to number
                     iIndex = +iIndex;
@@ -2321,10 +2398,10 @@ sap.ui.define([
                         oDeferred.reject(oSite.groups[oGroup.identification.id], sGenericErrorMessage);
                     }
 
-                    //according to the tile type set oPayload tile / links to be truncated.
-                    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;
                     }
@@ -2333,21 +2410,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);
                 });
@@ -2376,10 +2453,9 @@ sap.ui.define([
          *  In case of failure, the fail handler will be called with a collection of existing groups.
          */
         this.moveTile = function (oTile, iSourceIndex, iTargetIndex, oSourceGroup, oTargetGroup, newTileType) {
-            var oDeferred = new jQuery.Deferred(),
-                oCdmSiteService = this.oCDMService,
-                that = this,
-                sGenericErrorMessage;
+            const oDeferred = new jQuery.Deferred();
+            const oCdmSiteService = this.oCDMService;
+            const that = this;
 
             if (!oTile || isEmptyObject(oTile) ||
                 iSourceIndex === undefined || iSourceIndex < 0 ||
@@ -2389,32 +2465,31 @@ sap.ui.define([
                 return oDeferred.reject("Invalid input parameters").promise();
             }
 
-            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 sTargetPayloadType,
-                        oGroupPayload,
-                        sOrigTileType = that.getTileType(oTile) === that.TileType.Link ? "links" : "tiles";
+                .done((oSite) => {
+                    let oGroupPayload;
+                    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";
                     }
 
-                    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;
                     }
@@ -2438,16 +2513,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);
                 });
@@ -2487,23 +2562,23 @@ sap.ui.define([
          *  the order with which the catalogs are returned.
          */
         this.getCatalogs = function () {
-            var that = this,
-                oDeferred = new jQuery.Deferred(),
-                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) {
+            Container.getServiceAsync("CommonDataModel").then((oCDMSiteService) => {
+                oCDMSiteService.getSite().done((oSite) => {
                     // catalogs from site should be loaded first as they require
                     // loading of less resources
-                    Object.keys(oSite.catalogs).forEach(function (sCatalogId) {
+                    Object.keys(oSite.catalogs).forEach((sCatalogId) => {
                         processCatalog(oSite, sCatalogId, aCatalogs, oDeferred);
                     });
                     // In our tests we use indices to access specific
@@ -2534,23 +2609,22 @@ sap.ui.define([
          * @private
          */
         this._isStartableInbound = function (oInbound) {
-            var aNonStartableInbounds = [
+            const aNonStartableInbounds = [
                 "Shell-plugin",
                 "Shell-bootConfig" // just in case
-            ],
-                bRes;
+            ];
 
             if (!oInbound.semanticObject || !oInbound.action) {
                 return false;
             }
-            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;
             }
             if (!ObjectPath.get("signature.parameters", oInbound)) {
                 return true;
             }
-            bRes = Object.keys(oInbound.signature.parameters).every(function (sParameter) {
+            const bRes = Object.keys(oInbound.signature.parameters).every((sParameter) => {
                 // there is a special modelling that an exported tile pointing to a URL
                 // is matched by exactly this inbound with a plain filter.
                 // The export models tiles in this way (Shell-startUrl), however, generically
@@ -2579,12 +2653,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}`;
         };
 
         /**
@@ -2616,12 +2690,12 @@ sap.ui.define([
          * @private
          */
         this._toHashFromOutbound = function (oOutbound) {
-            var sConstructedHash = oUtilsCdm.toHashFromOutbound(oOutbound);
+            const sConstructedHash = oUtilsCdm.toHashFromOutbound(oOutbound);
 
             if (!sConstructedHash) {
                 return undefined;
             }
-            return "#" + sConstructedHash;
+            return `#${sConstructedHash}`;
         };
 
         /**
@@ -2640,75 +2714,37 @@ sap.ui.define([
             return false;
         };
 
-        /**
-         * 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,
-                oDeferred = new jQuery.Deferred();
-
-            if (typeof oCatalog !== "object" || oCatalog === null) {
-                return oDeferred.reject("Invalid input parameter '" + oCatalog + "' passed to getCatalogTiles.").promise();
-            }
-
-            that.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();
-        };
-
-        this.isCustomTile = function (sComponentName) {
-            return !(sComponentName === sStaticTileComponent || sComponentName === sDynamicTileComponent);
-        };
-
         function getCatalogTilesFromSite (oCatalog, oSite) {
-            var that = this,
-                oDeferred = new jQuery.Deferred();
+            const that = this;
+            const oDeferred = new jQuery.Deferred();
 
-            setTimeout(function () {
+            setTimeout(() => {
                 // calculate async
-                var aCatalogTiles = ((oCatalog.payload && oCatalog.payload.appDescriptors) || [])
-                    .reduce(function (aReturnedCatalogTiles, oAppID) {
-                        var oAppDescriptor = oSite.applications[oAppID.id],
-                            oInbounds,
-                            sTileIntent,
-                            sFirstInbound,
-                            oFirstInbound,
-                            oInbound,
-                            oTileResolutionResult,
-                            oCatalogTile,
-                            sApplicationType,
-                            sAdditionalInformation,
-                            bIsApplicationTypeConfiguredInPlace,
-                            oEnableInPlaceForClassicUIsConfig;
+                const aCatalogTiles = ((oCatalog.payload && oCatalog.payload.appDescriptors) || [])
+                    .reduce((aReturnedCatalogTiles, oAppID) => {
+                        const oAppDescriptor = oSite.applications[oAppID.id];
+                        let sTileIntent;
+                        let oTileResolutionResult;
+                        let oCatalogTile;
+                        let sApplicationType;
+                        let sAdditionalInformation;
+                        let bIsApplicationTypeConfiguredInPlace;
+                        let oEnableInPlaceForClassicUIsConfig;
 
                         if (!oAppDescriptor) {
                             return aReturnedCatalogTiles;
                         }
 
-                        oInbounds = that._getMember(oAppDescriptor, "sap|app.crossNavigation.inbounds");
+                        const oInbounds = that._getMember(oAppDescriptor, "sap|app.crossNavigation.inbounds");
                         if (!oInbounds || Object.keys(oInbounds).length === 0) {
                             return aReturnedCatalogTiles;
                         }
 
-                        sFirstInbound = Object.keys(oInbounds)[0];
-                        oFirstInbound = oInbounds[sFirstInbound];
+                        const sFirstInbound = Object.keys(oInbounds)[0];
+                        const oFirstInbound = oInbounds[sFirstInbound];
 
                         if (that._isStartableInbound(oFirstInbound) && !that._isHiddenInbound(oFirstInbound)) {
-                            oInbound = oUtilsCdm.mapOne(sFirstInbound, oFirstInbound, oAppDescriptor);
+                            const oInbound = oUtilsCdm.mapOne(sFirstInbound, oFirstInbound, oAppDescriptor);
                             if (!oInbound || !oInbound.tileResolutionResult) {
                                 return aReturnedCatalogTiles;
                             }
@@ -2744,6 +2780,40 @@ 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();
+            }
+
+            that.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();
+        };
+
+        this.isCustomTile = function (sComponentName) {
+            return !(sComponentName === sStaticTileComponent || sComponentName === sDynamicTileComponent);
+        };
+
         /**
          * Returns the catalog's technical error message in case it could not be loaded.
          * <p>
@@ -3009,8 +3079,8 @@ sap.ui.define([
          *  Keywords of respective catalog tile
          */
         this.getCatalogTileKeywords = function (oGroupTileOrCatalogTile) {
-            var aKeywords = [],
-                oResolvedTile = oGroupTileOrCatalogTile;
+            const aKeywords = [];
+            let oResolvedTile = oGroupTileOrCatalogTile;
 
             if (!oResolvedTile) {
                 Log.error(
@@ -3038,6 +3108,53 @@ sap.ui.define([
             return aKeywords;
         };
 
+        function createNewTargetFromUrl (sUrl) {
+            return {
+                url: sUrl
+            };
+        }
+
+        function transformParameterListToString (aList) {
+            return aList
+                .map((oParameter) => {
+                    return oParameter.name + oParameter.value;
+                })
+                .sort()
+                .join();
+        }
+
+        function isSameParameters (aParameters, aOthers) {
+            let sFirst; let sOther;
+
+            aParameters = aParameters || [];
+            aOthers = aOthers || [];
+
+            if (aParameters.length === aOthers.length) {
+                sFirst = transformParameterListToString(aParameters);
+                sOther = transformParameterListToString(aOthers);
+
+                return sFirst === sOther;
+            }
+
+            return false;
+        }
+
+        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
@@ -3065,9 +3182,9 @@ sap.ui.define([
          * @private
          */
         this._visitBookmarks = function (sUrl, fnVisitor) {
-            var oCDM = this.oCDMService;
-            var oReferenceTarget;
-            var oIntent = urlParsing.parseShellHash(sUrl);
+            const oCDM = this.oCDMService;
+            let oReferenceTarget;
+            const oIntent = urlParsing.parseShellHash(sUrl);
 
             if (oIntent) {
                 // oUrlParser.parseShellHash was successful
@@ -3077,21 +3194,21 @@ sap.ui.define([
                 oReferenceTarget = createNewTargetFromUrl(sUrl);
             }
 
-            return oCDM.getSite().then(function (oSite) {
-                var oGroups = oSite.groups;
+            return oCDM.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.
                             return oTile.isBookmark && isSameTarget(oReferenceTarget, oTile.target);
                         });
                     })
-                    .reduce(function (aAllTiles, aCurrentGroupTiles) {
+                    .reduce((aAllTiles, aCurrentGroupTiles) => {
                         Array.prototype.push.apply(aAllTiles, aCurrentGroupTiles);
                         return aAllTiles;
                     }, []);
@@ -3100,7 +3217,7 @@ sap.ui.define([
                     return aTiles.length;
                 }
 
-                return jQuery.when(aTiles.map(fnVisitor)).then(function () {
+                return jQuery.when(aTiles.map(fnVisitor)).then(() => {
                     return aTiles.length;
                 });
             });
@@ -3182,18 +3299,17 @@ sap.ui.define([
          * @public
          */
         this.addBookmark = function (oParameters, oGroup) {
-            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 oTile,
-                            oTarget,
-                            oIntent = urlParsing.parseShellHash(oParameters.url),
-                            oResolveTilePromise,
-                            bIsUrlBookmarkTile = false;
+                    .done((oGroup, oSite) => {
+                        let oTarget;
+                        const oIntent = urlParsing.parseShellHash(oParameters.url);
+                        let oResolveTilePromise;
+                        let bIsUrlBookmarkTile = false;
 
                         if (!oIntent) {
                             oTarget = createNewTargetFromUrl(oParameters.url);
@@ -3202,7 +3318,7 @@ sap.ui.define([
                             oTarget = createNewTargetFromIntent(oIntent);
                         }
 
-                        oTile = composeNewBookmarkTile(
+                        const oTile = composeNewBookmarkTile(
                             oParameters,
                             oTarget
                         );
@@ -3216,27 +3332,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 oThisAdapter._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();
@@ -3297,18 +3413,18 @@ sap.ui.define([
          * @since 1.42.0
          */
         this.updateBookmarks = function (sUrl, oParameters) {
-            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 oIntent, oNewTarget;
+                return new jQuery.Deferred((oDeferred) => {
+                    let oIntent; let oNewTarget;
 
-                    var oTileComponent;
-                    var bTileViewPropertiesChanged = false;
-                    var oChangedTileViewProperties = {};
+                    let oTileComponent;
+                    let bTileViewPropertiesChanged = false;
+                    const oChangedTileViewProperties = {};
 
                     if (oParameters.url || oParameters.url === "") {
                         oIntent = urlParsing.parseShellHash(oParameters.url);
@@ -3354,7 +3470,7 @@ sap.ui.define([
 
                     if (bTileViewPropertiesChanged && mResolvedTiles[oTile.id]) {
                         oTileComponent = mResolvedTiles[oTile.id].tileComponent;
-                        //tileComponent is defined in the getTileView method. In case of the direct start, tileComponent is not defined
+                        // tileComponent is defined in the getTileView method. In case of the direct start, tileComponent is not defined
                         if (oTileComponent) {
                             oTileComponent.tileSetVisualProperties(oChangedTileViewProperties);
                         }
@@ -3367,8 +3483,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)
-                .then(function (iUpdatedCount) {
-                    return oCdmSiteService.save().then(function () {
+                .then((iUpdatedCount) => {
+                    return oCdmSiteService.save().then(() => {
                         return iUpdatedCount;
                     });
                 });
@@ -3390,9 +3506,9 @@ sap.ui.define([
          * @since 1.42.0
          */
         this.deleteBookmarks = function (sUrl) {
-            var oCDM = this.oCDMService;
-            var oIntent = urlParsing.parseShellHash(sUrl);
-            var oReferenceTarget;
+            const oCDM = this.oCDMService;
+            const oIntent = urlParsing.parseShellHash(sUrl);
+            let oReferenceTarget;
 
             if (oIntent) {
                 // parseShellHash was successful
@@ -3402,15 +3518,15 @@ sap.ui.define([
                 oReferenceTarget = createNewTargetFromUrl(sUrl);
             }
 
-            return oCDM.getSite().then(function (oSite) {
-                var oGroups = oSite.groups;
+            return oCDM.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
                                 && isSameTarget(oReferenceTarget, oTile.target)) {
                                 ++iCountGroupTilesToDelete;
@@ -3422,13 +3538,13 @@ sap.ui.define([
 
                         return iCountGroupTilesToDelete;
                     })
-                    .reduce(function (aggregateSum, groupSum) {
+                    .reduce((aggregateSum, groupSum) => {
                         aggregateSum += groupSum;
 
                         return aggregateSum;
                     }, 0);
 
-                return oCDM.save().then(function () {
+                return oCDM.save().then(() => {
                     return iDeletedTiles;
                 });
             });
@@ -3467,25 +3583,18 @@ sap.ui.define([
          * @private
          */
         this._onTileSettingsSave = function (oTile, oSettingsView) {
-            var oDeferred = new jQuery.Deferred(),
-                oUpdatedVisualTileProperties,
-                sNewTitle,
-                sNewInfo,
-                sNewSubtitle,
-                sOldTitle,
-                sOldInfo,
-                sOldSubtitle;
+            const oDeferred = new jQuery.Deferred();
 
             if (!oTile || !oTile.id || !oSettingsView) {
                 return oDeferred.reject().promise();
             }
 
-            sNewTitle = oSettingsView.oTitleInput.getValue();
-            sNewSubtitle = oSettingsView.oSubTitleInput.getValue();
-            sNewInfo = oSettingsView.oInfoInput.getValue();
-            sOldTitle = this.getTileTitle(oTile);
-            sOldInfo = this.getTileInfo(oTile);
-            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.
@@ -3496,7 +3605,7 @@ sap.ui.define([
                 return oDeferred.resolve().promise();
             }
 
-            oUpdatedVisualTileProperties = {};
+            const oUpdatedVisualTileProperties = {};
             if (sOldTitle !== sNewTitle) {
                 oUpdatedVisualTileProperties.title = sNewTitle;
                 // Add new properties also to tile for next startup
@@ -3533,20 +3642,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.rerender();
                 }
             }
 
             // 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();
                         });
                 });
@@ -3565,9 +3674,9 @@ sap.ui.define([
          * @public
          */
         this.getTileActions = function (oTile) {
-            var aTileActions = [],
-                oTileSettingsAction,
-                oModel;
+            const aTileActions = [];
+            let oTileSettingsAction;
+            let oModel;
 
             if (this._isGroupTile(oTile) && !this._isFailedGroupTile(oTile)) {
                 // Create necessary model for dialog to pass actual properties
@@ -3585,148 +3694,6 @@ sap.ui.define([
             }
             return aTileActions;
         };
-
-        function composeNewBookmarkTile (oParameters, oTarget) {
-            var oTile = composeNewTile(oParameters, oTarget);
-
-            oTile.isBookmark = true;
-
-            return oTile;
-        }
-
-        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.
-         *
-         * @private
-         */
-        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.dataSource) {
-                oTile.dataSource = {};
-                deepExtend(oTile.dataSource, oParameters.dataSource);
-            }
-
-            if (oParameters.serviceUrl || oParameters.serviceUrl === "") {
-                oTile.indicatorDataSource = {
-                    path: oParameters.serviceUrl
-                };
-            }
-
-            if (oTile.indicatorDataSource && (oParameters.serviceRefreshInterval || oParameters.serviceRefreshInterval === 0)) {
-                oTile.indicatorDataSource.refresh
-                    = oParameters.serviceRefreshInterval;
-            }
-        }
-
-        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;
-        }
-
-        function isSameParameters (aParameters, aOthers) {
-            var sFirst, sOther;
-
-            aParameters = aParameters || [];
-            aOthers = aOthers || [];
-
-            if (aParameters.length === aOthers.length) {
-                sFirst = transformParameterListToString(aParameters);
-                sOther = transformParameterListToString(aOthers);
-
-                return sFirst === sOther;
-            }
-
-            return false;
-        }
-
-        function transformParameterListToString (aList) {
-            return aList
-                .map(function (oParameter) {
-                    return oParameter.name + oParameter.value;
-                })
-                .sort()
-                .join();
-        }
-
-        function createNewTargetFromUrl (sUrl) {
-            return {
-                url: sUrl
-            };
-        }
-
-        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;
-        }
-
-        function createTileParametersFromIntentParams (oIntentParams) {
-            return Object.keys(oIntentParams).map(function (sKey) {
-                var sValue = oIntentParams[sKey] && oIntentParams[sKey][0];
-
-                return {
-                    name: sKey,
-                    value: sValue || "" // "sValue" might be undefined
-                };
-            });
-        }
     }
 
     // TODO check if this is really needed: