@sapui5/sap.ushell 1.138.1 → 1.139.1

package/src/main/js/sap/ushell/components/tiles/indicatorTileUtils/smartBusinessUtil.js

@@ -17,7 +17,7 @@ sap.ui.define([
     "sap/ushell/utils/UrlParsing",
     "sap/ushell/services/CrossApplicationNavigation"
     // "sap/ushell/components/tiles/utils" // do not migrate
-], function (
+], (
     FilterOperator,
     odata4analytics,
     NumberFormat,
@@ -28,20 +28,20 @@ sap.ui.define([
     UrlParsing,
     oCrossAppNavigator
     // utils // do not migrate
-) {
+) => {
     "use strict";
 
     // shortcut for sap.ui.model.analytics.odata4analytics.ParameterizationRequest
-    var ParameterizationRequest = odata4analytics.ParameterizationRequest;
+    const ParameterizationRequest = odata4analytics.ParameterizationRequest;
 
     // shortcut for sap.ui.model.analytics.odata4analytics.QueryResultRequest
-    var QueryResultRequest = odata4analytics.QueryResultRequest;
+    const QueryResultRequest = odata4analytics.QueryResultRequest;
 
     // shortcut for sap.ui.model.analytics.odata4analytics.Model.ReferenceByModel
-    var ReferenceByModel = odata4analytics.Model.ReferenceByModel;
+    const ReferenceByModel = odata4analytics.Model.ReferenceByModel;
 
     // shortcut for sap.ui.model.analytics.odata4analytics.Model
-    var Model = odata4analytics.Model;
+    const Model = odata4analytics.Model;
 
     /* global oMeasure */
 
@@ -53,16 +53,16 @@ sap.ui.define([
     sap.ushell.components.tiles.indicatorTileUtils = sap.ushell.components.tiles.indicatorTileUtils || {};
     sap.ushell.components.tiles.indicatorTileUtils.util = sap.ushell.components.tiles.indicatorTileUtils.util || {};
     sap.ushell.components.tiles.indicatorTileUtils.util = (function (global, $) {
-        var cache = {},
-            timeUnitMap = {
-                "ANN": "years",
-                "WEE": "weeks",
-                "DAY": "days",
-                "HUR": "hours",
-                "MIN": "minutes"
-            },
-            scheduledJobMap = {},
-            dataCallDualTileMap = {};
+        const cache = {};
+        const timeUnitMap = {
+            ANN: "years",
+            WEE: "weeks",
+            DAY: "days",
+            HUR: "hours",
+            MIN: "minutes"
+        };
+        const scheduledJobMap = {};
+        const dataCallDualTileMap = {};
 
         return {
             getScheduledJob: function (key) {
@@ -94,11 +94,11 @@ sap.ui.define([
                 Log.info("Hana Adapter --> Add System to Service Url");
                 if (sap.ushell && sap.ushell.Container) {
                     if (system) {
-                        sap.ushell.Container.getServiceAsync("URLParsing").then(function (oURLParsing) {
+                        sap.ushell.Container.getServiceAsync("URLParsing").then((oURLParsing) => {
                             sap.ui.model.odata.ODataUtils.setOrigin(url, { alias: system });
                         });
                     } else {
-                        sap.ushell.Container.getServiceAsync("URLParsing").then(function (oURLParsing) {
+                        sap.ushell.Container.getServiceAsync("URLParsing").then((oURLParsing) => {
                             sap.ui.model.odata.ODataUtils.setOrigin(url);
                         });
                     }
@@ -108,28 +108,28 @@ sap.ui.define([
             getODataModelByServiceUri: function (sServiceUri) {
                 sServiceUri = this.addSystemToServiceUrl(sServiceUri);
                 if (!cache[sServiceUri]) {
-                    var oModel = new ODataModel(sServiceUri, { loadMetadataAsync: true, json: true });
+                    const oModel = new ODataModel(sServiceUri, { loadMetadataAsync: true, json: true });
                     cache[sServiceUri] = oModel;
                 }
                 return cache[sServiceUri];
             },
 
             getEdmType: function (sUri, propertyName) {
-                var oDataModel = null;
+                let oDataModel = null;
                 if (sUri instanceof ODataModel) {
                     oDataModel = sUri;
                 } else {
                     oDataModel = this.getODataModelByServiceUri(sUri);
                 }
                 if (oDataModel && oDataModel.getServiceMetadata()) {
-                    var serviceMetaData = oDataModel.getServiceMetadata();
-                    var entitySets = serviceMetaData.dataServices.schema[0].entityType;
+                    const serviceMetaData = oDataModel.getServiceMetadata();
+                    const entitySets = serviceMetaData.dataServices.schema[0].entityType;
                     if (entitySets) {
-                        for (var i = 0; i < entitySets.length; i++) {
-                            var entity = entitySets[i];
-                            var properties = entity.property;
-                            for (var j = 0; j < properties.length; j++) {
-                                var property = properties[j];
+                        for (let i = 0; i < entitySets.length; i++) {
+                            const entity = entitySets[i];
+                            const properties = entity.property;
+                            for (let j = 0; j < properties.length; j++) {
+                                const property = properties[j];
                                 if (property.name == propertyName) {
                                     return property.type;
                                 }
@@ -140,7 +140,7 @@ sap.ui.define([
             },
 
             getMillisecond: function (time, unit) {
-                var returnTime;
+                let returnTime;
                 switch (unit) {
                     case "seconds":
                         returnTime = time * 1000;
@@ -168,31 +168,31 @@ sap.ui.define([
             },
 
             getUTCDate: function () {
-                var now = new Date();
+                const now = new Date();
                 return now;
             },
 
             isCacheValid: function (chipId, chipLastUpdatedOn, cacheMaxAge, cacheMaxAgeUnit, tilePressed) {
-                var cachedValue = sap.ushell.components.tiles.indicatorTileUtils.cache.getKpivalueById(chipId);
+                const cachedValue = sap.ushell.components.tiles.indicatorTileUtils.cache.getKpivalueById(chipId);
                 if (!cachedValue) {
                     return false;
                 } else if (!(cacheMaxAge && Number(cacheMaxAge))) {
                     return true;
                 }
-                var cacheAge = this.getMillisecond(cacheMaxAge, timeUnitMap[cacheMaxAgeUnit]),
-                    cachedTime;
+                const cacheAge = this.getMillisecond(cacheMaxAge, timeUnitMap[cacheMaxAgeUnit]);
+                let cachedTime;
                 if (cachedValue.CachedTime instanceof Date) {
                     cachedTime = cachedValue.CachedTime && cachedValue.CachedTime.getTime();
                 } else {
                     cachedTime = cachedValue.CachedTime && parseInt(cachedValue.CachedTime.substr(6), 10); // 10 redix - http://eslint.org/docs/rules/radix
                 }
-                var curDate = this.getUTCDate();
+                const curDate = this.getUTCDate();
                 return (cachedTime >= chipLastUpdatedOn && cacheAge >= (curDate - cachedTime) && !tilePressed);
             },
 
             getMantissaLength: function (num) {
-                var sNum = num.toString();
-                var initPos = 0;
+                const sNum = num.toString();
+                let initPos = 0;
                 if (num < 0) {
                     initPos = 1;
                 }
@@ -210,17 +210,17 @@ sap.ui.define([
                 if (isACurrencyMeasure) {
                     return NumberFormat.getCurrencyInstance({ style: "short", showMeasure: false }).format(num, currencyCode);
                 }
-                var sD = 2;
-                var oFormatOptions = {
+                let sD = 2;
+                const oFormatOptions = {
                     style: "short"
                 };
-                var fNum;
+                let fNum;
                 if (!(oDecimal == -1 || oDecimal == null)) {
                     oFormatOptions.shortDecimals = Number(oDecimal);
                     oFormatOptions.minFractionDigits = Number(oDecimal);
                     oFormatOptions.maxFractionDigits = Number(oDecimal);
                 }
-                var valFormatter = NumberFormat.getInstance(oFormatOptions);
+                let valFormatter = NumberFormat.getInstance(oFormatOptions);
                 if (oScale == -2) {
                     if (num > 9999) {
                         fNum = "????";
@@ -235,7 +235,7 @@ sap.ui.define([
                         fNum = valFormatter.format(fNum);
                     }
                 } else if (oDecimal == -1 || oDecimal == null) {
-                    var mantissaLength = this.getMantissaLength(num);
+                    const mantissaLength = this.getMantissaLength(num);
                     if (!(mantissaLength % 3)) {
                         sD = 1;
                     }
@@ -263,7 +263,7 @@ sap.ui.define([
             },
 
             getTileTitleSubtitle: function (oChipApi) {
-                var titleObj = {};
+                const titleObj = {};
                 if (oChipApi.bag && oChipApi.bag.getBagIds() && oChipApi.bag.getBagIds().length) {
                     titleObj.title = oChipApi.bag.getBag("sb_tileProperties").getText("title") ||
                         oChipApi.bag.getBag("sb_tileProperties").getProperty("title") ||
@@ -280,29 +280,29 @@ sap.ui.define([
 
             // always invoke this function in context of individual tile
             scheduleFetchDataJob: function (isVisible) {
-                var config;
+                let config;
                 if (this.getView().getViewName().indexOf("DualTile") !== -1) {
                     config = this.oKpiTileView.oConfig;
                 } else {
                     config = this.oConfig;
                 }
-                var key = config.TILE_PROPERTIES.id + "data";
-                var runningJob = sap.ushell.components.tiles.indicatorTileUtils.util.getScheduledJob(key);
+                const key = `${config.TILE_PROPERTIES.id}data`;
+                let runningJob = sap.ushell.components.tiles.indicatorTileUtils.util.getScheduledJob(key);
                 if (runningJob) {
                     clearTimeout(runningJob);
                     runningJob = undefined;
                 }
-                var timeUnitMap = sap.ushell.components.tiles.indicatorTileUtils.util.getTimeUnitMap(),
-                    cachingTime = sap.ushell.components.tiles.indicatorTileUtils.util.getCachingTime(config),
-                    cachingTimeUnit = sap.ushell.components.tiles.indicatorTileUtils.util.getCachingTimeUnit(config),
-                    cacheMaxAge = sap.ushell.components.tiles.indicatorTileUtils.util.getMillisecond(cachingTime, timeUnitMap[cachingTimeUnit]),
-                    tempCacheTime;
+                const timeUnitMap = sap.ushell.components.tiles.indicatorTileUtils.util.getTimeUnitMap();
+                const cachingTime = sap.ushell.components.tiles.indicatorTileUtils.util.getCachingTime(config);
+                const cachingTimeUnit = sap.ushell.components.tiles.indicatorTileUtils.util.getCachingTimeUnit(config);
+                const cacheMaxAge = sap.ushell.components.tiles.indicatorTileUtils.util.getMillisecond(cachingTime, timeUnitMap[cachingTimeUnit]);
+                let tempCacheTime;
                 if (this.cacheTime instanceof Date) {
                     tempCacheTime = this.cacheTime;
                 } else {
                     tempCacheTime = new Date(parseInt(this.cacheTime.substr(6), 10));
                 }
-                var timeOut = cacheMaxAge - (sap.ushell.components.tiles.indicatorTileUtils.util.getUTCDate() - tempCacheTime);
+                let timeOut = cacheMaxAge - (sap.ushell.components.tiles.indicatorTileUtils.util.getUTCDate() - tempCacheTime);
                 if (timeOut <= 0) {
                     timeOut = 0;
                 } else if (timeOut > 2147483646) {
@@ -322,9 +322,9 @@ sap.ui.define([
 
             // always invoke this function in context of individual tile
             scheduleTimeStampJob: function () {
-                var key = this.oConfig.TILE_PROPERTIES.id + "time",
-                    runningJob = sap.ushell.components.tiles.indicatorTileUtils.util.getScheduledJob(key),
-                    tempCacheTime;
+                const key = `${this.oConfig.TILE_PROPERTIES.id}time`;
+                let runningJob = sap.ushell.components.tiles.indicatorTileUtils.util.getScheduledJob(key);
+                let tempCacheTime;
                 if (runningJob) {
                     clearTimeout(runningJob);
                     runningJob = undefined;
@@ -334,14 +334,14 @@ sap.ui.define([
                 } else {
                     tempCacheTime = new Date(parseInt(this.cacheTime.substr(6), 10), 13);
                 }
-                var timeOut = sap.ushell.components.tiles.indicatorTileUtils.util.getTimeDifference(sap.ushell.components.tiles.indicatorTileUtils.util.getUTCDate() - tempCacheTime);
+                const timeOut = sap.ushell.components.tiles.indicatorTileUtils.util.getTimeDifference(sap.ushell.components.tiles.indicatorTileUtils.util.getUTCDate() - tempCacheTime);
                 runningJob = setTimeout(this.setTimeStamp.bind(this, this.cacheTime), timeOut.timer);
                 sap.ushell.components.tiles.indicatorTileUtils.util.setScheduledJob(key, runningJob);
                 this.updateTimeStampjobScheduled = true;
             },
 
             getBoolValue: function (bVal) {
-                var bReturnVal = false;
+                let bReturnVal = false;
                 if (typeof bVal === "boolean" && bVal) {
                     bReturnVal = true;
                 }
@@ -377,11 +377,11 @@ sap.ui.define([
             },
 
             getTimeDifference: function (time) {
-                var retObject = {};
+                const retObject = {};
                 if (time) {
-                    var minutes = this.getMinutes(time);
-                    var hours = this.getHours(time);
-                    var days = this.getDays(time);
+                    const minutes = this.getMinutes(time);
+                    const hours = this.getHours(time);
+                    const days = this.getDays(time);
                     if (minutes < 5) {
                         retObject.time = 0;
                         retObject.unit = "minutes";
@@ -434,9 +434,9 @@ sap.ui.define([
             },
 
             getFrontendCacheQuery: function (chipId, userId, oPageChips, oTileApi) {
-                var cacheODataModel;
+                let cacheODataModel;
                 try {
-                    var uri = oTileApi.url.addSystemToServiceUrl("/sap/opu/odata/SSB/SMART_BUSINESS_RUNTIME_SRV");
+                    let uri = oTileApi.url.addSystemToServiceUrl("/sap/opu/odata/SSB/SMART_BUSINESS_RUNTIME_SRV");
                     uri = sap.ushell.components.tiles.indicatorTileUtils.util.cacheBustingMechanism(uri);
                     cacheODataModel = this.getODataModelByServiceUri(uri);
                     uri = "/CacheParameters(P_CacheType=1)/Results";
@@ -451,7 +451,7 @@ sap.ui.define([
             },
 
             isDualTile: function (oConfig) {
-                var tileType = oConfig && oConfig.TILE_PROPERTIES && oConfig.TILE_PROPERTIES.tileType;
+                const tileType = oConfig && oConfig.TILE_PROPERTIES && oConfig.TILE_PROPERTIES.tileType;
                 if (tileType.indexOf("DT-") == -1) {
                     return false;
                 }
@@ -459,19 +459,19 @@ sap.ui.define([
             },
 
             writeFrontendCacheByChipAndUserId: function (oTileApi, chipId, data, bUpdate, callback) {
-                var success = function (data) {
+                const success = function (data) {
                     Log.info("cache write successFully");
                     callback(data);
                 };
-                var error = function () {
+                const error = function () {
                     Log.error("cache update failed");
                     callback(null);
                 };
                 try {
-                    var uri = oTileApi.url.addSystemToServiceUrl("/sap/opu/odata/SSB/SMART_BUSINESS_RUNTIME_SRV/");
+                    let uri = oTileApi.url.addSystemToServiceUrl("/sap/opu/odata/SSB/SMART_BUSINESS_RUNTIME_SRV/");
                     uri = sap.ushell.components.tiles.indicatorTileUtils.util.cacheBustingMechanism(uri);
-                    var cacheODataModel = this.getODataModelByServiceUri(uri);
-                    var entity = "/CacheData";
+                    const cacheODataModel = this.getODataModelByServiceUri(uri);
+                    const entity = "/CacheData";
                     cacheODataModel.create(entity, data, {
                         async: true,
                         success: success,
@@ -483,29 +483,28 @@ sap.ui.define([
             },
 
             getKpiChipsOnPage: function (chipId, callback) {
-                var chipIdCollection = [];
-                sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (launchPage) {
-                    launchPage.getGroups().done(function (oGroups) {
+                const chipIdCollection = [];
+                sap.ushell.Container.getServiceAsync("FlpLaunchPage").then((launchPage) => {
+                    launchPage.getGroups().done((oGroups) => {
                         if (oGroups && oGroups instanceof Array && oGroups.length) {
                             Log.info("Group Chip fetch");
                         }
                         callback(chipId, chipIdCollection);
                     });
                 });
-
             },
 
             getFrontendCache: function (oConfig, oTileApi) {
-                var that = this;
-                var oldDeferred = sap.ushell.components.tiles.indicatorTileUtils.cache.getFrontEndCacheDeferredObject(oTileApi.url.getApplicationSystem());
-                var deferred;
+                const that = this;
+                let oldDeferred = sap.ushell.components.tiles.indicatorTileUtils.cache.getFrontEndCacheDeferredObject(oTileApi.url.getApplicationSystem());
+                let deferred;
                 if (oldDeferred) {
                     deferred = oldDeferred;
                 } else {
                     deferred = jQuery.Deferred();
                 }
-                var chipId = oConfig && oConfig.TILE_PROPERTIES && oConfig.TILE_PROPERTIES.id;
-                var cachedKpiValue = sap.ushell.components.tiles.indicatorTileUtils.cache.getKpivalueById(chipId);
+                const chipId = oConfig && oConfig.TILE_PROPERTIES && oConfig.TILE_PROPERTIES.id;
+                const cachedKpiValue = sap.ushell.components.tiles.indicatorTileUtils.cache.getKpivalueById(chipId);
                 if (cachedKpiValue) {
                     oldDeferred.resolve(true);
                 } else if (oldDeferred) {
@@ -513,18 +512,18 @@ sap.ui.define([
                 } else {
                     sap.ushell.components.tiles.indicatorTileUtils.cache.setFrontEndCacheDefferedObject(oTileApi.url.getApplicationSystem(), deferred);
                     oldDeferred = deferred;
-                    this.getKpiChipsOnPage(chipId, function (chipId, oPageChipCollection) {
+                    this.getKpiChipsOnPage(chipId, (chipId, oPageChipCollection) => {
                         if (oPageChipCollection) {
-                            var frontendCacheQuery = that.getFrontendCacheQuery(oPageChipCollection,
+                            const frontendCacheQuery = that.getFrontendCacheQuery(oPageChipCollection,
                                 sap.ushell.Container.getUser().getId(), oPageChipCollection, oTileApi);
                             if (frontendCacheQuery) {
                                 // attachMetadataLoaded raja
-                                var frontendModel = frontendCacheQuery.oModel;
-                                var cacheQueriUri = frontendCacheQuery.uri;
-                                var isCached = false;
-                                frontendModel.read(cacheQueriUri, null, null, true, function (data) {
+                                const frontendModel = frontendCacheQuery.oModel;
+                                const cacheQueriUri = frontendCacheQuery.uri;
+                                let isCached = false;
+                                frontendModel.read(cacheQueriUri, null, null, true, (data) => {
                                     if (data && data.results && data.results instanceof Array && data.results.length) {
-                                        jQuery.each(data.results, function (index, cachedData) {
+                                        jQuery.each(data.results, (index, cachedData) => {
                                             sap.ushell.components.tiles.indicatorTileUtils.cache.setKpivalueById(cachedData.ChipId, cachedData);
                                         });
                                     }
@@ -532,9 +531,9 @@ sap.ui.define([
                                         isCached = true;
                                     }
                                     oldDeferred.resolve(isCached);
-                                }, function (eObject) {
+                                }, (eObject) => {
                                     if (eObject && eObject.response) {
-                                        Log.error(eObject.message + " : " + eObject.request.requestUri);
+                                        Log.error(`${eObject.message} : ${eObject.request.requestUri}`);
                                     }
                                     oldDeferred.reject();
                                 });
@@ -550,7 +549,7 @@ sap.ui.define([
             },
 
             getModelerRuntimeServiceModel: function () {
-                var uri = "/sap/hba/r/sb/core/odata/runtime/SMART_BUSINESS.xsodata";
+                let uri = "/sap/hba/r/sb/core/odata/runtime/SMART_BUSINESS.xsodata";
                 uri = sap.ushell.components.tiles.indicatorTileUtils.util.cacheBustingMechanism(uri);
                 return this.getODataModelByServiceUri(uri);
             },
@@ -564,13 +563,13 @@ sap.ui.define([
             },
 
             prepareFilterStructure: function (filter, addFilters) {
-                var variantData = [];
+                const variantData = [];
                 if (addFilters) {
                     filter = filter.concat(addFilters);
                 }
 
-                for (var itr = 0; itr < filter.length; itr++) {
-                    var pushObj = {};
+                for (let itr = 0; itr < filter.length; itr++) {
+                    const pushObj = {};
                     pushObj.comparator = filter[itr].OPERATOR;
                     pushObj.filterPropertyName = filter[itr].NAME;
 
@@ -590,7 +589,7 @@ sap.ui.define([
             getODataModelByServiceUriFromChipAPI: function (sServiceUri, oTileApi) {
                 sServiceUri = oTileApi.url.addSystemToServiceUrl(sServiceUri);
                 if (!cache[sServiceUri]) {
-                    var oModel = new ODataModel(sServiceUri, true);
+                    const oModel = new ODataModel(sServiceUri, true);
                     cache[sServiceUri] = oModel;
                 }
                 return cache[sServiceUri];
@@ -598,15 +597,15 @@ sap.ui.define([
 
             cacheBustingMechanism: function (sUrl) {
                 if (window["sap-ushell-config"].cacheBusting.cacheBusterToken) {
-                    var cacheBusting = window["sap-ushell-config"].cacheBusting && window["sap-ushell-config"].cacheBusting.cacheBusterToken;
-                    sUrl = sUrl + "?_=" + cacheBusting;
+                    const cacheBusting = window["sap-ushell-config"].cacheBusting && window["sap-ushell-config"].cacheBusting.cacheBusterToken;
+                    sUrl = `${sUrl}?_=${cacheBusting}`;
                 }
                 return sUrl;
             },
 
             getRunTimeUri: function (sPlatform) {
-                var urlWithHANA = "/sap/hba/r/sb/core/odata/runtime/SMART_BUSINESS.xsodata";
-                var urlWithoutHANA = "/sap/opu/odata/SSB/SMART_BUSINESS_RUNTIME_SRV";
+                let urlWithHANA = "/sap/hba/r/sb/core/odata/runtime/SMART_BUSINESS.xsodata";
+                let urlWithoutHANA = "/sap/opu/odata/SSB/SMART_BUSINESS_RUNTIME_SRV";
                 if (sPlatform.toUpperCase() == "HANA") {
                     if (window["sap-ushell-config"].cacheBusting) {
                         urlWithHANA = sap.ushell.components.tiles.indicatorTileUtils.util.cacheBustingMechanism(urlWithHANA);
@@ -620,11 +619,11 @@ sap.ui.define([
             },
 
             getFilterFromRunTimeService: function (oConfig, oTileApi, fnS, fnE) {
-                var sPlatform = oConfig.TILE_PROPERTIES.sb_metadata;
-                var KPI_RUNTIME_ODATA_MODEL = this.getODataModelByServiceUriFromChipAPI(this.getRunTimeUri(sPlatform), oTileApi);
-                var filterValue = "ID eq '#EVALUATIONID'".replace("#EVALUATIONID", oConfig.EVALUATION.ID);
-                var kpiEvaluationFilterODataReadRef = KPI_RUNTIME_ODATA_MODEL.read("/EVALUATION_FILTERS", null, { "$filter": filterValue }, true, function (data) {
-                    var filters = [];
+                const sPlatform = oConfig.TILE_PROPERTIES.sb_metadata;
+                const KPI_RUNTIME_ODATA_MODEL = this.getODataModelByServiceUriFromChipAPI(this.getRunTimeUri(sPlatform), oTileApi);
+                const filterValue = "ID eq '#EVALUATIONID'".replace("#EVALUATIONID", oConfig.EVALUATION.ID);
+                const kpiEvaluationFilterODataReadRef = KPI_RUNTIME_ODATA_MODEL.read("/EVALUATION_FILTERS", null, { $filter: filterValue }, true, function (data) {
+                    let filters = [];
                     if (data.results.length) {
                         filters = data.results;
                     }
@@ -634,35 +633,35 @@ sap.ui.define([
             },
 
             _getOData4AnalyticsObject: function (sUri) {
-                var oModel = null;
+                let oModel = null;
                 if (sUri instanceof ODataModel) {
                     oModel = sUri;
                 } else if (typeof sUri === "string") {
                     oModel = this.getODataModelByServiceUri(sUri);
                 } else {
-                    throw new Error("Invalid Input to Create ODataModel Object : " + sUri);
+                    throw new Error(`Invalid Input to Create ODataModel Object : ${sUri}`);
                 }
-                var O4A = new Model(ReferenceByModel(oModel));
+                const O4A = new Model(ReferenceByModel(oModel));
                 return O4A;
             },
 
             findTextPropertyForDimension: function (sUri, entitySet, dimension) {
                 try {
-                    var o4a = this._getOData4AnalyticsObject(sUri);
-                    var queryResult = o4a.findQueryResultByName(entitySet);
-                    var oDimension = queryResult.findDimensionByName(dimension);
+                    const o4a = this._getOData4AnalyticsObject(sUri);
+                    const queryResult = o4a.findQueryResultByName(entitySet);
+                    const oDimension = queryResult.findDimensionByName(dimension);
                     if (oDimension.getTextProperty()) {
                         return oDimension.getTextProperty().name;
                     }
                     return dimension;
                 } catch (e) {
-                    Log.error("Error Fetching Text Property for " + dimension + " : " + e.toString());
+                    Log.error(`Error Fetching Text Property for ${dimension} : ${e.toString()}`);
                 }
             },
 
             getEvalValueMeasureName: function (oConfig, type, retType) {
-                var evalValue = oConfig.EVALUATION_VALUES;
-                for (var i = 0; i < evalValue.length; i++) {
+                const evalValue = oConfig.EVALUATION_VALUES;
+                for (let i = 0; i < evalValue.length; i++) {
                     if (evalValue[i].TYPE == type) {
                         if (retType === "FIXED") {
                             return evalValue[i].FIXED;
@@ -676,7 +675,7 @@ sap.ui.define([
              * get coded colorName
              */
             getSemanticColorName: function (applyColor) {
-                var status = "";
+                let status = "";
                 if (applyColor == "Error") {
                     status = "sb.error";
                 }
@@ -697,45 +696,45 @@ sap.ui.define([
              * @param
              */
             setTooltipInTile: function (oControl, tileType, valueObj) {
-                var toolTip = "";
-                var oResourceBundle = sap.ushell.components.tiles.utils.getResourceBundle();
+                let toolTip = "";
+                const oResourceBundle = sap.ushell.components.tiles.utils.getResourceBundle();
                 if (tileType == "NT" || tileType == "DT") {
                     if (valueObj.status) {
-                        toolTip += oResourceBundle.getText("sb.status") + ": " + oResourceBundle.getText(valueObj.status) + "\n";
+                        toolTip += `${oResourceBundle.getText("sb.status")}: ${oResourceBundle.getText(valueObj.status)}\n`;
                     }
                     if (valueObj.actual) {
-                        toolTip += oResourceBundle.getText("sb.actual") + ": " + valueObj.actual + "\n";
+                        toolTip += `${oResourceBundle.getText("sb.actual")}: ${valueObj.actual}\n`;
                     }
                     if (valueObj.target) {
-                        toolTip += oResourceBundle.getText("sb.target") + ": " + valueObj.target + "\n";
+                        toolTip += `${oResourceBundle.getText("sb.target")}: ${valueObj.target}\n`;
                     }
                     if (valueObj.cH) {
-                        toolTip += oResourceBundle.getText("sb.ch") + ": " + valueObj.cH + "\n";
+                        toolTip += `${oResourceBundle.getText("sb.ch")}: ${valueObj.cH}\n`;
                     }
                     if (valueObj.wH) {
-                        toolTip += oResourceBundle.getText("sb.wh") + ": " + valueObj.wH + "\n";
+                        toolTip += `${oResourceBundle.getText("sb.wh")}: ${valueObj.wH}\n`;
                     }
                     if (valueObj.wL) {
-                        toolTip += oResourceBundle.getText("sb.wl") + ": " + valueObj.wL + "\n";
+                        toolTip += `${oResourceBundle.getText("sb.wl")}: ${valueObj.wL}\n`;
                     }
                     if (valueObj.cL) {
-                        toolTip += oResourceBundle.getText("sb.cl") + ": " + valueObj.cL + "\n";
+                        toolTip += `${oResourceBundle.getText("sb.cl")}: ${valueObj.cL}\n`;
                     }
                 } if (tileType == "CONT" || tileType == "COMP") {
                     if (valueObj.measure && tileType == "CONT") {
                         if (valueObj && valueObj.contributionTile.contributionTile && valueObj.contributionTile.contributionTile[1] === "asc") {
-                            toolTip += oResourceBundle.getText("sb.bottomn") + ": " + valueObj.contributionTile[0] + "\n";
+                            toolTip += `${oResourceBundle.getText("sb.bottomn")}: ${valueObj.contributionTile[0]}\n`;
                         } else if (valueObj && valueObj.contributionTile.contributionTile && valueObj.contributionTile.contributionTile.length) {
-                            toolTip += oResourceBundle.getText("sb.topn") + ": " + valueObj.contributionTile[0] + "\n";
+                            toolTip += `${oResourceBundle.getText("sb.topn")}: ${valueObj.contributionTile[0]}\n`;
                         }
                     } if (valueObj.m1 && ((valueObj.v1 == undefined || valueObj.v1 == null) ? false : valueObj.v1.toString()) && valueObj.c1) {
-                        toolTip += valueObj.m1 + ": " + valueObj.v1 + " " + oResourceBundle.getText(valueObj.c1) + "\n";
+                        toolTip += `${valueObj.m1}: ${valueObj.v1} ${oResourceBundle.getText(valueObj.c1)}\n`;
                     }
                     if (valueObj.m2 && ((valueObj.v2 == undefined || valueObj.v2 == null) ? false : valueObj.v2.toString()) && valueObj.c2) {
-                        toolTip += valueObj.m2 + ": " + valueObj.v2 + " " + oResourceBundle.getText(valueObj.c2) + "\n";
+                        toolTip += `${valueObj.m2}: ${valueObj.v2} ${oResourceBundle.getText(valueObj.c2)}\n`;
                     }
                     if (valueObj.m3 && ((valueObj.v3 == undefined || valueObj.v3 == null) ? false : valueObj.v3.toString()) && valueObj.c3) {
-                        toolTip += valueObj.m3 + ": " + valueObj.v3 + " " + oResourceBundle.getText(valueObj.c3) + "\n";
+                        toolTip += `${valueObj.m3}: ${valueObj.v3} ${oResourceBundle.getText(valueObj.c3)}\n`;
                     }
                 }
                 if (oControl && oControl.setTooltip) {
@@ -751,9 +750,9 @@ sap.ui.define([
              */
             _getFormattedTileProperties: function (tileProperties) {
                 tileProperties = tileProperties || {};
-                var properties = ["sb_metadata", "sb_navigation", "sb_catalog"];
-                var isPlatformPresent = false;
-                for (var i = 0; !isPlatformPresent && i < properties.length; i++) {
+                const properties = ["sb_metadata", "sb_navigation", "sb_catalog"];
+                let isPlatformPresent = false;
+                for (let i = 0; !isPlatformPresent && i < properties.length; i++) {
                     isPlatformPresent = isPlatformPresent || new UriParameters(window.location.href).get(properties[i]) || tileProperties[properties[i]];
                 }
                 tileProperties.sb_metadata = (new UriParameters(window.location.href).get("sb_metadata") || tileProperties.sb_metadata || "HANA").toLowerCase();
@@ -771,10 +770,10 @@ sap.ui.define([
              * @returns {object} Returns call results
              */
             getEvaluationDetailsFromRunTimeService: function (oEntitySet, sPlatform, oId, callback) {
-                var KPI_RUNTIME_ODATA_MODEL = this.getODataModelByServiceUri(this.getRunTimeUri(sPlatform));
-                var filterValue = "ID eq '#EVALUATIONID'".replace("#EVALUATIONID", oId);
-                KPI_RUNTIME_ODATA_MODEL.read(oEntitySet, null, { "$filter": filterValue }, true, function (data) {
-                    var filters = [];
+                const KPI_RUNTIME_ODATA_MODEL = this.getODataModelByServiceUri(this.getRunTimeUri(sPlatform));
+                const filterValue = "ID eq '#EVALUATIONID'".replace("#EVALUATIONID", oId);
+                KPI_RUNTIME_ODATA_MODEL.read(oEntitySet, null, { $filter: filterValue }, true, function (data) {
+                    let filters = [];
                     if (data.results.length) {
                         filters = data.results;
                     }
@@ -784,17 +783,17 @@ sap.ui.define([
 
             getParsedChip: function (sConfig, bIsPreview, callback) {
                 try {
-                    var parsedChipConfig = {};
-                    var chipJson = JSON.parse(sConfig);
-                    var evaluationId = JSON.parse(chipJson.TILE_PROPERTIES).evaluationId || "";
+                    const parsedChipConfig = {};
+                    const chipJson = JSON.parse(sConfig);
+                    const evaluationId = JSON.parse(chipJson.TILE_PROPERTIES).evaluationId || "";
                     if (chipJson.TILE_PROPERTIES) {
-                        var tileProperties = JSON.parse(chipJson.TILE_PROPERTIES);
+                        const tileProperties = JSON.parse(chipJson.TILE_PROPERTIES);
                         if (tileProperties
                             && (tileProperties.instanceId || tileProperties.catalogId)) {
                             return false;
                         }
                     }
-                    var that = this;
+                    const that = this;
                     if (chipJson.blankTile) {
                         parsedChipConfig.BLANKTILE = chipJson.blankTile;
                     }
@@ -816,7 +815,7 @@ sap.ui.define([
 
                     parsedChipConfig.TILE_PROPERTIES = this._getFormattedTileProperties(JSON.parse(chipJson.TILE_PROPERTIES));
 
-                    var sPlatform = parsedChipConfig.TILE_PROPERTIES.sb_metadata;
+                    const sPlatform = parsedChipConfig.TILE_PROPERTIES.sb_metadata;
 
                     if (chipJson.EVALUATION_FILTERS) {
                         parsedChipConfig.EVALUATION_FILTERS = JSON.parse(chipJson.EVALUATION_FILTERS);
@@ -830,7 +829,7 @@ sap.ui.define([
                                     return parsedChipConfig;
                                 }
                             } else if (!bIsPreview) {
-                                that.getEvaluationDetailsFromRunTimeService("/EVALUATIONS", sPlatform, evaluationId, function (filters) {
+                                that.getEvaluationDetailsFromRunTimeService("/EVALUATIONS", sPlatform, evaluationId, (filters) => {
                                     parsedChipConfig.EVALUATION = filters;
                                     if (callback) {
                                         callback(parsedChipConfig);
@@ -844,7 +843,7 @@ sap.ui.define([
                                 return parsedChipConfig;
                             }
                         } else if (!bIsPreview) {
-                            that.getEvaluationDetailsFromRunTimeService("/EVALUATION_VALUES", sPlatform, evaluationId, function (filters) {
+                            that.getEvaluationDetailsFromRunTimeService("/EVALUATION_VALUES", sPlatform, evaluationId, (filters) => {
                                 parsedChipConfig.EVALUATION_VALUES = filters;
                                 if (chipJson.EVALUATION) {
                                     parsedChipConfig.EVALUATION = JSON.parse(chipJson.EVALUATION);
@@ -854,7 +853,7 @@ sap.ui.define([
                                         return parsedChipConfig;
                                     }
                                 } else {
-                                    that.getEvaluationDetailsFromRunTimeService("/EVALUATIONS", sPlatform, evaluationId, function (filters) {
+                                    that.getEvaluationDetailsFromRunTimeService("/EVALUATIONS", sPlatform, evaluationId, (filters) => {
                                         parsedChipConfig.EVALUATION = filters;
                                         if (callback) {
                                             callback(parsedChipConfig);
@@ -876,7 +875,7 @@ sap.ui.define([
                             return parsedChipConfig;
                         }
                     } else {
-                        that.getEvaluationDetailsFromRunTimeService("/EVALUATION_FILTERS", sPlatform, evaluationId, function (filters) {
+                        that.getEvaluationDetailsFromRunTimeService("/EVALUATION_FILTERS", sPlatform, evaluationId, (filters) => {
                             parsedChipConfig.EVALUATION_FILTERS = filters;
                             if (chipJson.EVALUATION_VALUES) {
                                 parsedChipConfig.EVALUATION_VALUES = JSON.parse(chipJson.EVALUATION_VALUES);
@@ -888,7 +887,7 @@ sap.ui.define([
                                         return parsedChipConfig;
                                     }
                                 } else {
-                                    that.getEvaluationDetailsFromRunTimeService("/EVALUATIONS", sPlatform, evaluationId, function (filters) {
+                                    that.getEvaluationDetailsFromRunTimeService("/EVALUATIONS", sPlatform, evaluationId, (filters) => {
                                         parsedChipConfig.EVALUATION = filters;
                                         if (callback) {
                                             callback(parsedChipConfig);
@@ -898,7 +897,7 @@ sap.ui.define([
                                     });
                                 }
                             } else {
-                                that.getEvaluationDetailsFromRunTimeService("/EVALUATION_VALUES", sPlatform, evaluationId, function (filters) {
+                                that.getEvaluationDetailsFromRunTimeService("/EVALUATION_VALUES", sPlatform, evaluationId, (filters) => {
                                     parsedChipConfig.EVALUATION_VALUES = filters;
                                     if (chipJson.EVALUATION) {
                                         parsedChipConfig.EVALUATION = JSON.parse(chipJson.EVALUATION);
@@ -908,7 +907,7 @@ sap.ui.define([
                                             return parsedChipConfig;
                                         }
                                     } else {
-                                        that.getEvaluationDetailsFromRunTimeService("/EVALUATIONS", sPlatform, evaluationId, function (filters) {
+                                        that.getEvaluationDetailsFromRunTimeService("/EVALUATIONS", sPlatform, evaluationId, (filters) => {
                                             parsedChipConfig.EVALUATION = filters;
                                             if (callback) {
                                                 callback(parsedChipConfig);
@@ -933,8 +932,8 @@ sap.ui.define([
              * @returns {string} Returns navigation hash
              */
             getNavigationTarget: function (jConfig, system) {
-                var each;
-                var param = {};
+                let each;
+                const param = {};
                 param.evaluationId = jConfig.EVALUATION.ID;
                 param.chipId = jConfig.TILE_PROPERTIES.id;
                 if (system) {
@@ -961,8 +960,8 @@ sap.ui.define([
                     for (each in jConfig.ADDITIONAL_APP_PARAMETERS) {
                         if (jConfig.ADDITIONAL_APP_PARAMETERS.hasOwnProperty(each)) {
                             if (jConfig.ADDITIONAL_APP_PARAMETERS[each].constructor == Array) {
-                                var addApp = jConfig.ADDITIONAL_APP_PARAMETERS[each];
-                                for (var i = 0; i < addApp.length; i++) {
+                                const addApp = jConfig.ADDITIONAL_APP_PARAMETERS[each];
+                                for (let i = 0; i < addApp.length; i++) {
                                     param[each] = addApp[i];
                                 }
                             } else {
@@ -970,7 +969,7 @@ sap.ui.define([
                             }
                         }
                     }
-                } var toOurApp = oCrossAppNavigator && oCrossAppNavigator.hrefForExternal({
+                } let toOurApp = oCrossAppNavigator && oCrossAppNavigator.hrefForExternal({
                     target: {
                         semanticObject: jConfig.TILE_PROPERTIES.semanticObject,
                         action: jConfig.TILE_PROPERTIES.semanticAction
@@ -978,11 +977,11 @@ sap.ui.define([
                     params: param
                 }) || "";
                 if (jConfig.ADDITIONAL_FILTERS) {
-                    var addFilter = jConfig.ADDITIONAL_FILTERS;
-                    var addFilterString = "&";
-                    for (var j = 0; j < addFilter.length; j++) {
+                    const addFilter = jConfig.ADDITIONAL_FILTERS;
+                    let addFilterString = "&";
+                    for (let j = 0; j < addFilter.length; j++) {
                         if (addFilter[j].OPERATOR === "EQ") {
-                            addFilterString = addFilterString + "/" + addFilter[j].NAME + "=" + addFilter[j].VALUE_1;
+                            addFilterString = `${addFilterString}/${addFilter[j].NAME}=${addFilter[j].VALUE_1}`;
                         }
                     } toOurApp += addFilterString;
                 }
@@ -996,16 +995,16 @@ sap.ui.define([
              * @returns {string} returns title for tile
              */
             getChipTitle: function (jConfig) {
-                var title = "";
+                let title = "";
                 if (jConfig) {
-                    var chipIndicator = jConfig.EVALUATION || {};
+                    const chipIndicator = jConfig.EVALUATION || {};
                     title = chipIndicator.INDICATOR_TITLE || "";
                 }
                 return title;
             },
 
             getstringifyTileConfig: function (jConfig) {
-                var sConfig = {};
+                const sConfig = {};
                 sConfig.EVALUATION = JSON.stringify(jConfig.EVALUATION);
                 sConfig.EVALUATION_FILTERS = JSON.stringify(jConfig.EVALUATION_FILTERS);
                 sConfig.EVALUATION_VALUES = JSON.stringify(jConfig.EVALUATION_VALUES);
@@ -1020,53 +1019,53 @@ sap.ui.define([
              * @returns {string} returns subtitle for tile
              */
             getChipSubTitle: function (jConfig) {
-                var sTitle = "";
+                let sTitle = "";
                 if (jConfig) {
-                    var chipEvaluation = jConfig.EVALUATION || {};
+                    const chipEvaluation = jConfig.EVALUATION || {};
                     sTitle = chipEvaluation.TITLE || "";
                 }
                 return sTitle;
             },
 
             getAllMeasures: function (sUri, entitySet) {
-                var measures = [];
+                let measures = [];
                 try {
-                    var o4a = this._getOData4AnalyticsObject(sUri);
-                    var queryResult = o4a.findQueryResultByName(entitySet);
+                    const o4a = this._getOData4AnalyticsObject(sUri);
+                    const queryResult = o4a.findQueryResultByName(entitySet);
                     measures = queryResult.getAllMeasureNames();
                 } catch (e) {
-                    Log.error("Error Fetching All Measures : " + e.toString());
+                    Log.error(`Error Fetching All Measures : ${e.toString()}`);
                 }
                 return measures;
             },
 
             getFormattingMetadata: function (sUri, entitySet, propertyName) {
-                var formattingMetadata = {};
+                const formattingMetadata = {};
                 formattingMetadata._hasCurrency = false;
                 formattingMetadata._hasSapText = false;
 
-                var modelReferenceBy = null;
+                let modelReferenceBy = null;
                 if (sUri instanceof ODataModel) {
                     modelReferenceBy = ReferenceByModel(sUri);
                 } else {
-                    var tempModel = this.getODataModelByServiceUri(sUri);
+                    const tempModel = this.getODataModelByServiceUri(sUri);
                     modelReferenceBy = ReferenceByModel(tempModel);
                 }
-                var O4A = new Model(modelReferenceBy);
-                var queryResult = O4A.findQueryResultByName(entitySet);
+                const O4A = new Model(modelReferenceBy);
+                const queryResult = O4A.findQueryResultByName(entitySet);
 
-                var measures = queryResult.getAllMeasures();
+                const measures = queryResult.getAllMeasures();
 
                 if (measures[propertyName]) {
-                    var sapTextPropertyName = (measures[propertyName]._oTextProperty && measures[propertyName]._oTextProperty.name) ?
+                    const sapTextPropertyName = (measures[propertyName]._oTextProperty && measures[propertyName]._oTextProperty.name) ?
                         measures[propertyName]._oTextProperty.name : "";
 
                     if (sapTextPropertyName != "") {
                         formattingMetadata._hasSapText = true;
                         formattingMetadata._sapTextColumn = sapTextPropertyName;
                     } else if (measures[propertyName].hasOwnProperty("_oUnitProperty")) {
-                        var extensions = measures[propertyName]._oUnitProperty.extensions;
-                        for (var i = 0; i < measures[propertyName]._oUnitProperty.extensions.length; i++) {
+                        const extensions = measures[propertyName]._oUnitProperty.extensions;
+                        for (let i = 0; i < measures[propertyName]._oUnitProperty.extensions.length; i++) {
                             if (extensions[i].name === "semantics" && extensions[i].value === "currency-code") {
                                 formattingMetadata._hasCurrency = true;
                                 formattingMetadata._currencyColumn = measures[propertyName]._oUnitProperty.name;
@@ -1078,8 +1077,8 @@ sap.ui.define([
 
             getAllDimensions: function (sUri, entitySet) {
                 function intersectionOfArray (array1, array2) {
-                    var ai = 0, bi = 0;
-                    var result = [];
+                    let ai = 0; let bi = 0;
+                    const result = [];
                     while (ai < array1.length && bi < array2.length) {
                         if (array1[ai] < array2[bi]) {
                             ai++;
@@ -1092,19 +1091,19 @@ sap.ui.define([
                         }
                     } return result;
                 }
-                var dimensions = [];
-                var aFilterablePropertyNames = [];
+                let dimensions = [];
+                let aFilterablePropertyNames = [];
                 try {
-                    var o4a = this._getOData4AnalyticsObject(sUri);
-                    var queryResult = o4a.findQueryResultByName(entitySet);
-                    var entityType = queryResult.getEntityType();
+                    const o4a = this._getOData4AnalyticsObject(sUri);
+                    const queryResult = o4a.findQueryResultByName(entitySet);
+                    const entityType = queryResult.getEntityType();
                     aFilterablePropertyNames = entityType.getFilterablePropertyNames();
                     dimensions = queryResult.getAllDimensionNames();
                     if (aFilterablePropertyNames && aFilterablePropertyNames.length) {
                         dimensions = intersectionOfArray(aFilterablePropertyNames.sort(), dimensions.sort());
                     }
                 } catch (e) {
-                    Log.error("Error Fetching All Dimesions : " + e.toString());
+                    Log.error(`Error Fetching All Dimesions : ${e.toString()}`);
                 }
                 return dimensions;
             },
@@ -1125,20 +1124,20 @@ sap.ui.define([
                 function _replaceSingleQuoteWithDoubleSingleQuote (str) {
                     return str.replace(/'/g, "''");
                 }
-                var tmpDimension = null;
-                var changeToYYYYMMDDHHMMSS = function () { };
-                var _processODataDateTime = function () { };
+                let tmpDimension = null;
+                let changeToYYYYMMDDHHMMSS = function () { };
+                let _processODataDateTime = function () { };
                 try {
-                    var modelReferenceBy = null;
+                    let modelReferenceBy = null;
                     if (sUri instanceof ODataModel) {
                         modelReferenceBy = ReferenceByModel(sUri);
                     } else {
-                        var tempModel = this.getODataModelByServiceUri(sUri);
+                        const tempModel = this.getODataModelByServiceUri(sUri);
                         modelReferenceBy = ReferenceByModel(tempModel);
                     }
-                    var O4A = new Model(modelReferenceBy);
-                    var oQueryResult = O4A.findQueryResultByName(entitySet);
-                    var oQueryResultRequest = new QueryResultRequest(oQueryResult);
+                    const O4A = new Model(modelReferenceBy);
+                    const oQueryResult = O4A.findQueryResultByName(entitySet);
+                    const oQueryResultRequest = new QueryResultRequest(oQueryResult);
                     if (measure) {
                         oQueryResultRequest.setMeasures(measure.split(","));
                         oQueryResultRequest.includeMeasureRawFormattedValueUnit(null, true, true, true);
@@ -1151,7 +1150,7 @@ sap.ui.define([
 
                         for (var i = 0; i < tmpDimension.length; i++) {
                             oQueryResultRequest.addToAggregationLevel([tmpDimension[i]]);
-                            var tmp = oQueryResult.getAllDimensions();
+                            const tmp = oQueryResult.getAllDimensions();
                             if (tmp[tmpDimension[i]].getTextProperty() != null) {
                                 oQueryResultRequest.includeDimensionKeyTextAttributes([tmpDimension[i]], true, true, null);
                             }
@@ -1159,9 +1158,9 @@ sap.ui.define([
                     }
 
                     if (variants && variants.length) {
-                        var filterVariants = [];
-                        var inputParamsVariants = [];
-                        var l;
+                        const filterVariants = [];
+                        const inputParamsVariants = [];
+                        let l;
                         for (i = 0, l = variants.length; i < l; i++) {
                             var each = variants[i];
                             if (each.type === "PA") {
@@ -1170,8 +1169,8 @@ sap.ui.define([
                                 filterVariants.push(each);
                             }
                         } changeToYYYYMMDDHHMMSS = function (odate) {
-                            var dateStr = odate.toJSON();
-                            var lastChar = dateStr.charAt(dateStr.length - 1).toUpperCase();
+                            let dateStr = odate.toJSON();
+                            const lastChar = dateStr.charAt(dateStr.length - 1).toUpperCase();
                             if (lastChar.charCodeAt(0) >= 65 && lastChar.charCodeAt(0) <= 90) {
                                 dateStr = dateStr.slice(0, -1);
                             }
@@ -1183,19 +1182,19 @@ sap.ui.define([
                                     if (junkValue == +junkValue) {
                                         junkValue = window.parseInt(junkValue);
                                     }
-                                    var date = new Date(junkValue);
-                                    var time = date.getTime();
+                                    const date = new Date(junkValue);
+                                    const time = date.getTime();
                                     if (isNaN(time)) {
                                         return junkValue;
                                     }
                                     return changeToYYYYMMDDHHMMSS(date);
                                 } catch (e) {
-                                    //empty
+                                    // empty
                                 }
                             } return junkValue;
                         };
                         if (filterVariants.length) {
-                            var oFilterExpression = oQueryResultRequest.getFilterExpression();
+                            const oFilterExpression = oQueryResultRequest.getFilterExpression();
                             for (i = 0, l = filterVariants.length; i < l; i++) {
                                 each = filterVariants[i];
                                 if (this.getEdmType(sUri, each.filterPropertyName) == "Edm.DateTime") {
@@ -1205,8 +1204,8 @@ sap.ui.define([
                                 if (each.comparator == FilterOperator.BT) {
                                     oFilterExpression.addCondition(each.filterPropertyName, each.comparator, _replaceSingleQuoteWithDoubleSingleQuote(each.value), each.valueTo);
                                 } else {
-                                    var multipleFilterValueArray = each.value.split(",");
-                                    for (var j = 0, k = multipleFilterValueArray.length; j < k; j++) {
+                                    const multipleFilterValueArray = each.value.split(",");
+                                    for (let j = 0, k = multipleFilterValueArray.length; j < k; j++) {
                                         oFilterExpression.addCondition(each.filterPropertyName, each.comparator,
                                             _replaceSingleQuoteWithDoubleSingleQuote(multipleFilterValueArray[j].replace(/\^\|/g, ",")), null);
                                     }
@@ -1214,9 +1213,9 @@ sap.ui.define([
                             }
                         } if (inputParamsVariants.length) {
                             if (oQueryResult.getParameterization()) {
-                                var oParamRequest = new ParameterizationRequest(oQueryResult.getParameterization());
-                                var paramererizationObj = oQueryResult.getParameterization();
-                                var eachInputParam, findParameter, fromVal, toVal, toValParam;
+                                const oParamRequest = new ParameterizationRequest(oQueryResult.getParameterization());
+                                const paramererizationObj = oQueryResult.getParameterization();
+                                let eachInputParam; let findParameter; let fromVal; let toVal; let toValParam;
                                 for (var y = 0, z = inputParamsVariants.length; y < z; y++) {
                                     eachInputParam = inputParamsVariants[y];
                                     findParameter = paramererizationObj.findParameterByName(eachInputParam.filterPropertyName);
@@ -1241,24 +1240,24 @@ sap.ui.define([
                             }
                         }
                     }
-                    var finalUri = oQueryResultRequest.getURIToQueryResultEntries();
+                    let finalUri = oQueryResultRequest.getURIToQueryResultEntries();
 
                     if (orderByElements && orderByElements.length) {
-                        finalUri = finalUri + "&$orderby=";
+                        finalUri = `${finalUri}&$orderby=`;
                         for (y = 0, z = orderByElements.length; y < z; y++) {
-                            var order = orderByElements[y].sortOrder || "asc";
+                            const order = orderByElements[y].sortOrder || "asc";
                             if (order) {
-                                finalUri += orderByElements[y].element + " " + order + ",";
+                                finalUri += `${orderByElements[y].element} ${order},`;
                             }
                         } finalUri = finalUri.slice(0, finalUri.length - 1);
                     }
 
                     if (top) {
-                        finalUri = finalUri + "&$top=" + top;
+                        finalUri = `${finalUri}&$top=${top}`;
                     }
 
-                    var oMeasureNames = oQueryResult.getAllMeasures();
-                    var unit = [];
+                    const oMeasureNames = oQueryResult.getAllMeasures();
+                    const unit = [];
                     for (i = 0; i < measure.split(",").length; i++) {
                         unit.push(oMeasureNames[measure.split(",")[i]].getUnitProperty());
                     }
@@ -1268,10 +1267,10 @@ sap.ui.define([
                         unit: unit
                     };
                 } catch (e) {
-                    Log.error("Error Preparing Query Service Uri using OData4Analytics Library : " + e.toString());
+                    Log.error(`Error Preparing Query Service Uri using OData4Analytics Library : ${e.toString()}`);
                     if (arguments.length) {
                         Log.error("Arguments Passed to this function");
-                        Log.error(arguments[0] + "," + arguments[1] + "," + arguments[2] + "," + arguments[3]);
+                        Log.error(`${arguments[0]},${arguments[1]},${arguments[2]},${arguments[3]}`);
                     } else {
                         Log.error("NO Arguments passed to this function");
                     }
@@ -1280,24 +1279,24 @@ sap.ui.define([
             },
 
             getAllEntitySet: function (sUri) {
-                var entitySets = [];
+                let entitySets = [];
                 try {
-                    var o4a = this._getOData4AnalyticsObject(sUri);
+                    const o4a = this._getOData4AnalyticsObject(sUri);
                     entitySets = o4a.getAllQueryResultNames();
                 } catch (e) {
-                    Log.error("Error fetching Enity Set : " + e.toString());
+                    Log.error(`Error fetching Enity Set : ${e.toString()}`);
                 }
                 return entitySets;
             },
 
             getAllMeasuresWithLabelText: function (sUri, entitySet) {
-                var measures = [];
+                const measures = [];
                 try {
-                    var o4a = this._getOData4AnalyticsObject(sUri);
-                    var queryResult = o4a.findQueryResultByName(entitySet);
-                    var measureNames = queryResult.getAllMeasureNames();
-                    for (var i = 0; i < measureNames.length; i++) {
-                        var each = measureNames[i];
+                    const o4a = this._getOData4AnalyticsObject(sUri);
+                    const queryResult = o4a.findQueryResultByName(entitySet);
+                    const measureNames = queryResult.getAllMeasureNames();
+                    for (let i = 0; i < measureNames.length; i++) {
+                        const each = measureNames[i];
                         global.oMeasure = queryResult.findMeasureByName(each);
                         measures.push({
                             key: each,
@@ -1305,21 +1304,21 @@ sap.ui.define([
                         });
                     }
                 } catch (e) {
-                    Log.error("Error Fetching All Measures : " + e.toString());
+                    Log.error(`Error Fetching All Measures : ${e.toString()}`);
                 }
                 return measures;
             },
 
             getAllDimensionsWithLabelText: function (sUri, entitySet) {
-                var dimensions = [];
+                const dimensions = [];
                 try {
-                    var o4a = this._getOData4AnalyticsObject(sUri);
-                    var queryResult = o4a.findQueryResultByName(entitySet);
-                    var dimensionNames = queryResult.getAllDimensionNames();
-                    for (var i = 0; i < dimensionNames.length; i++) {
-                        var each = dimensionNames[i];
-                        var oDimension = queryResult.findDimensionByName(each);
-                        var textProperty = null;
+                    const o4a = this._getOData4AnalyticsObject(sUri);
+                    const queryResult = o4a.findQueryResultByName(entitySet);
+                    const dimensionNames = queryResult.getAllDimensionNames();
+                    for (let i = 0; i < dimensionNames.length; i++) {
+                        const each = dimensionNames[i];
+                        const oDimension = queryResult.findDimensionByName(each);
+                        let textProperty = null;
                         if (oDimension.getTextProperty() != null) {
                             textProperty = oDimension.getTextProperty().name;
                         }
@@ -1330,37 +1329,37 @@ sap.ui.define([
                         });
                     }
                 } catch (e) {
-                    Log.error("Error Fetching All Dimesions : " + e.toString());
+                    Log.error(`Error Fetching All Dimesions : ${e.toString()}`);
                 }
                 return dimensions;
             },
 
             getAllInputParams: function (sUri, entitySet) {
-                var inputParams = [];
+                let inputParams = [];
                 try {
-                    var o4a = this._getOData4AnalyticsObject(sUri);
-                    var queryResult = o4a.findQueryResultByName(entitySet);
+                    const o4a = this._getOData4AnalyticsObject(sUri);
+                    const queryResult = o4a.findQueryResultByName(entitySet);
                     if (queryResult.getParameterization()) {
-                        var oParams = queryResult.getParameterization();
+                        const oParams = queryResult.getParameterization();
                         inputParams = oParams.getAllParameterNames();
                     }
                 } catch (e) {
-                    Log.error("Error Fetching Input Params : " + e.toString());
+                    Log.error(`Error Fetching Input Params : ${e.toString()}`);
                 }
                 return inputParams;
             },
 
             getAllInputParamsWithFlag: function (sUri, entitySet) {
-                var inputParams = [];
+                const inputParams = [];
                 try {
-                    var o4a = this._getOData4AnalyticsObject(sUri);
-                    var queryResult = o4a.findQueryResultByName(entitySet);
+                    const o4a = this._getOData4AnalyticsObject(sUri);
+                    const queryResult = o4a.findQueryResultByName(entitySet);
                     if (queryResult.getParameterization()) {
-                        var oParams = queryResult.getParameterization();
-                        var inputParamsArray = oParams.getAllParameterNames();
-                        for (var i = 0; i < inputParamsArray.length; i++) {
-                            var each = inputParamsArray[i];
-                            var paramObject = oParams.findParameterByName(each);
+                        const oParams = queryResult.getParameterization();
+                        const inputParamsArray = oParams.getAllParameterNames();
+                        for (let i = 0; i < inputParamsArray.length; i++) {
+                            const each = inputParamsArray[i];
+                            const paramObject = oParams.findParameterByName(each);
                             inputParams.push({
                                 name: each,
                                 optional: paramObject.isOptional()
@@ -1368,7 +1367,7 @@ sap.ui.define([
                         }
                     }
                 } catch (e) {
-                    Log.error("Error Fetching Input Params : " + e.toString());
+                    Log.error(`Error Fetching Input Params : ${e.toString()}`);
                 }
                 return inputParams;
             },
@@ -1376,11 +1375,11 @@ sap.ui.define([
             formatOdataObjectToString: function (value) {
                 if (value && value.constructor == Object) {
                     if (value.__edmType == "Edm.Time") {
-                        var milliseconds = value.ms;
-                        var seconds = Math.floor((milliseconds / 1000) % 60);
-                        var minutes = Math.floor((milliseconds / 60000) % 60);
-                        var hours = Math.floor((milliseconds / 3600000) % 24);
-                        return hours + "H" + minutes + "M" + seconds + "S";
+                        const milliseconds = value.ms;
+                        const seconds = Math.floor((milliseconds / 1000) % 60);
+                        const minutes = Math.floor((milliseconds / 60000) % 60);
+                        const hours = Math.floor((milliseconds / 3600000) % 24);
+                        return `${hours}H${minutes}M${seconds}S`;
                     }
                 } return value;
             },
@@ -1388,19 +1387,19 @@ sap.ui.define([
             generateCombinations: function (array) {
                 function getPerfectBinary (maxLength, str) {
                     while (str.length < maxLength) {
-                        str = "0" + str;
+                        str = `0${str}`;
                     }
                     return str;
                 }
-                var max = Math.pow(2, array.length);
-                var resultArray = [];
-                var index = 0;
+                let max = Math.pow(2, array.length);
+                const resultArray = [];
+                let index = 0;
 
                 while (max > 1) {
-                    var str = (max - 1).toString(2);
+                    let str = (max - 1).toString(2);
                     str = getPerfectBinary(array.length, str);
                     resultArray[index] = [];
-                    for (var i = 0; i < str.length; i++) {
+                    for (let i = 0; i < str.length; i++) {
                         if (Number(str[i])) {
                             resultArray[index].push(array[i]);
                         }
@@ -1412,7 +1411,7 @@ sap.ui.define([
 
             logError: function (err, oControl) {
                 if (err == "no data" && oControl) {
-                    var oResourceBundle = sap.ushell.components.tiles.utils.getResourceBundle();
+                    const oResourceBundle = sap.ushell.components.tiles.utils.getResourceBundle();
                     oControl.setFailedText(oResourceBundle.getText("sb.noData"));
                 }
                 Log.error(err.toString());
@@ -1420,15 +1419,15 @@ sap.ui.define([
 
             numberOfLeadingZeros: function (num) {
                 num = String(num);
-                var count = 0;
-                var decimal_index = num.indexOf(".");
+                let count = 0;
+                const decimal_index = num.indexOf(".");
                 if (decimal_index == -1) {
                     return 0;
                 }
                 if (Number(num.split(".")[0]) != 0) {
                     return 0;
                 }
-                var i = decimal_index + 1;
+                let i = decimal_index + 1;
                 while (num[i++] == "0") {
                     ++count;
                 }
@@ -1437,15 +1436,15 @@ sap.ui.define([
 
             formatValue: function (val, scaleFactor, MAX_LEN) {
                 MAX_LEN = MAX_LEN || 3;
-                var unit = { 3: "K", 6: "M", 9: "B", 12: "T", 0: "" };
+                const unit = { 3: "K", 6: "M", 9: "B", 12: "T", 0: "" };
                 unit["-3"] = "m";
                 unit["-6"] = "u";
                 unit["-9"] = "n";
                 unit["-12"] = "t";
                 unit["-2"] = "%";
-                var temp, pre, suff;
+                let temp; let pre; let suff;
                 temp = Number(val).toPrecision(MAX_LEN);
-                var zeroes = this.numberOfLeadingZeros(temp);
+                const zeroes = this.numberOfLeadingZeros(temp);
                 if (zeroes > 0 && scaleFactor < 0) {
                     pre = temp * Math.pow(10, zeroes + MAX_LEN);
                     suff = -(zeroes + MAX_LEN);
@@ -1491,7 +1490,7 @@ sap.ui.define([
                         pre = pre / (Math.pow(10, suff % 3));
                         suff = suff - (suff % 3);
                     } else {
-                        var diff = suff - scaleFactor;
+                        const diff = suff - scaleFactor;
                         pre = pre / (Math.pow(10, diff));
                         suff = suff - diff;
                     }
@@ -1501,7 +1500,7 @@ sap.ui.define([
                 // ending of neg scale factor
                 pre += "";
                 if (scaleFactor == "-2") {
-                    var valstr = (x.unitPrefix == "") ? Number(x.value + "").toFixed(4 - (x.value + "").indexOf(".")) : Number(x.value + "").toFixed(3 - (x.value + "").indexOf("."));
+                    const valstr = (x.unitPrefix == "") ? Number(`${x.value}`).toFixed(4 - (`${x.value}`).indexOf(".")) : Number(`${x.value}`).toFixed(3 - (`${x.value}`).indexOf("."));
                     return { value: Number(valstr), unitPrefix: (x.unitPrefix) + unit[-2] };
                 }
                 pre = Number(pre).toFixed(4 - pre.indexOf("."));
@@ -1509,7 +1508,7 @@ sap.ui.define([
             },
 
             isSmartbusinessChipAndCachable: function (baseChip) {
-                var oConfig = this.getParsedChip(baseChip && baseChip.getConfigurationParameter("tileConfiguration"));
+                const oConfig = this.getParsedChip(baseChip && baseChip.getConfigurationParameter("tileConfiguration"));
                 return (oConfig &&
                     oConfig.TILE_PROPERTIES &&
                     oConfig.TILE_PROPERTIES.tileType &&
@@ -1517,21 +1516,21 @@ sap.ui.define([
             },
 
             getHanaClient: function () {
-                var sessionClient;
-                var success = function (d, s, x) {
+                let sessionClient;
+                const success = function (d, s, x) {
                     sessionClient = d.sessionClient;
                     sap.ushell.components.tiles.indicatorTileUtils.cache.setCacheHanaClient(sessionClient);
                     sap.ushell.components.tiles.indicatorTileUtils.util.HANA_CLIENT_DEFERRED.resolve(sessionClient);
                 };
-                var error = function (jqXHR, textStatus, errorThrown) {
+                const error = function (jqXHR, textStatus, errorThrown) {
                     Log.error(jqXHR.responseText);
                     Log.error("session client call failed");
                     sap.ushell.components.tiles.indicatorTileUtils.cache.setCacheHanaClient(null);
                     sap.ushell.components.tiles.indicatorTileUtils.util.HANA_CLIENT_DEFERRED.reject();
                 };
 
-                var deferred = sap.ushell.components.tiles.indicatorTileUtils.util.HANA_CLIENT_DEFERRED || jQuery.Deferred();
-                var cacheHanaClient = sap.ushell.components.tiles.indicatorTileUtils.cache.getCacheHanaClient();
+                const deferred = sap.ushell.components.tiles.indicatorTileUtils.util.HANA_CLIENT_DEFERRED || jQuery.Deferred();
+                const cacheHanaClient = sap.ushell.components.tiles.indicatorTileUtils.cache.getCacheHanaClient();
                 if (cacheHanaClient != undefined) {
                     sessionClient = cacheHanaClient;
                     sap.ushell.components.tiles.indicatorTileUtils.util.HANA_CLIENT_DEFERRED.resolve(sessionClient);
@@ -1564,9 +1563,9 @@ sap.ui.define([
     })(window, jQuery);
 
     sap.ushell.components.tiles.indicatorTileUtils.cache = (function () {
-        var BIGMAP = {};
-        var KPIVALUE = {};
-        var sessionContext = "HANA_CLIENT";
+        const BIGMAP = {};
+        const KPIVALUE = {};
+        const sessionContext = "HANA_CLIENT";
         return {
             getCacheHanaClient: function () {
                 return BIGMAP[sessionContext];