@sapui5/sap.ushell 1.112.1 → 1.113.0

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

@@ -1,11 +1,11 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The Unified Shell's LaunchPageAdapter for the
  *               'CDM' platform - Version 3 (V3)
  *
  * @deprecated since 1.100
- * @version 1.112.1
+ * @version 1.113.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/v3/_LaunchPage/readHome",
@@ -31,7 +31,7 @@ sap.ui.define([
     oReadHomePageUtils,
     oModifyHomePageUtils,
     oReadCatalog,
-    oMobileLibrary,
+    mobileLibrary,
     oUshellUtils,
     WindowUtils,
     urlParsing,
@@ -49,10 +49,11 @@ sap.ui.define([
     Log
 ) {
     "use strict";
-    /* global hasher */
 
-    // shortcut for type from sap/m/library
-    var oGenericTileMode = oMobileLibrary.GenericTileMode;
+    // shortcut for sap.m.GenericTileMode
+    var oGenericTileMode = mobileLibrary.GenericTileMode;
+
+    /* global hasher */
 
     var STATIC_TILE_COMPONENT_NAME = "sap.ushell.components.tiles.cdm.applauncher";
     var DYNAMIC_TILE_COMPONENT_NAME = "sap.ushell.components.tiles.cdm.applauncherdynamic";
@@ -107,8 +108,8 @@ sap.ui.define([
          * @private
          */
         this._getTileFromHashInContextOfSite = function (fnResolver, oCatalogTilePromiseCache, sIntent) {
-            var oDeferred = new jQuery.Deferred(),
-                oCatalogTilePromise = oCatalogTilePromiseCache[sIntent];
+            var oDeferred = new jQuery.Deferred();
+            var oCatalogTilePromise = oCatalogTilePromiseCache[sIntent];
 
             if (!oCatalogTilePromise) {
                 // only call resolve if it was not resolved before
@@ -192,9 +193,7 @@ sap.ui.define([
          * @private
          */
         this._prepareTileHash = function (oTile) {
-            var oParams = {},
-                oTarget,
-                aRawParams;
+            var oParams = {};
 
             if (this._isCatalogTile(oTile)) {
                 return oTile.tileIntent;
@@ -202,14 +201,14 @@ sap.ui.define([
 
             if (this._isGroupTile(oTile) && oTile.target) {
                 // TODO use hash from _mResolvedTiles if tile has been already resolved
-                aRawParams = oTile.target.parameters || [];
+                var aRawParams = oTile.target.parameters || [];
                 aRawParams.forEach(function (oParameter) {
                     if (oParameter.name && oParameter.value) {
                         oParams[oParameter.name] = [oParameter.value];
                     }
                 });
 
-                oTarget = {
+                var oTarget = {
                     target: {
                         semanticObject: oTile.target.semanticObject,
                         action: oTile.target.action
@@ -234,8 +233,8 @@ sap.ui.define([
          * @public
          */
         this.getDefaultGroup = function () {
-            var oDeferred = new jQuery.Deferred(),
-                oAssureLoadedDeferred;
+            var oDeferred = new jQuery.Deferred();
+            var oAssureLoadedDeferred;
             var that = this;
             // check whether assureLoaded was already called.
             // The default group is not set before.
@@ -271,17 +270,15 @@ sap.ui.define([
          *  a respective error message.
          */
         this.addGroup = function (sTitle) {
-            var oDeferred = new jQuery.Deferred(),
-                sGeneratedId,
-                sGenericErrorMessage,
-                that = this;
+            var oDeferred = new jQuery.Deferred();
+            var sGeneratedId;
+            var 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. ";
+            var sGenericErrorMessage = "Failed to add the group with title '" + sTitle + "' to the homepage. ";
 
             // add group to site
             this.oCDMService.getSite()
@@ -320,10 +317,8 @@ 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(),
-                sOldTitle, // necessary in case the renaming operation fails
-                sGenericErrorMessage;
+            var that = this;
+            var oDeferred = new jQuery.Deferred();
 
             if (typeof oGroup !== "object" || !oReadHomePageUtils.getGroupId(oGroup)) {
                 return oDeferred.reject("Unexpected group value").promise();
@@ -331,10 +326,11 @@ 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 '" +
+            var sGenericErrorMessage = "Failed to set new title for group with id '" +
                 oReadHomePageUtils.getGroupId(oGroup) + "'. ";
 
-            sOldTitle = oReadHomePageUtils.getGroupTitle(oGroup);
+            // necessary in case the renaming operation fails
+            var sOldTitle = oReadHomePageUtils.getGroupTitle(oGroup);
 
             this.oCDMService.getSite()
                 .done(function (oSite) {
@@ -343,7 +339,7 @@ sap.ui.define([
                         oModifyHomePageUtils.setGroupTitle(oGroup, sNewTitle);
                     }
                     // save personalization
-                that.oCDMService.save()
+                    that.oCDMService.save()
                         .done(function () {
                             oDeferred.resolve();
                         })
@@ -372,15 +368,13 @@ sap.ui.define([
          *  error message.
          */
         this.hideGroups = function (aHiddenGroupIds) {
-            var oDeferred = new jQuery.Deferred(),
-                oCdmSiteService = this.oCDMService,
-                sGenericErrorMessage;
+            var oDeferred = new jQuery.Deferred();
+            var oCdmSiteService = this.oCDMService;
 
             if (aHiddenGroupIds && Array.isArray(aHiddenGroupIds)) {
-                sGenericErrorMessage = "Failed to hide group. ";
+                var sGenericErrorMessage = "Failed to hide group. ";
                 oCdmSiteService.getSite()
                     .done(function (oSite) {
-
                         oReadHomePageUtils.getGroupsArrayFromSite(oSite).forEach(function (oGroup) {
                             var bIsInList = Array.prototype.indexOf.call(aHiddenGroupIds, oReadHomePageUtils.getGroupId(oGroup)) === -1;
                             oModifyHomePageUtils.setGroupVisibility(oGroup, bIsInList);
@@ -417,30 +411,28 @@ 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;
+            var oDeferred = new jQuery.Deferred();
+            var 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 + "'. ";
+            var 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);
+                    var aGroupsOrder = oReadHomePageUtils.getGroupIdsFromSite(oSite);
+                    var sGroupId = oReadHomePageUtils.getGroupId(oGroup);
 
                     if (!aGroupsOrder) {
                         return oDeferred.reject("groupsOrder not found - abort operation of adding a group.");
-                    } else if (aGroupsOrder.indexOf(sGroupId) === nNewIndex) {
+                    } if (aGroupsOrder.indexOf(sGroupId) === nNewIndex) {
                         return oDeferred.resolve();
                     }
 
                     // move group inside the groupsOrder array
-                    aGroupsOrderAfterMove = oUshellUtils.moveElementInsideOfArray(aGroupsOrder, aGroupsOrder.indexOf(sGroupId), nNewIndex);
+                    var aGroupsOrderAfterMove = oUshellUtils.moveElementInsideOfArray(aGroupsOrder, aGroupsOrder.indexOf(sGroupId), nNewIndex);
 
                     if (!aGroupsOrderAfterMove) {
                         return oDeferred.reject("invalid move group operation - abort.");
@@ -474,20 +466,18 @@ 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;
+            var oDeferred = new jQuery.Deferred();
+            var oCdmSiteService = this.oCDMService;
 
             if (typeof oGroup !== "object") {
                 return oDeferred.reject("invalid group parameter").promise();
             }
-            sGroupId = oReadHomePageUtils.getGroupId(oGroup);
+            var sGroupId = oReadHomePageUtils.getGroupId(oGroup);
             if (!sGroupId) {
                 return oDeferred.reject("group without id given").promise();
             }
 
-            sGenericErrorMessage = "Failed to remove group with id '" + sGroupId + "'. ";
+            var sGenericErrorMessage = "Failed to remove group with id '" + sGroupId + "'. ";
 
             // remove group from site object
             oCdmSiteService.getSite()
@@ -521,16 +511,14 @@ 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;
+            var oDeferred = new jQuery.Deferred();
+            var oCdmSiteService = this.oCDMService;
+            var aSiteGroupsBackup = [];
+            var that = this;
 
             if (typeof oGroup === "object" && oReadHomePageUtils.getGroupId(oGroup)) {
-                sGroupId = oReadHomePageUtils.getGroupId(oGroup);
-                sGenericErrorMessage = "Failed to reset group with id '" + sGroupId + "'. ";
+                var sGroupId = oReadHomePageUtils.getGroupId(oGroup);
+                var sGenericErrorMessage = "Failed to reset group with id '" + sGroupId + "'. ";
 
                 oCdmSiteService.getSite()
                     .done(function (oSite) {
@@ -645,7 +633,6 @@ sap.ui.define([
         this._notifyTileAboutVisibility = function (oTileComponent, bNewVisibility, bOldVisibility) {
             if (typeof oTileComponent.tileSetVisible === "function"
                 && bOldVisibility !== bNewVisibility) {
-
                 oTileComponent.tileSetVisible(bNewVisibility);
             }
         };
@@ -704,7 +691,7 @@ sap.ui.define([
          *
          * @param {object} oTile
          *  The title serves as text for the link
-         * @param {bollean} bIsCatalogTile
+         * @param {boolean} bIsCatalogTile
          *  Indicates whether the tile is a catalog tile or not
          * @param {string} sNavigationMode
          *  Navigation mode
@@ -718,10 +705,8 @@ sap.ui.define([
          * @private
          */
         this._createLinkInstance = function (oTile, bIsCatalogTile, sNavigationMode, fnGenericTile, oResources) {
-            var sTileTitle,
-                linkTileControl,
-                sTranslatedNavMode,
-                sTileSubTitle = this.getTileSubtitle(oTile);
+            var sTileTitle;
+            var sTileSubTitle = this.getTileSubtitle(oTile);
 
             var GenericTile = fnGenericTile;
 
@@ -733,7 +718,7 @@ sap.ui.define([
             }
 
             // By using the LineMode, the GenericTile is displayed as a Link
-            linkTileControl = new GenericTile({
+            var linkTileControl = new GenericTile({
                 mode: oGenericTileMode.LineMode,
                 subheader: sTileSubTitle,
                 header: sTileTitle,
@@ -744,7 +729,7 @@ sap.ui.define([
                 }.bind(this)
             });
             if (sNavigationMode) {
-                sTranslatedNavMode = oResources.i18n.getText(sNavigationMode + "NavigationMode");
+                var sTranslatedNavMode = oResources.i18n.getText(sNavigationMode + "NavigationMode");
                 //According to ACC-257 aria-label should start with the navigation mode, then the tile content
                 linkTileControl.setAriaLabel(sTranslatedNavMode + " " + sTileTitle + " " + sTileSubTitle);
             }
@@ -782,16 +767,14 @@ sap.ui.define([
          *  error message.
          */
         this.addTile = function (oCatalogTile, oGroup) {
-            var oDeferred = new jQuery.Deferred(),
-                sGenericErrorMessage,
-                oCdmSiteService = this.oCDMService,
-                oGroupTile;
+            var oDeferred = new jQuery.Deferred();
+            var oCdmSiteService = this.oCDMService;
 
             if (!oGroup) {
                 oGroup = this._oDefaultGroup;
             }
 
-            oGroupTile = composeNewTile();
+            var oGroupTile = composeNewTile();
             oGroupTile.vizId = oCatalogTile.vizId;
 
             // add new tile to list of resolved tiles
@@ -815,7 +798,7 @@ sap.ui.define([
                         });
                 })
                 .fail(function (sError) {
-                    sGenericErrorMessage = "Failed to add tile with id '" + oGroupTile.id +
+                    var sGenericErrorMessage = "Failed to add tile with id '" + oGroupTile.id +
                         "' to group with id '" + oGroup.identification.id + "'. ";
                     oDeferred.reject(sGenericErrorMessage + sError);
                 });
@@ -838,24 +821,22 @@ 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;
+            var oCdmSiteService = this.oCDMService;
+            var oDeferred = new jQuery.Deferred();
+            var 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 + "'. ";
+            var sGenericErrorMessage = "Failed to remove tile with id '" + oTile.id + "' from group with id '" + oGroup.identification.id + "'. ";
 
             oCdmSiteService.getSite()
                 .done(function (oSite) {
-                    var oPayload,
-                        sPayloadType;
+                    var oPayload;
 
-                    // Succintly convert iIndex to number
+                    // succinctly convert iIndex to number
                     iIndex = +iIndex;
 
                     try {
@@ -864,8 +845,8 @@ sap.ui.define([
                         oDeferred.reject(oSite.groups[oGroup.identification.id], sGenericErrorMessage);
                     }
 
-                    //according to the tile type set oPayload tile / links to be trancated.
-                    sPayloadType = that.getTileType(oTile) === that.TileType.Link ? "links" : "tiles";
+                    //according to the tile type set oPayload tile / links to be truncated.
+                    var 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.
                     if (that.getTileType(oTile) === that.TileType.Link) {
@@ -919,10 +900,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;
+            var oDeferred = new jQuery.Deferred();
+            var oCdmSiteService = this.oCDMService;
+            var that = this;
 
             if (!oTile || isEmptyObject(oTile) ||
                 iSourceIndex === undefined || iSourceIndex < 0 ||
@@ -932,20 +912,18 @@ sap.ui.define([
                 return oDeferred.reject("Invalid input parameters").promise();
             }
 
-            sGenericErrorMessage = "Failed to move tile with id '" + oTile.id + "'. ";
+            var 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";
+                    var sOrigTileType = that.getTileType(oTile) === that.TileType.Link ? "links" : "tiles";
 
                     //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";
+                    var sTargetPayloadType = newTileType === "link" ? "links" : "tiles";
 
                     // change the _mResolvedTiles tile type.
                     if (sOrigTileType !== sTargetPayloadType && that._mResolvedTiles[oTile.id]) {
@@ -966,8 +944,7 @@ sap.ui.define([
                     if (oSourceGroup.identification.id === oTargetGroup.identification.id) {
                         // within a group
                         if (iSourceIndex !== iTargetIndex || sOrigTileType !== sTargetPayloadType) {
-                            oGroupPayload = oSite.groups[oTargetGroup.identification.id].payload;
-
+                            var oGroupPayload = oSite.groups[oTargetGroup.identification.id].payload;
                             oGroupPayload[sOrigTileType].splice(iSourceIndex, 1); // remove tile at source index
                             oGroupPayload[sTargetPayloadType].splice(iTargetIndex, 0, oTile); // add tile at target index
                         } else {
@@ -1024,9 +1001,9 @@ sap.ui.define([
          *  the order with which the catalogs are returned.
          */
         this.getCatalogs = function () {
-            var that = this,
-                oDeferred = new jQuery.Deferred(),
-                aCatalogs = [];
+            var that = this;
+            var oDeferred = new jQuery.Deferred();
+            var aCatalogs = [];
 
             function processCatalog (oCdmSite, sCatalogId, aCatalogs, oGetCatalogsDeferred) {
                 var oCatalog = oCdmSite.catalogs[sCatalogId];
@@ -1035,7 +1012,7 @@ sap.ui.define([
             }
 
             // setTimeout is required here. Otherwise the the oDeferred.notify() would
-            // be a synchrounous call, which would cause wrong behaviour in some scenarios
+            // be a synchronous call, which would cause wrong behavior in some scenarios
             sap.ushell.Container.getServiceAsync("CommonDataModel").then(function (oCDMSiteService) {
                 oCDMSiteService.getSite().done(function (oSite) {
                     Object.keys(oSite.catalogs).forEach(function (sCatalogId) {
@@ -1200,51 +1177,51 @@ sap.ui.define([
          *  of catalog tiles.
          */
         this.getCatalogTiles = function (oCatalog) {
-            var that = this,
-                oDeferred = new jQuery.Deferred();
+            var that = this;
+            var oDeferred = new jQuery.Deferred();
 
             if (typeof oCatalog !== "object" || oCatalog === null) {
                 return oDeferred.reject("Invalid input parameter '" + oCatalog + "' passed to getCatalogTiles.").promise();
             }
 
             this.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);
-            });
+                .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();
         };
 
         function getCatalogTilesFromSite (oCatalog, oSite) {
-            var that = this,
-                oDeferred = new jQuery.Deferred();
+            var that = this;
+            var oDeferred = new jQuery.Deferred();
 
             setTimeout(function () {
                 // calculate async
                 var aCatalogTiles = ((oCatalog.payload && oCatalog.payload.viz) || [])
                     .reduce(function (aReturnedCatalogTiles, sVisualizationId) {
-                        var sAppId,
-                            oVisualization,
-                            sVisualizationTypeId,
-                            oVisualizationType,
-                            oAppDescriptor,
-                            oInboundResult,
-                            sHash,
-                            oMapped,
-                            sNavigationMode,
-                            oOutbound,
-                            oTileResolutionResult,
-                            oCatalogTile,
-                            sExternalUrl,
-                            sApplicationType,
-                            sAdditionalInformation,
-                            bIsApplicationTypeConfiguredInPlace,
-                            oEnableInPlaceForClassicUIsConfig;
+                        var sAppId;
+                        var oVisualization;
+                        var sVisualizationTypeId;
+                        var oVisualizationType;
+                        var oAppDescriptor;
+                        var oInboundResult;
+                        var sHash;
+                        var oMapped;
+                        var sNavigationMode;
+                        var oOutbound;
+                        var oTileResolutionResult;
+                        var oCatalogTile;
+                        var sExternalUrl;
+                        var sApplicationType;
+                        var sAdditionalInformation;
+                        var bIsApplicationTypeConfiguredInPlace;
+                        var oEnableInPlaceForClassicUIsConfig;
 
                         // Get visualization and type
                         if (!sVisualizationId) {
@@ -1406,7 +1383,7 @@ sap.ui.define([
          * @returns {string}
          *  Title of respective group tile or catalog tile.
          *  In case the title could not be determined,
-         *  <code>""<code> is returned.
+         *  <code>""</code> is returned.
          *  @throws an exception when the tile is not valid
          */
         this.getCatalogTileTitle = function (oGroupTileOrCatalogTile) {
@@ -1524,8 +1501,8 @@ sap.ui.define([
          *  Keywords of respective catalog tile
          */
         this.getCatalogTileKeywords = function (oGroupTileOrCatalogTile) {
-            var aKeywords = [],
-                oResolvedTile = oGroupTileOrCatalogTile;
+            var aKeywords = [];
+            var oResolvedTile = oGroupTileOrCatalogTile;
 
             if (!oResolvedTile) {
                 Log.error(
@@ -1714,11 +1691,10 @@ sap.ui.define([
 
                 jQuery.when(oGroup || that.getDefaultGroup(), oCdmSiteService.getSite())
                     .done(function (oGroup, oSite) {
-                        var oTile,
-                            oTarget,
-                            oIntent = urlParsing.parseShellHash(oParameters.url),
-                            oResolveTilePromise,
-                            bIsUrlBookmarkTile = false;
+                        var oTarget;
+                        var oIntent = urlParsing.parseShellHash(oParameters.url);
+                        var oResolveTilePromise;
+                        var bIsUrlBookmarkTile = false;
 
                         if (!oIntent) {
                             oTarget = createNewTargetFromUrl(oParameters.url);
@@ -1727,7 +1703,7 @@ sap.ui.define([
                             oTarget = createNewTargetFromIntent(oIntent);
                         }
 
-                        oTile = composeNewBookmarkTile(
+                        var oTile = composeNewBookmarkTile(
                             oParameters,
                             oTarget,
                             sContentProviderId
@@ -1736,7 +1712,6 @@ sap.ui.define([
                         if (bIsUrlBookmarkTile) {
                             oResolveTilePromise = new jQuery.Deferred();
                             oResolveTilePromise.resolve(that._getTileForUrl(oTile));
-
                         } else {
                             // resolve tile for later use (other tiles are resolved in getGroups)
                             oResolveTilePromise = that._getTileFromHash(oParameters.url);
@@ -1817,11 +1792,10 @@ sap.ui.define([
 
                 jQuery.when(oTargetGroup || this.getDefaultGroup(), oCdmSiteService.getSite())
                     .done(function (oGroup, oSite) {
-                        var oTarget,
-                            oIntent = oUrlParsing.parseShellHash(oBookmarkConfig.url),
-                            bIsUrlBookmarkTile = (oIntent === undefined);
+                        var oIntent = oUrlParsing.parseShellHash(oBookmarkConfig.url);
+                        var bIsUrlBookmarkTile = (oIntent === undefined);
 
-                        oTarget = bIsUrlBookmarkTile ? createNewTargetFromUrl(oBookmarkConfig.url) : createNewTargetFromIntent(oIntent);
+                        var oTarget = bIsUrlBookmarkTile ? createNewTargetFromUrl(oBookmarkConfig.url) : createNewTargetFromIntent(oIntent);
 
                         // building a grouptile but with vizConfig like a visualization
                         var oTile = {
@@ -1963,15 +1937,12 @@ sap.ui.define([
             // Visitor function that updates each encountered bookmark tile as necessary.
             function updateEach (oTile) {
                 return new jQuery.Deferred(function (oDeferred) {
-                    var oIntent, oNewTarget;
-
-                    var oTileComponent;
+                    var oNewTarget;
                     var bTileViewPropertiesChanged = false;
                     var oChangedTileViewProperties = {};
 
                     if (oParameters.url || oParameters.url === "") {
-                        oIntent = urlParsing.parseShellHash(oParameters.url);
-
+                        var oIntent = urlParsing.parseShellHash(oParameters.url);
                         if (!oIntent) {
                             // url bookmark tile
                             oNewTarget = createNewTargetFromUrl(oParameters.url);
@@ -2012,7 +1983,7 @@ sap.ui.define([
                     updateTileComposition(oTile, oParameters, oNewTarget);
 
                     if (bTileViewPropertiesChanged && mResolvedTiles[oTile.id]) {
-                        oTileComponent = mResolvedTiles[oTile.id].tileComponent;
+                        var oTileComponent = mResolvedTiles[oTile.id].tileComponent;
                         //tileComponent is defined in the getTileView method. In case of the direct start, tileComponent is not defined
                         if (oTileComponent) {
                             oTileComponent.tileSetVisualProperties(oChangedTileViewProperties);
@@ -2216,25 +2187,18 @@ sap.ui.define([
          * @private
          */
         this._onTileSettingsSave = function (oTile, oSettingsView) {
-            var oDeferred = new jQuery.Deferred(),
-                oUpdatedVisualTileProperties,
-                sNewTitle,
-                sNewInfo,
-                sNewSubtitle,
-                sOldTitle,
-                sOldInfo,
-                sOldSubtitle;
+            var 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);
+            var sNewTitle = oSettingsView.oTitleInput.getValue();
+            var sNewSubtitle = oSettingsView.oSubTitleInput.getValue();
+            var sNewInfo = oSettingsView.oInfoInput.getValue();
+            var sOldTitle = this.getTileTitle(oTile);
+            var sOldInfo = this.getTileInfo(oTile);
+            var sOldSubtitle = this.getTileSubtitle(oTile);
 
             // Check whether the end user changed the title or subtitle.
             // If nothing changed, return.
@@ -2245,7 +2209,7 @@ sap.ui.define([
                 return oDeferred.resolve().promise();
             }
 
-            oUpdatedVisualTileProperties = {};
+            var oUpdatedVisualTileProperties = {};
             if (sOldTitle !== sNewTitle) {
                 oUpdatedVisualTileProperties.title = sNewTitle;
                 // Add new properties also to tile for next startup
@@ -2296,7 +2260,7 @@ sap.ui.define([
                         .done(function () {
                             oDeferred.resolve();
                         });
-            });
+                });
 
             return oDeferred.promise();
         };
@@ -2312,13 +2276,11 @@ sap.ui.define([
          * @public
          */
         this.getTileActions = function (oTile) {
-            var aTileActions = [],
-                oTileSettingsAction,
-                oModel;
+            var aTileActions = [];
 
             if (this._isGroupTile(oTile) && !this._isFailedGroupTile(oTile)) {
                 // Create necessary model for dialog to pass actual properties
-                oModel = new JSONModel({
+                var oModel = new JSONModel({
                     config: {
                         display_title_text: this.getTileTitle(oTile),
                         display_subtitle_text: this.getTileSubtitle(oTile),
@@ -2327,7 +2289,7 @@ sap.ui.define([
                 });
 
                 // Get tile settings action
-                oTileSettingsAction = oUtils.getTileSettingsAction(oModel, this._onTileSettingsSave.bind(this, oTile), this.getTileType(oTile));
+                var oTileSettingsAction = oUtils.getTileSettingsAction(oModel, this._onTileSettingsSave.bind(this, oTile), this.getTileType(oTile));
                 aTileActions.push(oTileSettingsAction);
             }
             return aTileActions;
@@ -2356,7 +2318,14 @@ sap.ui.define([
             return oTile;
         }
 
-        // eslint-disable-next-line complexity
+        /**
+         * 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);
@@ -2386,44 +2355,18 @@ sap.ui.define([
             }
 
             if (oParameters.dataSource) {
-                oTile.dataSource = {};
-                deepExtend(oTile.dataSource, oParameters.dataSource);
-
-                // Just in case serviceUrl is set as well, we'll ignore it.
-                // Since dataSource is preferred.
-                delete oParameters.serviceUrl;
-            } else if (oParameters.dataSource === null) {
-                delete oTile.dataSource;
-                delete oTile.indicatorDataSource;
-
-                // Changes due to the preferred dataSource trumps any potential
-                // change due to the serviceUrl property.
-                delete oParameters.serviceUrl;
-            }
-
-            // Consider that the serviceUrlPath has no use when no dataSource exists
-            if ((oParameters.dataSource || oTile.dataSource) && oParameters.serviceUrlPath) {
-                oTile.indicatorDataSource = {
-                    path: oParameters.serviceUrlPath
+                oTile.dataSource = {
+                    type: oParameters.dataSource.type,
+                    settings: {
+                        odataVersion: ObjectPath.get(["dataSource", "settings", "odataVersion"], oParameters)
+                    }
                 };
             }
 
             if (oParameters.serviceUrl) {
-                if (oTile.dataSource) {
-                    // Warn about planned deprecation of serviceUrl.
-                    Log.warning(
-                        "`serviceUrl` is marked for deprecation in the future." +
-                        "It is not the preferred means for defining a dynamic " +
-                        "tile's data source. Please use `oParameter.dataSource`"
-                    );
-                    delete oTile.dataSource;
-                }
-
                 oTile.indicatorDataSource = {
                     path: oParameters.serviceUrl
                 };
-            } else if (oParameters.serviceUrl === null && !oTile.dataSource) {
-                delete oTile.indicatorDataSource;
             }
 
             if (oTile.indicatorDataSource && (oParameters.serviceRefreshInterval || oParameters.serviceRefreshInterval === 0)) {
@@ -2452,15 +2395,12 @@ sap.ui.define([
         }
 
         function isSameParameters (aParameters, aOthers) {
-            var sFirst, sOther;
-
             aParameters = aParameters || [];
             aOthers = aOthers || [];
 
             if (aParameters.length === aOthers.length) {
-                sFirst = transformParameterListToString(aParameters);
-                sOther = transformParameterListToString(aOthers);
-
+                var sFirst = transformParameterListToString(aParameters);
+                var sOther = transformParameterListToString(aOthers);
                 return sFirst === sOther;
             }
 
@@ -2477,9 +2417,7 @@ sap.ui.define([
         }
 
         function createNewTargetFromUrl (sUrl) {
-            return {
-                url: sUrl
-            };
+            return { url: sUrl };
         }
 
         function createNewTargetFromIntent (oIntent) {
@@ -2550,4 +2488,4 @@ sap.ui.define([
     LaunchPageAdapter.prototype = AdapterBase.prototype;
 
     return LaunchPageAdapter;
-}, /* bExport = */ false);
+});