@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -19,13 +19,13 @@ sap.ui.define([
     "sap/ui/model/Filter",
     "sap/ui/model/Sorter",
     "sap/ui/core/Core"
-], function (
+], (
     ODataModel,
     FilterOperator,
     Filter,
     Sorter
     /* Core */
-) {
+) => {
     "use strict";
 
     /* eslint-disable block-scoped-var */ // TODO: remove eslint-disable
@@ -50,15 +50,15 @@ sap.ui.define([
             }
             switch (sPropertyEDMTypeName) {
                 case "Edm.String":
-                    return "'" + sFilterValue + "'";
+                    return `'${sFilterValue}'`;
                 case "Edm.DateTime":
-                    return "datetime'" + sFilterValue + "'";
+                    return `datetime'${sFilterValue}'`;
                 case "Edm.Guid":
-                    return "guid'" + sFilterValue + "'";
+                    return `guid'${sFilterValue}'`;
                 case "Edm.Time":
-                    return "time'" + sFilterValue + "'";
+                    return `time'${sFilterValue}'`;
                 case "Edm.DateTimeOffset":
-                    return "datetimeoffset'" + sFilterValue + "'";
+                    return `datetimeoffset'${sFilterValue}'`;
                 default:
                     return sFilterValue;
             }
@@ -70,22 +70,22 @@ sap.ui.define([
             }
             switch (sPropertyEDMTypeName) {
                 case "Edm.String":
-                    return "'" + sFilterValue + "'";
+                    return `'${sFilterValue}'`;
                 case "Edm.DateTime":
-                    return "datetime'" + sFilterValue + "'";
+                    return `datetime'${sFilterValue}'`;
                 case "Edm.Guid":
-                    return "guid'" + sFilterValue + "'";
+                    return `guid'${sFilterValue}'`;
                 case "Edm.Time":
-                    return "time'" + sFilterValue + "'";
+                    return `time'${sFilterValue}'`;
                 case "Edm.DateTimeOffset":
-                    return "datetimeoffset'" + sFilterValue + "'";
+                    return `datetimeoffset'${sFilterValue}'`;
                 default:
                     return sFilterValue;
             }
         },
 
         tokenizeNametoLabelText: function (sName) {
-            var sLabel = "";
+            let sLabel = "";
 
             // split UpperCamelCase in words (treat numbers and _ as upper case)
             sLabel = sName.replace(/([^A-Z0-9_]+)([A-Z0-9_])/g, "$1 $2");
@@ -171,7 +171,7 @@ sap.ui.define([
             this._oActivatedWorkarounds = {};
 
             if (oModelReference && oModelReference.aWorkaroundID) {
-                var aWorkaroundID = oModelReference.aWorkaroundID;
+                const aWorkaroundID = oModelReference.aWorkaroundID;
 
                 for (var i = 0; i < aWorkaroundID.length; i++) {
                     this._oActivatedWorkarounds[aWorkaroundID[i]] = true;
@@ -208,10 +208,10 @@ sap.ui.define([
 
             // loop over all schemas and entity containers
             // TODO: extend this implementation to support many schemas
-            var oSchema = this._oModel.getServiceMetadata().dataServices.schema[0];
+            const oSchema = this._oModel.getServiceMetadata().dataServices.schema[0];
 
             // remember default container
-            var oContainer;
+            let oContainer;
             for (i = -1, oContainer; oContainer = oSchema.entityContainer[++i];) {
                 if (oContainer.isDefaultEntityContainer == "true") {
                     this._oDefaultEntityContainer = oContainer;
@@ -219,15 +219,15 @@ sap.ui.define([
                 }
             }
 
-            var aEntityType = oSchema.entityType;
+            const aEntityType = oSchema.entityType;
 
             // A. preparation
 
             // A.1 collect all relevant OData entity types representing query results, parameters
-            var aQueryResultEntityTypes = [], aParameterEntityTypes = [], aUnsortedEntityTypes = [];
-            var j;
+            const aQueryResultEntityTypes = []; const aParameterEntityTypes = []; const aUnsortedEntityTypes = [];
+            let j;
             for (i = -1, oType; oType = aEntityType[++i];) {
-                var bProcessed = false;
+                let bProcessed = false;
 
                 if (oType.extensions != undefined) {
                     var oExtension;
@@ -279,7 +279,7 @@ sap.ui.define([
             // B.1 create parameters
 
             // temporary storage for lookup of entity *types* annotated with parameters semantics
-            var oParameterizationEntityTypeSet = {};
+            const oParameterizationEntityTypeSet = {};
 
             for (i = -1, oType; oType = aParameterEntityTypes[++i];) {
                 // B.1.1 create object for OData entity type
@@ -308,7 +308,7 @@ sap.ui.define([
                 oParameterizationEntityTypeSet[oEntityType.getQName()] = oParameterization;
 
                 // B.1.5 recognize all available parameter value helps
-                var sParameterizationEntityTypeQTypeName = oEntityType.getQName();
+                const sParameterizationEntityTypeQTypeName = oEntityType.getQName();
 
                 if (oSchema.association != undefined) {
                     var oAssoc;
@@ -318,14 +318,13 @@ sap.ui.define([
                             continue;
                         }
 
-                        var sParameterValueHelpEntityTypeQTypeName = null;
+                        let sParameterValueHelpEntityTypeQTypeName = null;
 
                         // B.1.5.1 relevant only if one end has same type as the given parameterization entity type
                         if (oAssoc.end[0].type == sParameterizationEntityTypeQTypeName
                             && oAssoc.end[0].multiplicity == "*"
                             && oAssoc.end[1].multiplicity == "1") {
                             sParameterValueHelpEntityTypeQTypeName = oAssoc.end[1].type;
-
                         } else if (oAssoc.end[1].type == sParameterizationEntityTypeQTypeName
                             && oAssoc.end[1].multiplicity == "*"
                             && oAssoc.end[0].multiplicity == "1") {
@@ -339,14 +338,14 @@ sap.ui.define([
                         if (oAssoc.referentialConstraint.dependent.propertyRef.length != 1) {
                             continue;
                         }
-                        var oParameter = oParameterization.findParameterByName(oAssoc.referentialConstraint.dependent.propertyRef[0].name);
+                        const oParameter = oParameterization.findParameterByName(oAssoc.referentialConstraint.dependent.propertyRef[0].name);
                         if (oParameter == null) {
                             continue;
                         }
 
                         // B.1.5.3 Register the recognized parameter value help entity type and set and link it to the parameter
-                        var oValueListEntityType = this._oEntityTypeSet[sParameterValueHelpEntityTypeQTypeName];
-                        var oValueListEntitySet = this._oEntityTypeNameToEntitySetMap[sParameterValueHelpEntityTypeQTypeName];
+                        const oValueListEntityType = this._oEntityTypeSet[sParameterValueHelpEntityTypeQTypeName];
+                        const oValueListEntitySet = this._oEntityTypeNameToEntitySetMap[sParameterValueHelpEntityTypeQTypeName];
                         oParameter.setValueSetEntity(oValueListEntityType, oValueListEntitySet);
                     }
                 }
@@ -354,21 +353,21 @@ sap.ui.define([
 
             // B.2
             // B.2 create analytic queries
-            var oType;
+            let oType;
             for (i = -1, oType; oType = aQueryResultEntityTypes[++i];) {
                 // B.2.1 create object for OData entity
                 oEntityType = new sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.EntityType(this._oModel
                     .getServiceMetadata(), oSchema, oType);
                 this._oEntityTypeSet[oEntityType.getQName()] = oEntityType;
-                var sQueryResultEntityTypeQTypeName = oEntityType.getQName();
+                const sQueryResultEntityTypeQTypeName = oEntityType.getQName();
 
                 // B.2.2 find assocs to parameter entity types
                 oParameterization = null;
-                var oAssocFromParamsToResult = null;
+                let oAssocFromParamsToResult = null;
 
                 if (oSchema.association != undefined) {
                     for (j = -1, oAssoc; oAssoc = oSchema.association[++j];) {
-                        var sParameterEntityTypeQTypeName = null;
+                        let sParameterEntityTypeQTypeName = null;
                         if (oAssoc.end[0].type == sQueryResultEntityTypeQTypeName) {
                             sParameterEntityTypeQTypeName = oAssoc.end[1].type;
                         } else if (oAssoc.end[1].type == sQueryResultEntityTypeQTypeName) {
@@ -378,14 +377,14 @@ sap.ui.define([
                         }
 
                         // B.2.2.2 fetch Parameterization object if any
-                        var oMatchingParameterization = null;
+                        let oMatchingParameterization = null;
 
                         oMatchingParameterization = oParameterizationEntityTypeSet[sParameterEntityTypeQTypeName];
                         if (oMatchingParameterization != null) {
                             if (oParameterization != null) {
                                 // TODO: extend this implementation to support more than one related parameter entity type
-                                throw "RESTRICTION: Unable to handle multiple parameter entity types of query entity "
-                                + oEntityType.name;
+                                throw `RESTRICTION: Unable to handle multiple parameter entity types of query entity ${
+                                    oEntityType.name}`;
                             } else {
                                 oParameterization = oMatchingParameterization;
                                 oAssocFromParamsToResult = oAssoc;
@@ -407,7 +406,7 @@ sap.ui.define([
                 this._oEntityTypeNameToEntitySetMap[oEntityType.getQName()] = oEntitySet;
 
                 // B.2.5 create object for analytic query result, related OData entity type and set and (if any) related parameters object
-                var oQueryResult = new sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.QueryResult(this, oEntityType,
+                const oQueryResult = new sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.QueryResult(this, oEntityType,
                     oEntitySet, oParameterization);
                 this._oQueryResultSet[oQueryResult.getName()] = oQueryResult;
 
@@ -463,7 +462,7 @@ sap.ui.define([
                 return;
             }
 
-            var oMetadata;
+            let oMetadata;
             try {
                 oMetadata = this._oModel.getServiceMetadata().dataServices;
             } catch (exception) {
@@ -471,7 +470,7 @@ sap.ui.define([
             }
 
             // find "schema" entry in annotation document
-            for (var propName in oAnnotation) {
+            for (const propName in oAnnotation) {
                 if (!(this.oUI5ODataModelAnnotatableObject.objectName === propName)) {
                     continue;
                 }
@@ -505,7 +504,7 @@ sap.ui.define([
                         }
 
                         for (var l = -1, oAnnotationExtension; oAnnotationExtension = oAnnotation.extensions[++l];) {
-                            var bFound = false;
+                            let bFound = false;
                             for (var m = -1, oMetadataExtension; oMetadataExtension = oMetadata.extensions[++m];) {
                                 if (oAnnotationExtension.name == oMetadataExtension.name
                                     && oAnnotationExtension.namespace == oMetadataExtension.namespace) {
@@ -521,8 +520,7 @@ sap.ui.define([
                     }
                     // walk down to sub objects
                     for (var k = -1, oUI5ODataModelAnnotatableSubObject; oUI5ODataModelAnnotatableSubObject = oUI5ODataModelAnnotatableObject.aSubObject[++k];) {
-
-                        for (var propName in oAnnotation) {
+                        for (const propName in oAnnotation) {
                             if (!(oUI5ODataModelAnnotatableSubObject.objectName == propName)) {
                                 continue;
                             }
@@ -553,12 +551,12 @@ sap.ui.define([
          *   The query result object with this name or null if it does not exist
          */
         findQueryResultByName: function (sName) {
-            var oQueryResult = this._oQueryResultSet[sName];
+            let oQueryResult = this._oQueryResultSet[sName];
 
             // Everybody should have a second chance:
             // If the name was not fully qualified, check if it is in the default container
             if (!oQueryResult && this._oDefaultEntityContainer) {
-                var sQName = this._oDefaultEntityContainer.name + "." + sName;
+                const sQName = `${this._oDefaultEntityContainer.name}.${sName}`;
 
                 oQueryResult = this._oQueryResultSet[sQName];
             }
@@ -577,7 +575,7 @@ sap.ui.define([
 
             this._aQueryResultNames = new Array(0);
 
-            for (var sName in this._oQueryResultSet) { this._aQueryResultNames.push(this._oQueryResultSet[sName].getName()); }
+            for (const sName in this._oQueryResultSet) { this._aQueryResultNames.push(this._oQueryResultSet[sName].getName()); }
 
             return this._aQueryResultNames;
         },
@@ -612,7 +610,7 @@ sap.ui.define([
          * @private
          */
         _getEntitySetsOfType: function (oSchema, sQTypeName) {
-            var aEntitySet = [];
+            const aEntitySet = [];
 
             for (var i = -1, oEntityContainer; oEntityContainer = oSchema.entityContainer[++i];) {
                 for (var j = -1, oEntitySet; oEntitySet = oEntityContainer.entitySet[++j];) {
@@ -678,8 +676,8 @@ sap.ui.define([
             this._oMeasureSet = {};
 
             // parse entity type for analytic semantics described by annotations
-            var aProperty = oEntityType.getTypeDescription().property;
-            var oAttributeForPropertySet = {};
+            const aProperty = oEntityType.getTypeDescription().property;
+            const oAttributeForPropertySet = {};
             for (var i = -1, oProperty; oProperty = aProperty[++i];) {
                 if (oProperty.extensions == undefined) {
                     continue;
@@ -715,28 +713,28 @@ sap.ui.define([
             }
 
             // assign dimension attributes to the respective dimension objects
-            for (var sDimensionAttributeName in oAttributeForPropertySet) {
+            for (const sDimensionAttributeName in oAttributeForPropertySet) {
                 oDimensionAttribute = oAttributeForPropertySet[sDimensionAttributeName];
                 oDimensionAttribute.getDimension().addAttribute(oDimensionAttribute);
             }
 
             // apply workaround for missing text properties if requested
             if (oModel._oActivatedWorkarounds.IdentifyTextPropertiesByName) {
-                var aMatchedTextPropertyName = [];
-                for (var oDimName in this._oDimensionSet) {
+                const aMatchedTextPropertyName = [];
+                for (const oDimName in this._oDimensionSet) {
                     oDimension = this._oDimensionSet[oDimName];
                     if (!oDimension.getTextProperty()) {
-                        var oTextProperty = null; // order of matching is
+                        let oTextProperty = null; // order of matching is
                         // significant!
-                        oTextProperty = oEntityType.findPropertyByName(oDimName + "Name");
+                        oTextProperty = oEntityType.findPropertyByName(`${oDimName}Name`);
                         if (!oTextProperty) {
-                            oTextProperty = oEntityType.findPropertyByName(oDimName + "Text");
+                            oTextProperty = oEntityType.findPropertyByName(`${oDimName}Text`);
                         }
                         if (!oTextProperty) {
-                            oTextProperty = oEntityType.findPropertyByName(oDimName + "Desc");
+                            oTextProperty = oEntityType.findPropertyByName(`${oDimName}Desc`);
                         }
                         if (!oTextProperty) {
-                            oTextProperty = oEntityType.findPropertyByName(oDimName + "Description");
+                            oTextProperty = oEntityType.findPropertyByName(`${oDimName}Description`);
                         }
                         if (oTextProperty) { // any match?
                             oDimension.setTextProperty(oTextProperty); // link
@@ -748,7 +746,7 @@ sap.ui.define([
                     }
                 }
                 // make sure that any matched text property is not exposed as dimension (according to spec)
-                var sPropertyName;
+                let sPropertyName;
                 for (i = -1, sPropertyName; sPropertyName = aMatchedTextPropertyName[++i];) {
                     delete this._oDimensionSet[sPropertyName];
                 }
@@ -786,7 +784,7 @@ sap.ui.define([
 
             this._aDimensionNames = [];
 
-            for (var sName in this._oDimensionSet) { this._aDimensionNames.push(this._oDimensionSet[sName].getName()); }
+            for (const sName in this._oDimensionSet) { this._aDimensionNames.push(this._oDimensionSet[sName].getName()); }
 
             return this._aDimensionNames;
         },
@@ -814,7 +812,7 @@ sap.ui.define([
 
             this._aMeasureNames = [];
 
-            for (var sName in this._oMeasureSet) { this._aMeasureNames.push(this._oMeasureSet[sName].getName()); }
+            for (const sName in this._oMeasureSet) { this._aMeasureNames.push(this._oMeasureSet[sName].getName()); }
 
             return this._aMeasureNames;
         },
@@ -918,7 +916,7 @@ sap.ui.define([
             this._oParameterSet = {};
 
             // parse entity type for analytic semantics described by annotations
-            var aProperty = oEntityType.getTypeDescription().property;
+            const aProperty = oEntityType.getTypeDescription().property;
             for (var i = -1, oProperty; oProperty = aProperty[++i];) {
                 if (oProperty.extensions == undefined) {
                     continue;
@@ -944,8 +942,8 @@ sap.ui.define([
         // to be called only by Model objects
         setTargetQueryResult: function (oQueryResult, oAssociation) {
             this._oQueryResult = oQueryResult;
-            var sQAssocName = this._oEntityType.getSchema().namespace + "." + oAssociation.name;
-            var aNavProp = this._oEntityType.getTypeDescription().navigationProperty;
+            const sQAssocName = `${this._oEntityType.getSchema().namespace}.${oAssociation.name}`;
+            const aNavProp = this._oEntityType.getTypeDescription().navigationProperty;
             if (!aNavProp) {
                 throw "Invalid consumption model: Parameters entity type lacks navigation property for association to query result entity type";
             }
@@ -980,7 +978,7 @@ sap.ui.define([
 
             this._aParameterNames = [];
 
-            for (var sName in this._oParameterSet) { this._aParameterNames.push(this._oParameterSet[sName].getName()); }
+            for (const sName in this._oParameterSet) { this._aParameterNames.push(this._oParameterSet[sName].getName()); }
 
             return this._aParameterNames;
         },
@@ -1059,7 +1057,7 @@ sap.ui.define([
             this._oParameterization = oParameterization;
             this._oProperty = oProperty;
 
-            var oEntityType = oParameterization.getEntityType();
+            const oEntityType = oParameterization.getEntityType();
 
             if (oProperty.extensions != undefined) {
                 for (var i = -1, oExtension; oExtension = oProperty.extensions[++i];) {
@@ -1166,7 +1164,7 @@ sap.ui.define([
          *   This means that if *this* parameter is a lower boundary, the returned object
          */
         getPeerIntervalBoundaryParameter: function () {
-            var sPeerParamPropName = null;
+            let sPeerParamPropName = null;
             if (this._oLowerIntervalBoundaryParameterProperty) {
                 sPeerParamPropName = this._oLowerIntervalBoundaryParameterProperty.name;
             } else {
@@ -1225,8 +1223,8 @@ sap.ui.define([
          *   It is a relative URI unless a service root is given, which would then prefixed in order to return a complete URL.
          */
         getURIToValueEntitySet: function (sServiceRootURI) {
-            var sURI = null;
-            sURI = (sServiceRootURI || "") + "/" + this._oValueSetEntitySet.getQName();
+            let sURI = null;
+            sURI = `${sServiceRootURI || ""}/${this._oValueSetEntitySet.getQName()}`;
             return sURI;
         },
 
@@ -1382,7 +1380,7 @@ sap.ui.define([
 
             this._aAttributeNames = [];
 
-            for (var sName in this._oAttributeSet) { this._aAttributeNames.push(this._oAttributeSet[sName].getName()); }
+            for (const sName in this._oAttributeSet) { this._aAttributeNames.push(this._oAttributeSet[sName].getName()); }
 
             return this._aAttributeNames;
         },
@@ -1671,7 +1669,7 @@ sap.ui.define([
             this._oModel = oModel;
 
             if (oSchema.entityContainer.length > 1) {
-                this._sQName = oContainer.name + "." + oEntitySet.name;
+                this._sQName = `${oContainer.name}.${oEntitySet.name}`;
             } else {
                 // no need to disambiguate this for the simple case
                 this._sQName = oEntitySet.name;
@@ -1744,12 +1742,12 @@ sap.ui.define([
             this._aSortablePropertyNames = [];
             this._aRequiredFilterPropertyNames = [];
 
-            this._sQName = oSchema.namespace + "." + oEntityType.name;
+            this._sQName = `${oSchema.namespace}.${oEntityType.name}`;
 
             // collect all hierarchies defined in this entity type
-            var oRecursiveHierarchies = {}; // temp for collecting all properties
+            const oRecursiveHierarchies = {}; // temp for collecting all properties
             // participating in hierarchies
-            var oRecursiveHierarchy = null;
+            let oRecursiveHierarchy = null;
 
             for (var i = -1, oProperty; oProperty = oEntityType.property[++i];) {
                 // by default, every property can be filtered
@@ -1819,10 +1817,10 @@ sap.ui.define([
 
             // post processing: set up hierarchy objects
             this._oRecursiveHierarchySet = {};
-            for (var hierNodeIDPropertyName in oRecursiveHierarchies) {
-                var oHierarchy = oRecursiveHierarchies[hierNodeIDPropertyName];
-                var oHierarchyNodeIDProperty = this._oPropertySet[hierNodeIDPropertyName];
-                var oDimensionProperty = this._oPropertySet[oHierarchy.dimensionName];
+            for (const hierNodeIDPropertyName in oRecursiveHierarchies) {
+                const oHierarchy = oRecursiveHierarchies[hierNodeIDPropertyName];
+                const oHierarchyNodeIDProperty = this._oPropertySet[hierNodeIDPropertyName];
+                let oDimensionProperty = this._oPropertySet[oHierarchy.dimensionName];
                 if (oDimensionProperty == null) {
                     // TODO temporary workaround for BW provider, which does not return it let dimension coincide with hierarchy node ID
                     oDimensionProperty = oHierarchyNodeIDProperty;
@@ -1882,7 +1880,7 @@ sap.ui.define([
 
             this._aHierarchyPropertyNames = [];
 
-            for (var sName in this._oRecursiveHierarchySet) {
+            for (const sName in this._oRecursiveHierarchySet) {
                 this._aHierarchyPropertyNames.push(this._oRecursiveHierarchySet[sName]
                     .getNodeValueProperty().name);
             }
@@ -2095,13 +2093,13 @@ sap.ui.define([
          * @returns {sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.FilterExpression} This object for method chaining
          */
         addCondition: function (sPropertyName, sOperator, oValue, oValue2) {
-            var oProperty = this._oEntityType.findPropertyByName(sPropertyName);
+            const oProperty = this._oEntityType.findPropertyByName(sPropertyName);
             if (oProperty == null) {
-                throw "Cannot add filter condition for unknown property name " + sPropertyName; // TODO
+                throw `Cannot add filter condition for unknown property name ${sPropertyName}`; // TODO
             }
-            var aFilterablePropertyNames = this._oEntityType.getFilterablePropertyNames();
+            const aFilterablePropertyNames = this._oEntityType.getFilterablePropertyNames();
             if (aFilterablePropertyNames.indexOf(sPropertyName) === -1) {
-                throw "Cannot add filter condition for not filterable property name " + sPropertyName; // TODO
+                throw `Cannot add filter condition for not filterable property name ${sPropertyName}`; // TODO
             }
             this._aFilterCondition.push({
                 property: oProperty,
@@ -2124,13 +2122,13 @@ sap.ui.define([
          * @returns {sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.FilterExpression} This object for method chaining
          */
         addSetCondition: function (sPropertyName, aValues) {
-            var oProperty = this._oEntityType.findPropertyByName(sPropertyName);
+            const oProperty = this._oEntityType.findPropertyByName(sPropertyName);
             if (oProperty == null) {
-                throw "Cannot add filter condition for unknown property name " + sPropertyName; // TODO
+                throw `Cannot add filter condition for unknown property name ${sPropertyName}`; // TODO
             }
-            var aFilterablePropertyNames = this._oEntityType.getFilterablePropertyNames();
+            const aFilterablePropertyNames = this._oEntityType.getFilterablePropertyNames();
             if (aFilterablePropertyNames.indexOf(sPropertyName) === -1) {
-                throw "Cannot add filter condition for not filterable property name " + sPropertyName; // TODO
+                throw `Cannot add filter condition for not filterable property name ${sPropertyName}`; // TODO
             }
             for (var i = -1, oValue; oValue = aValues[++i];) {
                 this._aFilterCondition.push({
@@ -2148,7 +2146,7 @@ sap.ui.define([
          * @returns {sap.ui.model.Filter[]} List of filter objects representing this expression
          */
         getExpressionAsUI5FilterArray: function () {
-            var aFilterObjects = [];
+            const aFilterObjects = [];
 
             for (var i = -1, oCondition; oCondition = this._aFilterCondition[++i];) {
                 aFilterObjects.push(new Filter(oCondition.property.name, oCondition.op,
@@ -2167,7 +2165,7 @@ sap.ui.define([
                 return "";
             }
 
-            this._aFilterCondition.sort(function (a, b) {
+            this._aFilterCondition.sort((a, b) => {
                 if (a.property.name == b.property.name) {
                     return 0;
                 }
@@ -2177,48 +2175,48 @@ sap.ui.define([
                 return -1;
             });
 
-            var sPropertyName = this._aFilterCondition[0].property.name;
-            var sOptionString = "";
-            var sSubExpression = "";
+            let sPropertyName = this._aFilterCondition[0].property.name;
+            let sOptionString = "";
+            let sSubExpression = "";
             for (var i = -1, oCondition; oCondition = this._aFilterCondition[++i];) {
                 if (sPropertyName != oCondition.property.name) {
-                    sOptionString += (sOptionString == "" ? "" : " and ") + "(" + sSubExpression + ")";
+                    sOptionString += `${sOptionString == "" ? "" : " and "}(${sSubExpression})`;
                     sSubExpression = "";
                     sPropertyName = oCondition.property.name;
                 }
 
                 switch (oCondition.op) {
                     case FilterOperator.BT:
-                        sSubExpression += (sSubExpression == "" ? "" : " or ")
-                            + "("
-                            + oCondition.property.name
-                            + " "
-                            + FilterOperator.GE.toLowerCase()
-                            + " "
-                            + sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.helper
+                        sSubExpression += `${sSubExpression == "" ? "" : " or "
+                        }(${
+                            oCondition.property.name
+                        } ${
+                            FilterOperator.GE.toLowerCase()
+                        } ${
+                            sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.helper
                                 .renderPropertyFilterValue(oCondition.val1, oCondition.property.type)
-                            + " and "
-                            + oCondition.property.name
-                            + " "
-                            + FilterOperator.LE.toLowerCase()
-                            + " "
-                            + sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.helper
+                        } and ${
+                            oCondition.property.name
+                        } ${
+                            FilterOperator.LE.toLowerCase()
+                        } ${
+                            sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.helper
                                 .renderPropertyFilterValue(oCondition.val2, oCondition.property.type)
-                            + ")";
+                        })`;
                         break;
                     default:
-                        sSubExpression += (sSubExpression == "" ? "" : " or ")
-                            + "("
-                            + oCondition.property.name
-                            + " "
-                            + oCondition.op.toLowerCase()
-                            + " "
-                            + sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.helper
+                        sSubExpression += `${sSubExpression == "" ? "" : " or "
+                        }(${
+                            oCondition.property.name
+                        } ${
+                            oCondition.op.toLowerCase()
+                        } ${
+                            sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.helper
                                 .renderPropertyFilterValue(oCondition.val1, oCondition.property.type)
-                            + ")";
+                        })`;
                 }
             }
-            sOptionString += (sOptionString == "" ? "" : " and ") + "(" + sSubExpression + ")";
+            sOptionString += `${sOptionString == "" ? "" : " and "}(${sSubExpression})`;
 
             return sOptionString;
         },
@@ -2310,7 +2308,7 @@ sap.ui.define([
          * @private
          */
         _containsSorter: function (sPropertyName) {
-            var oResult = null;
+            let oResult = null;
             for (var i = -1, oCurrentSorter; oCurrentSorter = this._aSortCondition[++i];) {
                 if (oCurrentSorter.property.name === sPropertyName) {
                     oResult = {
@@ -2329,7 +2327,7 @@ sap.ui.define([
          * @private
          */
         _removeFromArray: function (array, from, to) {
-            var rest = array.slice((to || from) + 1 || array.length);
+            const rest = array.slice((to || from) + 1 || array.length);
             array.length = from < 0 ? array.length + from : from;
             return array.push.apply(array, rest);
         },
@@ -2351,16 +2349,16 @@ sap.ui.define([
          * @returns {this} Reference to <code>this</code> for method chaining.
          */
         addSorter: function (sPropertyName, sSortOrder) {
-            var oProperty = this._oEntityType.findPropertyByName(sPropertyName);
+            const oProperty = this._oEntityType.findPropertyByName(sPropertyName);
             if (oProperty == null) {
-                throw "Cannot add sort condition for unknown property name " + sPropertyName; // TODO
+                throw `Cannot add sort condition for unknown property name ${sPropertyName}`; // TODO
             }
             if (this._containsSorter(sPropertyName) != null) {
-                throw "Sort condition for this property name is already defined " + sPropertyName; // TODO
+                throw `Sort condition for this property name is already defined ${sPropertyName}`; // TODO
             }
-            var aSortablePropertyNames = this._oEntityType.getSortablePropertyNames();
+            const aSortablePropertyNames = this._oEntityType.getSortablePropertyNames();
             if (aSortablePropertyNames.indexOf(sPropertyName) === -1) {
-                throw "Cannot add sort condition for not sortable property name " + sPropertyName; // TODO
+                throw `Cannot add sort condition for not sortable property name ${sPropertyName}`; // TODO
             }
 
             this._aSortCondition.push({
@@ -2381,7 +2379,7 @@ sap.ui.define([
                 return;
             }
 
-            var oSorter = this._containsSorter(sPropertyName);
+            const oSorter = this._containsSorter(sPropertyName);
             if (oSorter) {
                 this._removeFromArray(this._aSortCondition, oSorter.index);
             }
@@ -2393,7 +2391,7 @@ sap.ui.define([
          * @returns {sap.ui.model.Sorter[]} List of sorter objects representing this expression
          */
         getExpressionsAsUI5SorterArray: function () {
-            var aSorterObjects = [];
+            const aSorterObjects = [];
 
             for (var i = -1, oCondition; oCondition = this._aSortCondition[++i];) {
                 aSorterObjects.push(new Sorter(oCondition.property.name,
@@ -2409,7 +2407,7 @@ sap.ui.define([
          * @returns {sap.ui.model.Sorter} first sorter object or null if empty
          */
         getExpressionAsUI5Sorter: function () {
-            var aSortArray = this.getExpressionsAsUI5SorterArray();
+            const aSortArray = this.getExpressionsAsUI5SorterArray();
             if (aSortArray.length == 0) {
                 return null;
             }
@@ -2426,9 +2424,9 @@ sap.ui.define([
                 return "";
             }
 
-            var sOrderByOptionString = "";
+            let sOrderByOptionString = "";
             for (var i = -1, oCondition; oCondition = this._aSortCondition[++i];) {
-                sOrderByOptionString += oCondition.property.name + " " + oCondition.order;
+                sOrderByOptionString += `${oCondition.property.name} ${oCondition.order}`;
                 if (i < this._aSortCondition.length - 1) {
                     sOrderByOptionString += ", ";
                 }
@@ -2507,21 +2505,21 @@ sap.ui.define([
          * @param {string} sToValue Omit it or set it to null for single values. If set, it will be assigned to the upper boundary parameter
          */
         setParameterValue: function (sParameterName, sValue, sToValue) {
-            var oParameter = this._oParameterization.findParameterByName(sParameterName);
+            const oParameter = this._oParameterization.findParameterByName(sParameterName);
             if (!oParameter) {
-                throw "Invalid parameter name " + sParameterName; // TODO improve
+                throw `Invalid parameter name ${sParameterName}`; // TODO improve
             }
             // error handling
             if (sToValue != null) {
                 if (!oParameter.isIntervalBoundary()) {
                     // TODO improve error handling
-                    throw "Range value cannot be applied to parameter " + sParameterName
-                    + " accepting only single values"; // TODO
+                    throw `Range value cannot be applied to parameter ${sParameterName
+                    } accepting only single values`; // TODO
                 }
                 if (!oParameter.isLowerIntervalBoundary()) {
                     // TODO improve error handling
-                    throw "Range value given, but parameter " + sParameterName
-                    + " does not hold the lower boundary"; // TODO
+                    throw `Range value given, but parameter ${sParameterName
+                    } does not hold the lower boundary`; // TODO
                 }
             }
             if (!oParameter.isIntervalBoundary()) {
@@ -2532,7 +2530,7 @@ sap.ui.define([
                 }
             } else {
                 if (sValue == null && sToValue != null) {
-                    throw "Parameter " + sParameterName + ": An upper boundary cannot be given without the lower boundary"; // TODO
+                    throw `Parameter ${sParameterName}: An upper boundary cannot be given without the lower boundary`; // TODO
                 }
                 if (sValue == null) {
                     delete this._oParameterValueAssignment[sParameterName];
@@ -2540,7 +2538,7 @@ sap.ui.define([
                 } else {
                     this._oParameterValueAssignment[sParameterName] = sValue;
                 }
-                var oUpperBoundaryParameter = oParameter.getPeerIntervalBoundaryParameter();
+                const oUpperBoundaryParameter = oParameter.getPeerIntervalBoundaryParameter();
                 if (sToValue == null) {
                     sToValue = sValue;
                 }
@@ -2561,8 +2559,8 @@ sap.ui.define([
          *   It is a relative URI unless a service root is given, which would then prefixed in order to return a complete URL.
          */
         getURIToParameterizationEntitySet: function (sServiceRootURI) {
-            return (sServiceRootURI || "") + "/"
-                + this._oParameterization.getEntitySet().getQName();
+            return `${sServiceRootURI || ""}/${
+                this._oParameterization.getEntitySet().getQName()}`;
         },
 
         /**
@@ -2576,29 +2574,29 @@ sap.ui.define([
          *   It is a relative URI unless a service root is given, which would then prefixed in order to return a complete URL.
          */
         getURIToParameterizationEntry: function (sServiceRootURI) {
-            var oDefinedParameters = this._oParameterization.getAllParameters();
-            for (var sDefinedParameterName in oDefinedParameters) {
+            const oDefinedParameters = this._oParameterization.getAllParameters();
+            for (const sDefinedParameterName in oDefinedParameters) {
                 // check that all parameters have a value assigned. This is also
                 // true for those marked as optional, because the omitted value is
                 // conveyed by some default value, e.g. as empty string.
                 if (this._oParameterValueAssignment[sDefinedParameterName] == undefined) {
-                    throw "Parameter " + sDefinedParameterName + " has no value assigned"; // TODO
+                    throw `Parameter ${sDefinedParameterName} has no value assigned`; // TODO
                 }
             }
-            var sKeyIdentification = "", bFirst = true;
-            for (var sParameterName in this._oParameterValueAssignment) {
-                sKeyIdentification += (bFirst ? "" : ",")
+            let sKeyIdentification = ""; let bFirst = true;
+            for (const sParameterName in this._oParameterValueAssignment) {
+                sKeyIdentification += `${(bFirst ? "" : ",")
                     + sParameterName
-                    + "="
-                    + sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.helper.renderPropertyKeyValue(
+                }=${
+                    sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.helper.renderPropertyKeyValue(
                         this._oParameterValueAssignment[sParameterName],
-                        oDefinedParameters[sParameterName].getProperty().type);
+                        oDefinedParameters[sParameterName].getProperty().type)}`;
                 bFirst = false;
             }
 
-            return (sServiceRootURI || "") + "/"
-                + this._oParameterization.getEntitySet().getQName() + "(" + sKeyIdentification
-                + ")";
+            return `${sServiceRootURI || ""}/${
+                this._oParameterization.getEntitySet().getQName()}(${sKeyIdentification
+            })`;
         },
 
         /**
@@ -2621,7 +2619,7 @@ sap.ui.define([
      *
      * Creation of URIs for fetching query results.
      */
-    sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.QueryResultRequest = function (oQueryResult/*, oParameterizationRequest*/) {
+    sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.QueryResultRequest = function (oQueryResult/* , oParameterizationRequest */) {
         this._init(oQueryResult);
     };
 
@@ -2683,7 +2681,7 @@ sap.ui.define([
 
             for (var i = -1, sDimName; sDimName = aDimensionName[++i];) {
                 if (!this._oQueryResult.findDimensionByName(sDimName)) {
-                    throw sDimName + " is not a valid dimension name"; // TODO
+                    throw `${sDimName} is not a valid dimension name`; // TODO
                 }
                 this._oAggregationLevel[sDimName] = {
                     key: true,
@@ -2704,7 +2702,7 @@ sap.ui.define([
             }
             for (var i = -1, sDimName; sDimName = aDimensionName[++i];) {
                 if (!this._oQueryResult.findDimensionByName(sDimName)) {
-                    throw sDimName + " is not a valid dimension name"; // TODO
+                    throw `${sDimName} is not a valid dimension name`; // TODO
                 }
                 if (this._oAggregationLevel[sDimName] != undefined) {
                     delete this._oAggregationLevel[sDimName];
@@ -2721,8 +2719,8 @@ sap.ui.define([
          * @returns {string[]} The dimension names included in the aggregation level
          */
         getAggregationLevel: function () {
-            var aDimName = [];
-            for (var sDimName in this._oAggregationLevel) {
+            const aDimName = [];
+            for (const sDimName in this._oAggregationLevel) {
                 aDimName.push(sDimName);
             }
             return aDimName;
@@ -2739,7 +2737,7 @@ sap.ui.define([
          */
         getAggregationLevelDetails: function (sDimensionName) {
             if (this._oAggregationLevel[sDimensionName] == undefined) {
-                throw "Aggregation level does not include dimension " + sDimensionName;
+                throw `Aggregation level does not include dimension ${sDimensionName}`;
             }
             return this._oAggregationLevel[sDimensionName];
         },
@@ -2758,7 +2756,7 @@ sap.ui.define([
             this._oMeasures = {};
             for (var i = -1, sMeasName; sMeasName = aMeasureName[++i];) {
                 if (!this._oQueryResult.findMeasureByName(sMeasName)) {
-                    throw sMeasName + " is not a valid measure name"; // TODO
+                    throw `${sMeasName} is not a valid measure name`; // TODO
                 }
 
                 this._oMeasures[sMeasName] = {
@@ -2775,8 +2773,8 @@ sap.ui.define([
          * @returns {string[]} The measure names included in the query result request
          */
         getMeasureNames: function () {
-            var aMeasName = [];
-            for (var sMeasName in this._oMeasures) {
+            const aMeasName = [];
+            for (const sMeasName in this._oMeasures) {
                 aMeasName.push(sMeasName);
             }
             return aMeasName;
@@ -2796,14 +2794,14 @@ sap.ui.define([
          *   Pass null to keep current setting. This argument is ignored if sDimensionName is null.
          */
         includeDimensionKeyTextAttributes: function (sDimensionName, bIncludeKey, bIncludeText, aAttributeName) {
-            var aDimName = [];
+            const aDimName = [];
             if (sDimensionName) {
                 if (this._oAggregationLevel[sDimensionName] == undefined) {
-                    throw sDimensionName + " is not included in the aggregation level";
+                    throw `${sDimensionName} is not included in the aggregation level`;
                 }
                 aDimName.push(sDimensionName);
             } else {
-                for (var sName in this._oAggregationLevel) {
+                for (const sName in this._oAggregationLevel) {
                     aDimName.push(sName);
                 }
                 aAttributeName = null;
@@ -2836,14 +2834,14 @@ sap.ui.define([
          */
         includeMeasureRawFormattedValueUnit: function (sMeasureName, bIncludeRawValue,
             bIncludeFormattedValue, bIncludeUnit) {
-            var aMeasName = [];
+            const aMeasName = [];
             if (sMeasureName) {
                 if (this._oMeasures[sMeasureName] == undefined) {
-                    throw sMeasureName + " is not part of the query result";
+                    throw `${sMeasureName} is not part of the query result`;
                 }
                 aMeasName.push(sMeasureName);
             } else {
-                for (var sName in this._oMeasures) {
+                for (const sName in this._oMeasures) {
                     aMeasName.push(sName);
                 }
             }
@@ -2870,7 +2868,7 @@ sap.ui.define([
          */
         getFilterExpression: function () {
             if (this._oFilterExpression == null) {
-                var oEntityType = this._oQueryResult.getEntityType();
+                const oEntityType = this._oQueryResult.getEntityType();
                 this._oFilterExpression = new sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.FilterExpression(oEntityType
                     .getModel(), oEntityType.getSchema(), oEntityType);
             }
@@ -2899,7 +2897,7 @@ sap.ui.define([
          */
         getSortExpression: function () {
             if (this._oSortExpression == null) {
-                var oEntityType = this._oQueryResult.getEntityType();
+                const oEntityType = this._oQueryResult.getEntityType();
                 this._oSortExpression = new sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.SortExpression(oEntityType
                     .getModel(), oEntityType.getSchema(), oEntityType);
             }
@@ -2971,7 +2969,7 @@ sap.ui.define([
          * @returns {object} the current page boundaries as object
          */
         getResultPageBoundaries: function () {
-            var start, end;
+            let start; let end;
             if (this._iSkipRequestOption == null) {
                 start = 1;
                 end = 1;
@@ -2993,17 +2991,17 @@ sap.ui.define([
          *   It is a relative URI unless a service root is given, which would then prefixed in order to return a complete URL.
          */
         getURIToQueryResultEntitySet: function (sServiceRootURI) {
-            var sURI = null;
+            let sURI = null;
             if (this._oQueryResult.getParameterization()) {
                 if (!this._oParameterizationRequest) {
                     throw "Missing parameterization request";
                 } else {
-                    sURI = this._oParameterizationRequest.getURIToParameterizationEntry(sServiceRootURI)
-                        + "/"
-                        + this._oQueryResult.getParameterization().getNavigationPropertyToQueryResult();
+                    sURI = `${this._oParameterizationRequest.getURIToParameterizationEntry(sServiceRootURI)
+                    }/${
+                        this._oQueryResult.getParameterization().getNavigationPropertyToQueryResult()}`;
                 }
             } else {
-                sURI = (sServiceRootURI || "") + "/" + this._oQueryResult.getEntitySet().getQName();
+                sURI = `${sServiceRootURI || ""}/${this._oQueryResult.getEntitySet().getQName()}`;
             }
             return sURI;
         },
@@ -3015,15 +3013,15 @@ sap.ui.define([
          * @returns {string} The value of the requested query option or null, if this option is not used for the OData request.
          */
         getURIQueryOptionValue: function (sQueryOptionName) {
-            var sQueryOptionValue = null;
+            let sQueryOptionValue = null;
 
             switch (sQueryOptionName) {
                 case "$select": {
-                    var sSelectOption = "",
-                        i;
-                    for (var sDimName in this._oAggregationLevel) {
-                        var oDim = this._oQueryResult.findDimensionByName(sDimName);
-                        var oDimSelect = this._oAggregationLevel[sDimName];
+                    let sSelectOption = "";
+                    let i;
+                    for (const sDimName in this._oAggregationLevel) {
+                        const oDim = this._oQueryResult.findDimensionByName(sDimName);
+                        const oDimSelect = this._oAggregationLevel[sDimName];
                         if (oDimSelect.key == true) {
                             sSelectOption += (sSelectOption == "" ? "" : ",") + oDim.getKeyProperty().name;
                         }
@@ -3039,9 +3037,9 @@ sap.ui.define([
                         }
                     }
 
-                    for (var sMeasName in this._oMeasures) {
-                        var oMeas = this._oQueryResult.findMeasureByName(sMeasName);
-                        var oMeasSelect = this._oMeasures[sMeasName];
+                    for (const sMeasName in this._oMeasures) {
+                        const oMeas = this._oQueryResult.findMeasureByName(sMeasName);
+                        const oMeasSelect = this._oMeasures[sMeasName];
                         if (oMeasSelect.value == true) {
                             sSelectOption += (sSelectOption == "" ? "" : ",")
                                 + oMeas.getRawValueProperty().name;
@@ -3057,8 +3055,8 @@ sap.ui.define([
                     }
 
                     if (this._bIncludeEntityKey) {
-                        var aKeyPropRef = this._oQueryResult.getEntityType().getTypeDescription().key.propertyRef,
-                            oKeyProp;
+                        const aKeyPropRef = this._oQueryResult.getEntityType().getTypeDescription().key.propertyRef;
+                        let oKeyProp;
                         for (i = -1; oKeyProp = aKeyPropRef[++i];) {
                             sSelectOption += (sSelectOption == "" ? "" : ",") + oKeyProp.name;
                         }
@@ -3067,7 +3065,7 @@ sap.ui.define([
                     break;
                 }
                 case "$filter": {
-                    var sFilterOption = null;
+                    let sFilterOption = null;
                     if (this._oFilterExpression) {
                         sFilterOption = this._oFilterExpression.getURIFilterOptionValue();
                     }
@@ -3075,7 +3073,7 @@ sap.ui.define([
                     break;
                 }
                 case "$orderby": {
-                    var sSortOption = null;
+                    let sSortOption = null;
                     if (this._oSortExpression) {
                         sSortOption = this._oSortExpression.getURIOrderByOptionValue();
                     }
@@ -3107,20 +3105,20 @@ sap.ui.define([
          */
         getURIToQueryResultEntries: function (sServiceRootURI) {
             // construct resource path
-            var sResourcePath = this.getURIToQueryResultEntitySet(sServiceRootURI);
+            const sResourcePath = this.getURIToQueryResultEntitySet(sServiceRootURI);
 
             // construct $select
-            var sSelectOption = this.getURIQueryOptionValue("$select");
-            var sFilterOption = this.getURIQueryOptionValue("$filter");
-            var sSortOption = this.getURIQueryOptionValue("$orderby");
-            var sTopOption = this.getURIQueryOptionValue("$top");
-            var sSkipOption = this.getURIQueryOptionValue("$skip");
+            const sSelectOption = this.getURIQueryOptionValue("$select");
+            const sFilterOption = this.getURIQueryOptionValue("$filter");
+            const sSortOption = this.getURIQueryOptionValue("$orderby");
+            const sTopOption = this.getURIQueryOptionValue("$top");
+            const sSkipOption = this.getURIQueryOptionValue("$skip");
 
-            var sURI = sResourcePath;
-            var bQuestionmark = false;
+            let sURI = sResourcePath;
+            let bQuestionmark = false;
 
             if (sSelectOption) {
-                sURI += "?$select=" + sSelectOption;
+                sURI += `?$select=${sSelectOption}`;
                 bQuestionmark = true;
             }
             if (this._oFilterExpression && sFilterOption) {
@@ -3130,7 +3128,7 @@ sap.ui.define([
                 } else {
                     sURI += "&";
                 }
-                sURI += "$filter=" + sFilterOption;
+                sURI += `$filter=${sFilterOption}`;
             }
             if (this._oSortExpression && sSortOption) {
                 if (!bQuestionmark) {
@@ -3139,7 +3137,7 @@ sap.ui.define([
                 } else {
                     sURI += "&";
                 }
-                sURI += "$orderby=" + sSortOption;
+                sURI += `$orderby=${sSortOption}`;
             }
 
             if (this._iTopRequestOption && sTopOption) {
@@ -3149,7 +3147,7 @@ sap.ui.define([
                 } else {
                     sURI += "&";
                 }
-                sURI += "$top=" + sTopOption;
+                sURI += `$top=${sTopOption}`;
             }
             if (this._iSkipRequestOption && sSkipOption) {
                 if (!bQuestionmark) {
@@ -3158,7 +3156,7 @@ sap.ui.define([
                 } else {
                     sURI += "&";
                 }
-                sURI += "$skip=" + sSkipOption;
+                sURI += `$skip=${sSkipOption}`;
             }
             if (this._bIncludeCount) {
                 if (!bQuestionmark) {
@@ -3233,7 +3231,7 @@ sap.ui.define([
          */
         getFilterExpression: function () {
             if (this._oFilterExpression == null) {
-                var oEntityType = this._oParameter.getContainingParameterization().getEntityType();
+                const oEntityType = this._oParameter.getContainingParameterization().getEntityType();
                 this._oFilterExpression = new sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.FilterExpression(oEntityType
                     .getModel(), oEntityType.getSchema(), oEntityType);
             }
@@ -3264,7 +3262,7 @@ sap.ui.define([
          */
         getSortExpression: function () {
             if (this._oSortExpression == null) {
-                var oEntityType = this._oQueryResult.getEntityType();
+                const oEntityType = this._oQueryResult.getEntityType();
                 this._oSortExpression = new sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.SortExpression(oEntityType
                     .getModel(), oEntityType.getSchema(), oEntityType);
             }
@@ -3291,11 +3289,11 @@ sap.ui.define([
          * @returns {string} The value of the requested query option or null, if this option is not used for the OData request.
          */
         getURIQueryOptionValue: function (sQueryOptionName) {
-            var sQueryOptionValue = null;
+            let sQueryOptionValue = null;
 
             switch (sQueryOptionName) {
                 case "$select": {
-                    var sSelectOption = "";
+                    let sSelectOption = "";
                     sSelectOption += (sSelectOption == "" ? "" : ",") + this._oParameter.getProperty().name;
                     if (this._oValueSetResult.text == true && this._oParameter.getTextProperty()) {
                         sSelectOption += (sSelectOption == "" ? "" : ",")
@@ -3305,7 +3303,7 @@ sap.ui.define([
                     break;
                 }
                 case "$filter": {
-                    var sFilterOption = null;
+                    let sFilterOption = null;
                     if (this._oFilterExpression) {
                         sFilterOption = this._oFilterExpression.getURIFilterOptionValue();
                     }
@@ -3313,7 +3311,7 @@ sap.ui.define([
                     break;
                 }
                 case "$orderby": {
-                    var sSortOption = null;
+                    let sSortOption = null;
                     if (this._oSortExpression) {
                         sSortOption = this._oSortExpression.getURIOrderByOptionValue();
                     }
@@ -3336,21 +3334,21 @@ sap.ui.define([
          */
         getURIToParameterValueSetEntries: function (sServiceRootURI) {
             // construct resource path
-            var sResourcePath = null;
+            let sResourcePath = null;
 
-            sResourcePath = (sServiceRootURI || "") + "/"
-                + this._oParameter.getContainingParameterization().getEntitySet().getQName();
+            sResourcePath = `${sServiceRootURI || ""}/${
+                this._oParameter.getContainingParameterization().getEntitySet().getQName()}`;
 
             // construct query options
-            var sSelectOption = this.getURIQueryOptionValue("$select");
-            var sFilterOption = this.getURIQueryOptionValue("$filter");
-            var sSortOption = this.getURIQueryOptionValue("$orderby");
+            const sSelectOption = this.getURIQueryOptionValue("$select");
+            const sFilterOption = this.getURIQueryOptionValue("$filter");
+            const sSortOption = this.getURIQueryOptionValue("$orderby");
 
-            var sURI = sResourcePath;
-            var bQuestionmark = false;
+            let sURI = sResourcePath;
+            let bQuestionmark = false;
 
             if (sSelectOption) {
-                sURI += "?$select=" + sSelectOption;
+                sURI += `?$select=${sSelectOption}`;
                 bQuestionmark = true;
             }
             if (this._oFilterExpression && sFilterOption) {
@@ -3360,7 +3358,7 @@ sap.ui.define([
                 } else {
                     sURI += "&";
                 }
-                sURI += "$filter=" + sFilterOption;
+                sURI += `$filter=${sFilterOption}`;
             }
             if (this._oSortExpression && sSortOption) {
                 if (!bQuestionmark) {
@@ -3369,7 +3367,7 @@ sap.ui.define([
                 } else {
                     sURI += "&";
                 }
-                sURI += "$orderby=" + sSortOption;
+                sURI += `$orderby=${sSortOption}`;
             }
             return sURI;
         },
@@ -3447,7 +3445,7 @@ sap.ui.define([
          */
         getFilterExpression: function () {
             if (this._oFilterExpression == null) {
-                var oEntityType = this._oDimension.getContainingQueryResult().getEntityType();
+                const oEntityType = this._oDimension.getContainingQueryResult().getEntityType();
                 this._oFilterExpression = new sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.FilterExpression(oEntityType
                     .getModel(), oEntityType.getSchema(), oEntityType);
             }
@@ -3478,7 +3476,7 @@ sap.ui.define([
          */
         getSortExpression: function () {
             if (this._oSortExpression == null) {
-                var oEntityType = this._oQueryResult.getEntityType();
+                const oEntityType = this._oQueryResult.getEntityType();
                 this._oSortExpression = new sap.ushell.components.tiles.indicatorTileUtils.odata4analytics.SortExpression(oEntityType
                     .getModel(), oEntityType.getSchema(), oEntityType);
             }
@@ -3514,11 +3512,11 @@ sap.ui.define([
          * @returns {string} The value of the requested query option or null, if this option is not used for the OData request.
          */
         getURIQueryOptionValue: function (sQueryOptionName) {
-            var sQueryOptionValue = null;
+            let sQueryOptionValue = null;
 
             switch (sQueryOptionName) {
                 case "$select": {
-                    var sSelectOption = "";
+                    let sSelectOption = "";
                     sSelectOption += (sSelectOption == "" ? "" : ",")
                         + this._oDimension.getKeyProperty().name;
                     if (this._oValueSetResult.text == true && this._oDimension.getTextProperty()) {
@@ -3535,7 +3533,7 @@ sap.ui.define([
                     break;
                 }
                 case "$filter": {
-                    var sFilterOption = null;
+                    let sFilterOption = null;
                     if (this._oFilterExpression) {
                         sFilterOption = this._oFilterExpression.getURIFilterOptionValue();
                     }
@@ -3543,7 +3541,7 @@ sap.ui.define([
                     break;
                 }
                 case "$orderby": {
-                    var sSortOption = null;
+                    let sSortOption = null;
                     if (this._oSortExpression) {
                         sSortOption = this._oSortExpression.getURIOrderByOptionValue();
                     }
@@ -3566,30 +3564,30 @@ sap.ui.define([
          */
         getURIToDimensionMemberEntries: function (sServiceRootURI) {
             // construct resource path
-            var sResourcePath = null;
+            let sResourcePath = null;
             if (this._oDimension.getContainingQueryResult().getParameterization()) {
                 if (!this._oParameterizationRequest) {
                     throw "Missing parameterization request";
                 } else {
-                    sResourcePath = this._oParameterizationRequest.getURIToParameterizationEntry(sServiceRootURI)
-                        + "/"
-                        + this._oDimension.getContainingQueryResult().getParameterization().getNavigationPropertyToQueryResult();
+                    sResourcePath = `${this._oParameterizationRequest.getURIToParameterizationEntry(sServiceRootURI)
+                    }/${
+                        this._oDimension.getContainingQueryResult().getParameterization().getNavigationPropertyToQueryResult()}`;
                 }
             } else {
-                sResourcePath = (sServiceRootURI || "") + "/"
-                    + this._oDimension.getContainingQueryResult().getEntitySet().getQName();
+                sResourcePath = `${sServiceRootURI || ""}/${
+                    this._oDimension.getContainingQueryResult().getEntitySet().getQName()}`;
             }
 
             // construct query options
-            var sSelectOption = this.getURIQueryOptionValue("$select");
-            var sFilterOption = this.getURIQueryOptionValue("$filter");
-            var sSortOption = this.getURIQueryOptionValue("$orderby");
+            const sSelectOption = this.getURIQueryOptionValue("$select");
+            const sFilterOption = this.getURIQueryOptionValue("$filter");
+            const sSortOption = this.getURIQueryOptionValue("$orderby");
 
-            var sURI = sResourcePath;
-            var bQuestionmark = false;
+            let sURI = sResourcePath;
+            let bQuestionmark = false;
 
             if (sSelectOption) {
-                sURI += "?$select=" + sSelectOption;
+                sURI += `?$select=${sSelectOption}`;
                 bQuestionmark = true;
             }
             if (this._oFilterExpression && sFilterOption) {
@@ -3599,7 +3597,7 @@ sap.ui.define([
                 } else {
                     sURI += "&";
                 }
-                sURI += "$filter=" + sFilterOption;
+                sURI += `$filter=${sFilterOption}`;
             }
             if (this._oSortExpression && sSortOption) {
                 if (!bQuestionmark) {
@@ -3608,7 +3606,7 @@ sap.ui.define([
                 } else {
                     sURI += "&";
                 }
-                sURI += "$orderby=" + sSortOption;
+                sURI += `$orderby=${sSortOption}`;
             }
             return sURI;
         },