@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/components/tiles/indicatorDualComparison/DualComparison.controller.js

@@ -12,26 +12,26 @@ sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/base/Log"
     // "sap/ushell/components/tiles/indicatorTileUtils/cache" // do not migrate
-], function (
+], (
     util,
     mobileLibrary,
     jQuery,
     Log
     // cache // do not migrate
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.Size
-    var Size = mobileLibrary.Size;
+    const Size = mobileLibrary.Size;
 
     // shortcut for sap.m.DeviationIndicator
-    var DeviationIndicator = mobileLibrary.DeviationIndicator;
+    const DeviationIndicator = mobileLibrary.DeviationIndicator;
 
     // shortcut for sap.m.ValueColor
-    var ValueColor = mobileLibrary.ValueColor;
+    const ValueColor = mobileLibrary.ValueColor;
 
     // shortcut for sap.m.LoadState
-    var LoadState = mobileLibrary.LoadState;
+    const LoadState = mobileLibrary.LoadState;
 
     /* eslint-disable block-scoped-var */ // TODO: remove eslint-disable
     /* eslint-disable no-undef */ // TODO: remove eslint-disable
@@ -42,14 +42,14 @@ sap.ui.define([
         },
 
         _updateTileModel: function (newData) {
-            var modelData = this.getTile().getModel().getData();
+            const modelData = this.getTile().getModel().getData();
             jQuery.extend(modelData, newData);
             this.getTile().getModel().setData(modelData);
         },
 
         setTitle: function () {
-            var that = this;
-            var titleObj = sap.ushell.components.tiles.indicatorTileUtils.util.getTileTitleSubtitle(this.oChip);
+            const that = this;
+            const titleObj = sap.ushell.components.tiles.indicatorTileUtils.util.getTileTitleSubtitle(this.oChip);
             this._updateTileModel({
                 header: titleObj.title || sap.ushell.components.tiles.indicatorTileUtils.util.getChipTitle(that.oConfig),
                 subheader: titleObj.subTitle || sap.ushell.components.tiles.indicatorTileUtils.util.getChipSubTitle(that.oConfig)
@@ -63,19 +63,19 @@ sap.ui.define([
         },
 
         formSelectStatement: function (object) {
-            var tmpArray = Object.keys(object);
-            var sFormedMeasure = "";
-            for (var i = 0; i < tmpArray.length; i++) {
+            const tmpArray = Object.keys(object);
+            let sFormedMeasure = "";
+            for (let i = 0; i < tmpArray.length; i++) {
                 if ((object[tmpArray[i]] !== undefined) && (object.fullyFormedMeasure)) {
-                    sFormedMeasure += "," + object[tmpArray[i]];
+                    sFormedMeasure += `,${object[tmpArray[i]]}`;
                 }
             } return sFormedMeasure;
         },
 
         setThresholdValues: function () {
-            var that = this;
+            const that = this;
             try {
-                var oThresholdObject = {};
+                const oThresholdObject = {};
                 oThresholdObject.fullyFormedMeasure = this.DEFINITION_DATA.EVALUATION.COLUMN_NAME;
                 if (this.DEFINITION_DATA.EVALUATION.VALUES_SOURCE == "MEASURE") {
                     switch (this.DEFINITION_DATA.EVALUATION.GOAL_TYPE) {
@@ -118,14 +118,14 @@ sap.ui.define([
         },
 
         getTrendColor: function (oThresholdObj) {
-            var that = this;
-            var criticalHighValue,
-                warningHighValue,
-                criticalLowValue,
-                warningLowValue;
+            const that = this;
+            let criticalHighValue;
+            let warningHighValue;
+            let criticalLowValue;
+            let warningLowValue;
             try {
-                var improvementDirection = this.DEFINITION_DATA.EVALUATION.GOAL_TYPE;
-                var returnColor = ValueColor.Neutral;
+                const improvementDirection = this.DEFINITION_DATA.EVALUATION.GOAL_TYPE;
+                let returnColor = ValueColor.Neutral;
                 if (improvementDirection === "MI") {
                     if (oThresholdObj.criticalHighValue && oThresholdObj.warningHighValue) {
                         criticalHighValue = Number(oThresholdObj.criticalHighValue);
@@ -171,10 +171,10 @@ sap.ui.define([
         },
 
         _processDataForComparisonChart: function (data, measure, unit) {
-            var finalOutput = [], LABEL_MAPPING = {}, i, tempObject, l;
-            var tempVar;
-            var aTitles = [];
-            var that = this;
+            const finalOutput = []; const LABEL_MAPPING = {}; let i; let tempObject; let l;
+            let tempVar;
+            let aTitles = [];
+            const that = this;
 
             for (i = 0; i < data.results.length; i++) {
                 var eachData = data.results[i];
@@ -184,12 +184,12 @@ sap.ui.define([
                 tempObject = aTitles[i];
                 LABEL_MAPPING[tempObject.key] = tempObject.value;
             }
-            var columnName = that.oConfig.TILE_PROPERTIES.COLUMN_NAMES || that.oConfig.EVALUATION.COLUMN_NAMES;
+            const columnName = that.oConfig.TILE_PROPERTIES.COLUMN_NAMES || that.oConfig.EVALUATION.COLUMN_NAMES;
             for (i = 0; i < columnName.length; i++) {
-                var temp = {};
-                var columnObject = columnName[i];
+                const temp = {};
+                const columnObject = columnName[i];
                 temp.value = Number(eachData[columnObject.COLUMN_NAME]);
-                var calculatedValueForScaling = Number(eachData[columnObject.COLUMN_NAME]);
+                let calculatedValueForScaling = Number(eachData[columnObject.COLUMN_NAME]);
                 if (that.oConfig.EVALUATION.SCALING == -2) {
                     calculatedValueForScaling *= 100;
                 }
@@ -200,7 +200,7 @@ sap.ui.define([
                 }
                 temp.displayValue = tempVar.toString();
                 if (unit[i] && eachData[unit[i].name]) {
-                    temp.displayValue += " " + eachData[unit[i].name];
+                    temp.displayValue += ` ${eachData[unit[i].name]}`;
                 }
                 temp.color = columnObject.semanticColor;
                 temp.title = LABEL_MAPPING[columnObject.COLUMN_NAME] || columnObject.COLUMN_NAME;
@@ -212,10 +212,10 @@ sap.ui.define([
         },
 
         getTrendIndicator: function (trendValue, value) {
-            var that = this;
+            const that = this;
             trendValue = Number(trendValue);
             try {
-                var trendIndicator = DeviationIndicator.None;
+                let trendIndicator = DeviationIndicator.None;
                 if (trendValue > value) {
                     trendIndicator = DeviationIndicator.Down;
                 } else if (trendValue < value) {
@@ -228,13 +228,13 @@ sap.ui.define([
         },
 
         fetchKpiValue: function (fnSuccess, fnError) {
-            var that = this;
+            const that = this;
 
             try {
                 /* Preparing arguments for the prepareQueryServiceUri function */
-                var sUri = this.oConfig.EVALUATION.ODATA_URL,
-                    entitySet = this.oConfig.EVALUATION.ODATA_ENTITYSET,
-                    measure;
+                const sUri = this.oConfig.EVALUATION.ODATA_URL;
+                const entitySet = this.oConfig.EVALUATION.ODATA_ENTITYSET;
+                let measure;
                 if (this.oConfig.TILE_PROPERTIES.semanticMeasure) {
                     /*
                      * Semantic Measure Inclusion (for Future use)
@@ -242,36 +242,36 @@ sap.ui.define([
                      * measure.push(this.oConfig.EVALUATION.COLUMN_NAME);
                      * measure.push(this.oConfig.TILE_PROPERTIES.semanticMeasure);
                      */
-                    measure = this.oConfig.EVALUATION.COLUMN_NAME + "," + this.oConfig.TILE_PROPERTIES.semanticMeasure;
+                    measure = `${this.oConfig.EVALUATION.COLUMN_NAME},${this.oConfig.TILE_PROPERTIES.semanticMeasure}`;
                 } else {
                     measure = this.oConfig.EVALUATION.COLUMN_NAME;
                     var measures = measure;
                     if (this.oConfig.TILE_PROPERTIES.COLUMN_NAMES) {
-                        for (var j = 0; j < this.oConfig.TILE_PROPERTIES.COLUMN_NAMES.length; j++) {
+                        for (let j = 0; j < this.oConfig.TILE_PROPERTIES.COLUMN_NAMES.length; j++) {
                             if (this.oConfig.TILE_PROPERTIES.COLUMN_NAMES[j].COLUMN_NAME != this.oConfig.EVALUATION.COLUMN_NAME) {
-                                measures = measures + "," + this.oConfig.TILE_PROPERTIES.COLUMN_NAMES[j].COLUMN_NAME;
+                                measures = `${measures},${this.oConfig.TILE_PROPERTIES.COLUMN_NAMES[j].COLUMN_NAME}`;
                             }
                         }
                     }
-                } var data = this.oConfig.EVALUATION_VALUES;
-                var cachedValue = sap.ushell.components.tiles.indicatorTileUtils.cache.getKpivalueById(that.oConfig.TILE_PROPERTIES.id);
+                } const data = this.oConfig.EVALUATION_VALUES;
+                const cachedValue = sap.ushell.components.tiles.indicatorTileUtils.cache.getKpivalueById(that.oConfig.TILE_PROPERTIES.id);
                 if (!cachedValue) {
-                    var variants = sap.ushell.components.tiles.indicatorTileUtils.util.prepareFilterStructure(this.oConfig.EVALUATION_FILTERS, this.oConfig.ADDITIONAL_FILTERS);
+                    const variants = sap.ushell.components.tiles.indicatorTileUtils.util.prepareFilterStructure(this.oConfig.EVALUATION_FILTERS, this.oConfig.ADDITIONAL_FILTERS);
 
-                    var orderByObject = {};
-                    orderByObject["0"] = measure + ",asc";
-                    orderByObject["1"] = measure + ",desc";
+                    const orderByObject = {};
+                    orderByObject["0"] = `${measure},asc`;
+                    orderByObject["1"] = `${measure},desc`;
 
-                    var orderByElement = orderByObject[this.oConfig.TILE_PROPERTIES.sortOrder || "0"].split(",");
-                    var finalQuery = sap.ushell.components.tiles.indicatorTileUtils.util.prepareQueryServiceUri(that.oChip.url.addSystemToServiceUrl(sUri), entitySet, measures, null, variants, 3);
+                    const orderByElement = orderByObject[this.oConfig.TILE_PROPERTIES.sortOrder || "0"].split(",");
+                    const finalQuery = sap.ushell.components.tiles.indicatorTileUtils.util.prepareQueryServiceUri(that.oChip.url.addSystemToServiceUrl(sUri), entitySet, measures, null, variants, 3);
                     if (this.oConfig.TILE_PROPERTIES.semanticMeasure) {
-                        finalQuery.uri += "&$orderby=" + orderByElement[0] + " " + orderByElement[2];
+                        finalQuery.uri += `&$orderby=${orderByElement[0]} ${orderByElement[2]}`;
                     } else {
-                        finalQuery.uri += "&$orderby=" + orderByElement[0] + " " + orderByElement[1];
+                        finalQuery.uri += `&$orderby=${orderByElement[0]} ${orderByElement[1]}`;
                     }
 
                     this.writeData = {};
-                    this.comparisionChartODataRef = finalQuery.model.read(finalQuery.uri, null, null, true, function (data) {
+                    this.comparisionChartODataRef = finalQuery.model.read(finalQuery.uri, null, null, true, (data) => {
                         if (data && data.results && data.results.length) {
                             if (finalQuery.unit) {
                                 that.writeData.unit = finalQuery.unit;
@@ -280,9 +280,9 @@ sap.ui.define([
                             that.oConfig.TILE_PROPERTIES.FINALVALUE = data;
                             that.oConfig.TILE_PROPERTIES.FINALVALUE = that._processDataForComparisonChart(that.oConfig.TILE_PROPERTIES.FINALVALUE, measures.split(",")[0], finalQuery.unit);
                             that.writeData.data = data;
-                            var calculatedValueForScaling;
+                            let calculatedValueForScaling;
 
-                            for (var i = 0; i < that.oConfig.TILE_PROPERTIES.FINALVALUE.length; i++) {
+                            for (let i = 0; i < that.oConfig.TILE_PROPERTIES.FINALVALUE.length; i++) {
                                 if (that.oConfig.TILE_PROPERTIES.FINALVALUE[i].title == that.DEFINITION_DATA.EVALUATION.COLUMN_NAME) {
                                     that.writeData.numericData = that.oConfig.TILE_PROPERTIES.FINALVALUE[i];
                                     calculatedValueforScaling = that.oConfig.TILE_PROPERTIES.FINALVALUE[i].value;
@@ -306,24 +306,24 @@ sap.ui.define([
                         } else {
                             fnError.call(that, "no Response from QueryServiceUri");
                         }
-                    }, function (eObject) {
+                    }, (eObject) => {
                         if (eObject && eObject.response) {
-                            Log.error(eObject.message + " : " + eObject.request.requestUri);
+                            Log.error(`${eObject.message} : ${eObject.request.requestUri}`);
                             fnError.call(that, eObject);
                         }
                     });
 
                     if (!that.writeData.numericData) {
-                        var variantData = sap.ushell.components.tiles.indicatorTileUtils.util.prepareFilterStructure(
+                        const variantData = sap.ushell.components.tiles.indicatorTileUtils.util.prepareFilterStructure(
                             that.DEFINITION_DATA.EVALUATION_FILTERS, that.DEFINITION_DATA.ADDITIONAL_FILTERS);
 
-                        var oQuery = sap.ushell.components.tiles.indicatorTileUtils.util.prepareQueryServiceUri(
+                        const oQuery = sap.ushell.components.tiles.indicatorTileUtils.util.prepareQueryServiceUri(
                             that.oChip.url.addSystemToServiceUrl(sUri), entitySet, measure, null, variantData);
                         if (oQuery) {
                             that.QUERY_SERVICE_MODEL = oQuery.model;
                             that.queryUriForKpiValue = oQuery.uri;
 
-                            that.numericODataReadRef = that.QUERY_SERVICE_MODEL.read(oQuery.uri, null, null, true, function (data) {
+                            that.numericODataReadRef = that.QUERY_SERVICE_MODEL.read(oQuery.uri, null, null, true, (data) => {
                                 if (data && data.results && data.results.length) {
                                     if (oQuery.unit) {
                                         that._updateTileModel({
@@ -338,9 +338,9 @@ sap.ui.define([
                                     that.writeData.numericData.color = that.getTrendColor(that.setThresholdValues());
                                     that.DEFINITION_DATA.valueColor = that.writeData.numericData.color;
 
-                                    var oScaledValue = "";
-                                    var calculatedValueForScaling = data.results[0][that.DEFINITION_DATA.EVALUATION.COLUMN_NAME];
-                                    var trendIndicator = that.getTrendIndicator(that.setThresholdValues().trendValue, calculatedValueForScaling);
+                                    let oScaledValue = "";
+                                    let calculatedValueForScaling = data.results[0][that.DEFINITION_DATA.EVALUATION.COLUMN_NAME];
+                                    const trendIndicator = that.getTrendIndicator(that.setThresholdValues().trendValue, calculatedValueForScaling);
                                     if (that.oConfig.EVALUATION.SCALING == -2) {
                                         calculatedValueForScaling *= 100;
                                         that.getView().oNumericContent.setFormatterValue(false);
@@ -391,7 +391,7 @@ sap.ui.define([
         },
 
         flowWithoutDesignTimeCall: function () {
-            var that = this;
+            const that = this;
             this.DEFINITION_DATA = this.oConfig;
             this._updateTileModel(this.DEFINITION_DATA);
             if (this.oChip.visible.isVisible() && !this.firstTimeVisible) {
@@ -403,9 +403,9 @@ sap.ui.define([
                     that.oDualComparisonView.oGenericTile.addTileContent(that.oDualComparisonView.oNumericTile);
                     that.oDualComparisonView.oGenericTile.addTileContent(that.oDualComparisonView.oComparisonTile);
 
-                    var calculatedKpiValue = this.CALCULATED_KPI_VALUE;
-                    var applyColor, calculatedValueForScaling;
-                    for (var i = 0; i < calculatedKpiValue.length; i++) {
+                    const calculatedKpiValue = this.CALCULATED_KPI_VALUE;
+                    let applyColor; let calculatedValueForScaling;
+                    for (let i = 0; i < calculatedKpiValue.length; i++) {
                         if (calculatedKpiValue[i].title == that.DEFINITION_DATA.EVALUATION.COLUMN_NAME) {
                             calculatedValueForScaling = calculatedKpiValue[i].value;
                             applyColor = calculatedKpiValue[i].color || "Neutral";
@@ -426,11 +426,11 @@ sap.ui.define([
                             that.oConfig.EVALUATION.SCALING, that.oConfig.EVALUATION.DECIMAL_PRECISION).toString(),
                         data: this.CALCULATED_KPI_VALUE
                     });
-                    var navTarget = sap.ushell.components.tiles.indicatorTileUtils.util.getNavigationTarget(that.oConfig, that.system);
-                    that.oDualComparisonView.oGenericTile.$().wrap("<a href ='" + navTarget + "'></a>");
+                    const navTarget = sap.ushell.components.tiles.indicatorTileUtils.util.getNavigationTarget(that.oConfig, that.system);
+                    that.oDualComparisonView.oGenericTile.$().wrap(`<a href ='${navTarget}'></a>`);
                     this.oDualComparisonView.oGenericTile.setState(LoadState.Loaded);
 
-                    var status = "";
+                    let status = "";
                     if (applyColor == "Error") {
                         status = "sb.error";
                     }
@@ -443,9 +443,9 @@ sap.ui.define([
                     if (applyColor == "Good") {
                         status = "sb.good";
                     }
-                    var sThresholdObj = that.setThresholdValues();
+                    const sThresholdObj = that.setThresholdValues();
 
-                    var m1, m2, m3, v1, v2, v3, c1, c2, c3;
+                    let m1; let m2; let m3; let v1; let v2; let v3; let c1; let c2; let c3;
                     if (this.CALCULATED_KPI_VALUE && this.CALCULATED_KPI_VALUE[0]) {
                         m1 = this.CALCULATED_KPI_VALUE[0].title;
                         v1 = this.CALCULATED_KPI_VALUE[0].value;
@@ -462,7 +462,7 @@ sap.ui.define([
                         c3 = sap.ushell.components.tiles.indicatorTileUtils.util.getSemanticColorName(this.CALCULATED_KPI_VALUE[2].color);
                     }
 
-                    var valueObjNumeric = {
+                    const valueObjNumeric = {
                         status: status,
                         actual: calculatedValueForScaling,
                         target: sThresholdObj.targetValue,
@@ -471,7 +471,7 @@ sap.ui.define([
                         wL: sThresholdObj.warningLowValue,
                         cL: sThresholdObj.criticalLowValue
                     };
-                    var valueObjComparison = {
+                    const valueObjComparison = {
                         m1: m1,
                         v1: v1,
                         c1: c1,
@@ -483,8 +483,8 @@ sap.ui.define([
                         c3: c3
                     };
 
-                    var oControlNumeric = that.oDualComparisonView.oGenericTile.getTileContent()[0].getContent();
-                    var oControlComparison = that.oDualComparisonView.oGenericTile.getTileContent()[1].getContent();
+                    const oControlNumeric = that.oDualComparisonView.oGenericTile.getTileContent()[0].getContent();
+                    const oControlComparison = that.oDualComparisonView.oGenericTile.getTileContent()[1].getContent();
                     sap.ushell.components.tiles.indicatorTileUtils.util.setTooltipInTile(oControlNumeric, "NT", valueObjNumeric);
                     sap.ushell.components.tiles.indicatorTileUtils.util.setTooltipInTile(oControlComparison, "COMP", valueObjComparison);
                 }, this.logError);
@@ -492,14 +492,14 @@ sap.ui.define([
         },
 
         flowWithDesignTimeCall: function () {
-            var that = this;
+            const that = this;
             try {
-                var evaluationData = sap.ushell.components.tiles.indicatorTileUtils.cache.getEvaluationById(this.oConfig.EVALUATION.ID);
+                const evaluationData = sap.ushell.components.tiles.indicatorTileUtils.cache.getEvaluationById(this.oConfig.EVALUATION.ID);
                 if (evaluationData) {
                     that.oConfig.EVALUATION_FILTERS = evaluationData.EVALUATION_FILTERS;
                     that.flowWithoutDesignTimeCall();
                 } else {
-                    sap.ushell.components.tiles.indicatorTileUtils.util.getFilterFromRunTimeService(this.oConfig, function (filter) {
+                    sap.ushell.components.tiles.indicatorTileUtils.util.getFilterFromRunTimeService(this.oConfig, (filter) => {
                         that.oConfig.EVALUATION_FILTERS = filter;
                         sap.ushell.components.tiles.indicatorTileUtils.cache.setEvaluationById(that.oConfig.TILE_PROPERTIES.id, that.oConfig);
                         that.flowWithoutDesignTimeCall();
@@ -531,7 +531,7 @@ sap.ui.define([
         },
 
         onInit: function () {
-            var that = this;
+            const that = this;
             this.firstTimeVisible = false;
             this.oDualComparisonView = this.getView();
             this.oChip = this.oDualComparisonView.getViewData().chip;
@@ -542,7 +542,7 @@ sap.ui.define([
             this.oDualComparisonView.oGenericTile.setState(LoadState.Loading);
             try {
                 sap.ushell.components.tiles.indicatorTileUtils.util.getParsedChip(
-                    this.oChip.configuration.getParameterValueAsString("tileConfiguration"), this.oChip.preview.isEnabled(), function (config) {
+                    this.oChip.configuration.getParameterValueAsString("tileConfiguration"), this.oChip.preview.isEnabled(), (config) => {
                         that.oConfig = config;
                         if (that.oChip.preview) {
                             that.oChip.preview.setTargetUrl(sap.ushell.components.tiles.indicatorTileUtils.util.getNavigationTarget(that.oConfig, that.system));
@@ -568,7 +568,7 @@ sap.ui.define([
                             that.oDualComparisonView.oGenericTile.setState(LoadState.Loaded);
                         } else {
                             that.setTitle();
-                            that.oDualComparisonView.oGenericTile.attachPress(function () {
+                            that.oDualComparisonView.oGenericTile.attachPress(() => {
                                 sap.ushell.components.tiles.indicatorTileUtils.util.abortPendingODataCalls(that.comparisionChartODataRef);
                                 sap.ushell.components.tiles.indicatorTileUtils.cache.setKpivalueById(that.oConfig.TILE_PROPERTIES.id, null);
                                 window.location.hash = sap.ushell.components.tiles.indicatorTileUtils.util.getNavigationTarget(that.oConfig, that.system);

package/src/main/js/sap/ushell/components/tiles/indicatorDualComparison/DualComparison.view.js

@@ -17,7 +17,7 @@ sap.ui.define([
     "sap/suite/ui/microchart/ComparisonMicroChart",
     "sap/m/GenericTile",
     "sap/ui/model/json/JSONModel"
-], function (
+], (
     JSView,
     NumberFormat,
     odata4analytics,
@@ -28,7 +28,7 @@ sap.ui.define([
     ComparisonMicroChart,
     GenericTile,
     JSONModel
-) {
+) => {
     "use strict";
 
     sap.ui.getCore().loadLibrary("sap.suite.ui.microchart");
@@ -42,7 +42,7 @@ sap.ui.define([
             this.setHeight("100%");
             this.setWidth("100%");
 
-            var that = this;
+            const that = this;
 
             that.oGenericTileData = {};