@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/components/tiles/indicatorArea/AreaChartTile.controller.js

@@ -15,25 +15,25 @@ sap.ui.define([
     "sap/suite/ui/microchart/AreaMicroChartItem",
     "sap/suite/ui/microchart/AreaMicroChartPoint"
     // "sap/ushell/components/tiles/indicatorTileUtils/cache" // do not migrate
-], function (
+], (
     generic,
     mobileLibrary,
     AreaMicroChartItem,
     AreaMicroChartPoint
     // cache // do not migrate
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.FrameType
-    var FrameType = mobileLibrary.FrameType;
+    const FrameType = mobileLibrary.FrameType;
 
     // shortcut for sap.m.LoadState
-    var LoadState = mobileLibrary.LoadState;
+    const LoadState = mobileLibrary.LoadState;
 
     /* eslint-disable no-nested-ternary */ // TODO: remove eslint-disable
     /* eslint-disable block-scoped-var */ // TODO: remove eslint-disable
 
-    var AreaChartTileController = generic.extend("sap.ushell.components.tiles.indicatorArea.AreaChartTile", {
+    const AreaChartTileController = generic.extend("sap.ushell.components.tiles.indicatorArea.AreaChartTile", {
         onInit: function () {
             this.KPI_VALUE_REQUIRED = false;
         },
@@ -42,7 +42,7 @@ sap.ui.define([
             this.onAfterFinalEvaluation(bRefreshClick, isAutoRefresh);
         },
         doDummyProcess: function () {
-            var that = this;
+            const that = this;
             this.setTextInTile();
             that._updateTileModel({
                 footer: "",
@@ -115,29 +115,29 @@ sap.ui.define([
         },
 
         onAfterFinalEvaluation: function (bRefreshClick, isAutoRefresh) {
-            var that = this;
-            var sEntitySet = this.DEFINITION_DATA.EVALUATION.ODATA_ENTITYSET;
-            var sMeasure = this.DEFINITION_DATA.EVALUATION.COLUMN_NAME;
-            var variantData = sap.ushell.components.tiles.indicatorTileUtils.util.prepareFilterStructure(this.DEFINITION_DATA.EVALUATION_FILTERS, this.DEFINITION_DATA.ADDITIONAL_FILTERS);
-            var dimensionName = this.DEFINITION_DATA.TILE_PROPERTIES.dimension;
+            const that = this;
+            const sEntitySet = this.DEFINITION_DATA.EVALUATION.ODATA_ENTITYSET;
+            const sMeasure = this.DEFINITION_DATA.EVALUATION.COLUMN_NAME;
+            const variantData = sap.ushell.components.tiles.indicatorTileUtils.util.prepareFilterStructure(this.DEFINITION_DATA.EVALUATION_FILTERS, this.DEFINITION_DATA.ADDITIONAL_FILTERS);
+            let dimensionName = this.DEFINITION_DATA.TILE_PROPERTIES.dimension;
             if (dimensionName == undefined) {
                 this.logError();
                 return;
             }
 
-            var goaltype = this.DEFINITION_DATA.EVALUATION.GOAL_TYPE;
-            var evaluationValues = this.DEFINITION_DATA.EVALUATION_VALUES;
-            var cachedValue = sap.ushell.components.tiles.indicatorTileUtils.cache.getKpivalueById(that.oConfig.TILE_PROPERTIES.id);
+            const goaltype = this.DEFINITION_DATA.EVALUATION.GOAL_TYPE;
+            const evaluationValues = this.DEFINITION_DATA.EVALUATION_VALUES;
+            const cachedValue = sap.ushell.components.tiles.indicatorTileUtils.cache.getKpivalueById(that.oConfig.TILE_PROPERTIES.id);
 
             if (sap.ushell.components.tiles.indicatorTileUtils.util.isDualTile(that.oConfig)) {
                 if (cachedValue) {
                     var tempData = cachedValue.Data && JSON.parse(cachedValue.Data);
                 }
             }
-            var chipUpdateTime = that.oTileApi.configuration.getParameterValueAsString("timeStamp");
-            var isCacheValid = sap.ushell.components.tiles.indicatorTileUtils.util.isCacheValid(that.oConfig.TILE_PROPERTIES.id, chipUpdateTime, that.chipCacheTime, that.chipCacheTimeUnit, that.tilePressed);
+            const chipUpdateTime = that.oTileApi.configuration.getParameterValueAsString("timeStamp");
+            const isCacheValid = sap.ushell.components.tiles.indicatorTileUtils.util.isCacheValid(that.oConfig.TILE_PROPERTIES.id, chipUpdateTime, that.chipCacheTime, that.chipCacheTimeUnit, that.tilePressed);
 
-            var fullyFormedMeasure = sMeasure;
+            let fullyFormedMeasure = sMeasure;
             if (this.DEFINITION_DATA.EVALUATION.VALUES_SOURCE == "MEASURE") {
                 switch (goaltype) {
                     case "MI":
@@ -146,7 +146,7 @@ sap.ui.define([
                         that.sTarget = sap.ushell.components.tiles.indicatorTileUtils.util.getEvalValueMeasureName(that.oConfig, "TA", "MEASURE");
                         that.sTrend = sap.ushell.components.tiles.indicatorTileUtils.util.getEvalValueMeasureName(that.oConfig, "TC", "MEASURE");
                         if (that.sWarningHigh && that.sCriticalHigh && that.sTarget) {
-                            fullyFormedMeasure += "," + that.sWarningHigh + "," + that.sCriticalHigh + "," + that.sTarget;
+                            fullyFormedMeasure += `,${that.sWarningHigh},${that.sCriticalHigh},${that.sTarget}`;
                         }
                         break;
                     case "MA":
@@ -155,7 +155,7 @@ sap.ui.define([
                         that.sTarget = sap.ushell.components.tiles.indicatorTileUtils.util.getEvalValueMeasureName(that.oConfig, "TA", "MEASURE");
                         that.sTrend = sap.ushell.components.tiles.indicatorTileUtils.util.getEvalValueMeasureName(that.oConfig, "TC", "MEASURE");
                         if (that.sWarningLow && that.sCriticalLow && that.sTarget) {
-                            fullyFormedMeasure += "," + that.sWarningLow + "," + that.sCriticalLow + "," + that.sTarget;
+                            fullyFormedMeasure += `,${that.sWarningLow},${that.sCriticalLow},${that.sTarget}`;
                         }
                         break;
                     case "RA":
@@ -166,21 +166,21 @@ sap.ui.define([
                         that.sWarningLow = sap.ushell.components.tiles.indicatorTileUtils.util.getEvalValueMeasureName(that.oConfig, "WL", "MEASURE");
                         that.sCriticalLow = sap.ushell.components.tiles.indicatorTileUtils.util.getEvalValueMeasureName(that.oConfig, "CL", "MEASURE");
                         if (that.sWarningLow && that.sCriticalLow && that.sTarget && that.sWarningHigh && that.sCriticalHigh) {
-                            fullyFormedMeasure += "," + that.sWarningLow + "," + that.sCriticalLow + "," + that.sTarget + "," + that.sWarningHigh + "," + that.sCriticalHigh;
+                            fullyFormedMeasure += `,${that.sWarningLow},${that.sCriticalLow},${that.sTarget},${that.sWarningHigh},${that.sCriticalHigh}`;
                         }
                         break;
                 }
             }
-            var isRefreshClick = sap.ushell.components.tiles.indicatorTileUtils.util.getBoolValue(bRefreshClick);
+            const isRefreshClick = sap.ushell.components.tiles.indicatorTileUtils.util.getBoolValue(bRefreshClick);
             if ((tempData && !tempData.rightData) || !cachedValue || (!isCacheValid && that.oTileApi.visible.isVisible()) || isRefreshClick || (isAutoRefresh && that.oTileApi.visible.isVisible()) || that.getView().getViewData().refresh) {
                 if (that.kpiValueFetchDeferred) {
                     that.kpiValueFetchDeferred = false;
-                    var oQuery = sap.ushell.components.tiles.indicatorTileUtils.util.prepareQueryServiceUri(that.oRunTimeODataModel, sEntitySet, fullyFormedMeasure, dimensionName, variantData);
+                    const oQuery = sap.ushell.components.tiles.indicatorTileUtils.util.prepareQueryServiceUri(that.oRunTimeODataModel, sEntitySet, fullyFormedMeasure, dimensionName, variantData);
                     if (oQuery) {
                         this.queryUriForTrendChart = oQuery.uri;
-                        var writeData = {};
+                        const writeData = {};
                         try {
-                            this.trendChartODataReadRef = oQuery.model.read(oQuery.uri, null, null, true, function (data) {
+                            this.trendChartODataReadRef = oQuery.model.read(oQuery.uri, null, null, true, (data) => {
                                 that.kpiValueFetchDeferred = true;
                                 if (data && data.results && data.results.length) {
                                     if (oQuery.unit[0]) {
@@ -196,7 +196,7 @@ sap.ui.define([
                                     data.lastXlabel = data.results[data.results.length - 1][dimensionName];
                                     writeData.data = data;
                                     if (writeData && writeData.data && writeData.data.results && writeData.data.results.length) {
-                                        for (var itr = 0; itr < writeData.data.results.length; itr++) {
+                                        for (let itr = 0; itr < writeData.data.results.length; itr++) {
                                             delete writeData.data.results[itr].__metadata;
                                         }
                                     }
@@ -204,7 +204,7 @@ sap.ui.define([
                                     writeData.dimensionName = dimensionName;
                                     _applyData(data, that.DEFINITION_DATA.EVALUATION.VALUES_SOURCE);
 
-                                    var cacheData = {};
+                                    const cacheData = {};
                                     that.cacheTime = sap.ushell.components.tiles.indicatorTileUtils.util.getUTCDate();
                                     cacheData.ChipId = that.oConfig.TILE_PROPERTIES.id;
                                     cacheData.Data = JSON.stringify(writeData);
@@ -212,11 +212,11 @@ sap.ui.define([
                                     cacheData.CacheMaxAgeUnit = that.chipCacheTimeUnit;
                                     cacheData.CacheType = 1;
 
-                                    var localCache = that.getLocalCache(cacheData);
+                                    const localCache = that.getLocalCache(cacheData);
 
                                     if (that.DEFINITION_DATA.TILE_PROPERTIES.frameType == FrameType.TwoByOne) {
-                                        var tempCacheData = sap.ushell.components.tiles.indicatorTileUtils.cache.getKpivalueById(that.oConfig.TILE_PROPERTIES.id),
-                                            avilableCacheData;
+                                        const tempCacheData = sap.ushell.components.tiles.indicatorTileUtils.cache.getKpivalueById(that.oConfig.TILE_PROPERTIES.id);
+                                        let avilableCacheData;
                                         if (tempCacheData) {
                                             if (!tempCacheData.CachedTime) {
                                                 tempCacheData.CachedTime = sap.ushell.components.tiles.indicatorTileUtils.util.getUTCDate();
@@ -238,13 +238,13 @@ sap.ui.define([
                                         that.getView().getViewData().deferredObj.resolve();
                                     } else {
                                         sap.ushell.components.tiles.indicatorTileUtils.cache.setKpivalueById(that.oConfig.TILE_PROPERTIES.id, localCache);
-                                        var bUpdate = false;
+                                        let bUpdate = false;
                                         if (cachedValue) {
                                             bUpdate = true;
                                         }
                                         if (that.chipCacheTime) {
                                             sap.ushell.components.tiles.indicatorTileUtils.util.writeFrontendCacheByChipAndUserId(that.oTileApi, that.oConfig.TILE_PROPERTIES.id, cacheData,
-                                                bUpdate, function (data) {
+                                                bUpdate, (data) => {
                                                     if (data) {
                                                         that.cacheTime = data && data.CachedTime;
                                                         sap.ushell.components.tiles.indicatorTileUtils.cache.setKpivalueById(that.oConfig.TILE_PROPERTIES.id, data);
@@ -258,8 +258,8 @@ sap.ui.define([
                                         }
                                         that.oKpiTileView.oGenericTile.setState(LoadState.Loaded);
                                         that.updateDatajobScheduled = false;
-                                        var key = that.oConfig.TILE_PROPERTIES.id + "data";
-                                        var runningJob = sap.ushell.components.tiles.indicatorTileUtils.util.getScheduledJob(key);
+                                        const key = `${that.oConfig.TILE_PROPERTIES.id}data`;
+                                        let runningJob = sap.ushell.components.tiles.indicatorTileUtils.util.getScheduledJob(key);
                                         if (runningJob) {
                                             clearTimeout(runningJob);
                                             runningJob = undefined;
@@ -269,7 +269,7 @@ sap.ui.define([
                                 } else {
                                     that.setNoData();
                                 }
-                            }, function (eObject) {
+                            }, (eObject) => {
                                 that.kpiValueFetchDeferred = true;
                                 if (eObject && eObject.response) {
                                     that.logError("Data call failed");
@@ -286,8 +286,8 @@ sap.ui.define([
                 }
             } else if (cachedValue && cachedValue.Data) {
                 try {
-                    var kpiData;
-                    var tileType = that.oConfig && that.oConfig.TILE_PROPERTIES && that.oConfig.TILE_PROPERTIES.tileType;
+                    let kpiData;
+                    const tileType = that.oConfig && that.oConfig.TILE_PROPERTIES && that.oConfig.TILE_PROPERTIES.tileType;
                     if (tileType.indexOf("DT-") == -1) {
                         kpiData = cachedValue.Data && JSON.parse(cachedValue.Data);
                     } else {
@@ -320,18 +320,18 @@ sap.ui.define([
                 that.setNoData();
             }
             function _applyData (data, type) {
-                var dimensionArray = [];
-                var measureArray = [];
-                var wHArray = [];
-                var cHArray = [];
-                var cLArray = [];
-                var wLArray = [];
-                var firstXlabel = data.firstXlabel;
-                var minThresholdMeasure, maxThresholdMeasure, innerMinThresholdMeasure, innerMaxThresholdMeasure, targetMeasure;
-                var lastXlabel = data.lastXlabel;
-                var firstYLabelValue = Number(data.results[0][sMeasure]);
-                var lastYLabelValue = Number(data.results[data.results.length - 1][sMeasure]);
-                var i;
+                const dimensionArray = [];
+                const measureArray = [];
+                const wHArray = [];
+                const cHArray = [];
+                const cLArray = [];
+                const wLArray = [];
+                let firstXlabel = data.firstXlabel;
+                let minThresholdMeasure; let maxThresholdMeasure; let innerMinThresholdMeasure; let innerMaxThresholdMeasure; let targetMeasure;
+                let lastXlabel = data.lastXlabel;
+                const firstYLabelValue = Number(data.results[0][sMeasure]);
+                const lastYLabelValue = Number(data.results[data.results.length - 1][sMeasure]);
+                let i;
 
                 for (i in data.results) {
                     data.results[i][dimensionName] = Number(i);
@@ -353,33 +353,33 @@ sap.ui.define([
                 } catch (e) {
                     that.logError(e);
                 }
-                var firstCalculatedValueForScaling = Number(firstYLabelValue);
+                let firstCalculatedValueForScaling = Number(firstYLabelValue);
                 if (that.oConfig.EVALUATION.SCALING == -2) {
                     firstCalculatedValueForScaling *= 100;
                 }
-                var minMeasure = Math.min.apply(Math, measureArray); //to obtain the starting value
-                var c = that.isCurrencyMeasure(that.oConfig.EVALUATION.COLUMN_NAME);
-                var formattedFirstYLabel = sap.ushell.components.tiles.indicatorTileUtils.util.getLocaleFormattedValue(firstCalculatedValueForScaling, that.oConfig.EVALUATION.SCALING, that.oConfig.EVALUATION.DECIMAL_PRECISION, c, that.CURRENCY_CODE);
+                const minMeasure = Math.min.apply(Math, measureArray); // to obtain the starting value
+                let c = that.isCurrencyMeasure(that.oConfig.EVALUATION.COLUMN_NAME);
+                let formattedFirstYLabel = sap.ushell.components.tiles.indicatorTileUtils.util.getLocaleFormattedValue(firstCalculatedValueForScaling, that.oConfig.EVALUATION.SCALING, that.oConfig.EVALUATION.DECIMAL_PRECISION, c, that.CURRENCY_CODE);
                 if (that.oConfig.EVALUATION.SCALING == -2) {
                     formattedFirstYLabel += " %";
                 }
-                var firstYLabel = formattedFirstYLabel.toString();
+                const firstYLabel = formattedFirstYLabel.toString();
 
-                var lastCalculatedValueForScaling = Number(lastYLabelValue);
+                let lastCalculatedValueForScaling = Number(lastYLabelValue);
                 if (that.oConfig.EVALUATION.SCALING == -2) {
                     lastCalculatedValueForScaling *= 100;
                 }
-                var maxMeasure = Math.max.apply(Math, measureArray); //to obtain the last value
+                const maxMeasure = Math.max.apply(Math, measureArray); // to obtain the last value
                 c = that.isCurrencyMeasure(that.oConfig.EVALUATION.COLUMN_NAME);
-                var formattedLastYLabel = sap.ushell.components.tiles.indicatorTileUtils.util.getLocaleFormattedValue(lastCalculatedValueForScaling, that.oConfig.EVALUATION.SCALING, that.oConfig.EVALUATION.DECIMAL_PRECISION, c, that.CURRENCY_CODE);
+                let formattedLastYLabel = sap.ushell.components.tiles.indicatorTileUtils.util.getLocaleFormattedValue(lastCalculatedValueForScaling, that.oConfig.EVALUATION.SCALING, that.oConfig.EVALUATION.DECIMAL_PRECISION, c, that.CURRENCY_CODE);
                 if (that.oConfig.EVALUATION.SCALING == -2) {
                     formattedLastYLabel += " %";
                 }
-                var lastYLabel = formattedLastYLabel.toString();
+                const lastYLabel = formattedLastYLabel.toString();
 
                 try {
-                    var minDimension = sap.ushell.components.tiles.indicatorTileUtils.util.formatOdataObjectToString(Math.min.apply(Math, dimensionArray)); //to obtain the starting value
-                    var maxDimension = sap.ushell.components.tiles.indicatorTileUtils.util.formatOdataObjectToString(Math.max.apply(Math, dimensionArray)); //to obtain the last value
+                    var minDimension = sap.ushell.components.tiles.indicatorTileUtils.util.formatOdataObjectToString(Math.min.apply(Math, dimensionArray)); // to obtain the starting value
+                    var maxDimension = sap.ushell.components.tiles.indicatorTileUtils.util.formatOdataObjectToString(Math.max.apply(Math, dimensionArray)); // to obtain the last value
                 } catch (e) {
                     that.logError(e);
                 }
@@ -389,7 +389,7 @@ sap.ui.define([
                     if (cLArray.length != 0) { that.firstcL = cLArray[minDimension]; that.lastcL = cLArray[maxDimension]; }
                     if (wLArray.length != 0) { that.firstwL = wLArray[minDimension]; that.lastwL = wLArray[maxDimension]; }
                 }
-                var updatedModel = {
+                const updatedModel = {
                     width: "100%",
                     height: "100%",
                     unit: that.unit || "",
@@ -403,25 +403,25 @@ sap.ui.define([
                     minYValue: minMeasure,
                     maxYValue: maxMeasure,
                     firstXLabel: {
-                        label: firstXlabel + "",
+                        label: `${firstXlabel}`,
                         color: "Neutral"
                     },
                     lastXLabel: {
-                        label: lastXlabel + "",
+                        label: `${lastXlabel}`,
                         color: "Neutral"
                     },
                     firstYLabel: {
-                        label: firstYLabel + "",
+                        label: `${firstYLabel}`,
                         color: "Neutral"
                     },
                     lastYLabel: {
-                        label: lastYLabel + "",
+                        label: `${lastYLabel}`,
                         color: "Neutral"
                     },
                     minLabel: {},
                     maxLabel: {}
                 };
-                var newObj;
+                let newObj;
                 switch (goaltype) {
                     case "MA":
                         for (i in evaluationValues) {
@@ -580,19 +580,19 @@ sap.ui.define([
                         break;
                 }
 
-                var buildChartItem = function (sName, a, b, type) {
+                const buildChartItem = function (sName, a, b, type) {
                     return new AreaMicroChartItem({
-                        color: "{/" + sName + "/color}",
+                        color: `{/${sName}/color}`,
                         points: {
-                            path: "/" + sName + "/data",
+                            path: `/${sName}/data`,
                             template: new AreaMicroChartPoint({
-                                x: "{" + a + "}",
-                                y: "{" + b + "}"
+                                x: `{${a}}`,
+                                y: `{${b}}`
                             })
                         }
                     });
                 };
-                var TileRef = that.getView().oNVConfContS; //that.getTile().getTileContent()[0].getContent();
+                const TileRef = that.getView().oNVConfContS; // that.getTile().getTileContent()[0].getContent();
                 TileRef.setTarget(buildChartItem("target", dimensionName, targetMeasure));
                 TileRef.setInnerMinThreshold(buildChartItem("innerMinThreshold", dimensionName, innerMinThresholdMeasure));
                 TileRef.setInnerMaxThreshold(buildChartItem("innerMaxThreshold", dimensionName, innerMaxThresholdMeasure));

package/src/main/js/sap/ushell/components/tiles/indicatorArea/AreaChartTile.view.js

@@ -18,7 +18,7 @@ sap.ui.define([
     "sap/m/GenericTile",
     "sap/ui/model/json/JSONModel"
     // "sap/ushell/components/tiles/sbtilecontent" // do not migrate
-], function (
+], (
     JSView,
     odata4analytics,
     smartBusinessUtil,
@@ -30,11 +30,11 @@ sap.ui.define([
     GenericTile,
     JSONModel
     // sbtilecontent // do not migrate
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.LoadState
-    var LoadState = MobileLibrary.LoadState;
+    const LoadState = MobileLibrary.LoadState;
 
     sap.ui.getCore().loadLibrary("sap.suite.ui.microchart");
 
@@ -43,24 +43,24 @@ sap.ui.define([
             return "sap.ushell.components.tiles.indicatorArea.AreaChartTile";
         },
 
-        createContent: function (/*oController*/) {
+        createContent: function (/* oController */) {
             this.setHeight("100%");
             this.setWidth("100%");
-            var header = "Lorem ipsum";
-            var subheader = "Lorem ipsum";
-            var Size = MobileLibrary.Size;
+            let header = "Lorem ipsum";
+            let subheader = "Lorem ipsum";
+            const Size = MobileLibrary.Size;
 
-            var titleObj = sap.ushell.components.tiles.indicatorTileUtils.util.getTileTitleSubtitle(
+            const titleObj = sap.ushell.components.tiles.indicatorTileUtils.util.getTileTitleSubtitle(
                 this.getViewData().chip);
             if (titleObj.title && titleObj.subTitle) {
                 header = titleObj.title;
                 subheader = titleObj.subTitle;
             }
-            var buildChartItem = function (sName) {
+            function buildChartItem (sName) {
                 return new AreaMicroChartItem({
                     color: "Good",
                     points: {
-                        path: "/" + sName + "/data",
+                        path: `/${sName}/data`,
                         template: new AreaMicroChartPoint({
                             x: "{day}",
                             y: "{balance}"
@@ -68,16 +68,16 @@ sap.ui.define([
                         })
                     }
                 });
-            };
+            }
 
-            var buildMACLabel = function (sName) {
+            function buildMACLabel (sName) {
                 return new AreaMicroChartLabel({
-                    label: "{/" + sName + "/label}",
-                    color: "{/" + sName + "/color}"
+                    label: `{/${sName}/label}`,
+                    color: `{/${sName}/color}`
                 });
-            };
+            }
 
-            var oGenericTileData = {
+            const oGenericTileData = {
                 subheader: subheader,
                 header: header,
                 footerNum: "",
@@ -127,7 +127,7 @@ sap.ui.define([
                 tileContent: [this.oNVConfS]
             });
 
-            var oGenericTileModel = new JSONModel();
+            const oGenericTileModel = new JSONModel();
             oGenericTileModel.setData(oGenericTileData);
             this.oGenericTile.setModel(oGenericTileModel);