@sapui5/sap.ushell 1.139.0 → 1.141.0

package/src/main/js/sap/ushell/components/tiles/indicatorDualTrend/DualTrend.controller.js

@@ -232,102 +232,7 @@ sap.ui.define([
                 oQuery = sap.ushell.components.tiles.indicatorTileUtils.util.prepareQueryServiceUri(that.oTileApi.url.addSystemToServiceUrl(sUri), sEntitySet, sMeasure, dimensionName, variantData);
             }
             const cachedValue = sap.ushell.components.tiles.indicatorTileUtils.cache.getKpivalueById(that.oConfig.TILE_PROPERTIES.id);
-            if (!cachedValue) {
-                if (oQuery) {
-                    this.queryUriForTrendChart = oQuery.uri;
-                    that.writeData = {};
-                    try {
-                        this.trendChartODataReadRef = oQuery.model.read(oQuery.uri, null, null, true, (data) => {
-                            if (data && data.results && data.results.length) {
-                                if (oQuery.unit[0]) {
-                                    that.unit = data.results[0][oQuery.unit[0].name];
-                                    that.writeData.unit = oQuery.unit[0];
-                                    that.writeData.unit.name = oQuery.unit[0].name;
-                                }
-                                that.queryUriResponseForTrendChart = data;
-                                dimensionName = sap.ushell.components.tiles.indicatorTileUtils.util.findTextPropertyForDimension(that.oTileApi.url.addSystemToServiceUrl(sUri),
-                                    sEntitySet, dimensionName);
-                                data.firstXlabel = data.results[0][dimensionName];
-                                data.lastXlabel = data.results[data.results.length - 1][dimensionName];
-                                that.writeData.data = data;
-                                that.writeData.dimensionName = dimensionName;
-                                sap.ushell.components.tiles.indicatorTileUtils.cache.setKpivalueById(that.oConfig.TILE_PROPERTIES.id, that.writeData);
-                                const navTarget = sap.ushell.components.tiles.indicatorTileUtils.util.getNavigationTarget(that.oConfig, that.system);
-                                that.oDualTrendView.oGenericTile.$().wrap(`<a href ='${navTarget}'></a>`);
-                                that.oDualTrendView.oGenericTile.setState(LoadState.Loaded);
-                                _applyData(data, that.DEFINITION_DATA.EVALUATION.VALUES_SOURCE);
-                            } else {
-                                that.logError("no Response from QueryServiceUri");
-                            }
-                        }, (eObject) => {
-                            if (eObject && eObject.response) {
-                                that.logError("Data call failed");
-                            }
-                        });
-                    } catch (e) {
-                        that.logError(e);
-                    }
-                } else {
-                    that.logError();
-                }
-
-                variantData = sap.ushell.components.tiles.indicatorTileUtils.util.prepareFilterStructure(
-                    that.DEFINITION_DATA.EVALUATION_FILTERS, that.DEFINITION_DATA.ADDITIONAL_FILTERS);
 
-                oQuery = sap.ushell.components.tiles.indicatorTileUtils.util.prepareQueryServiceUri(
-                    that.oTileApi.url.addSystemToServiceUrl(sUri), sEntitySet, sMeasure, 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, (data) => {
-                        if (data && data.results && data.results.length) {
-                            let oScaledValue = "";
-                            let calculatedValueForScaling = data.results[0][that.DEFINITION_DATA.EVALUATION.COLUMN_NAME];
-                            that.writeData.numericData = data;
-                            if (that.oConfig.EVALUATION.SCALING == -2) {
-                                calculatedValueForScaling *= 100;
-                            }
-                            oScaledValue = sap.ushell.components.tiles.indicatorTileUtils.util.getLocaleFormattedValue(Number(calculatedValueForScaling),
-                                that.oConfig.EVALUATION.SCALING, that.oConfig.EVALUATION.DECIMAL_PRECISION);
-                            if (that.oConfig.EVALUATION.SCALING == -2) {
-                                that._updateTileModel({
-                                    scale: "%"
-                                });
-                            }
-                            const trendIndicator = that.getTrendIndicator(that.setThresholdValues().trendValue, calculatedValueForScaling);
-
-                            that._updateTileModel({
-                                value: oScaledValue.toString(),
-                                valueColor: that.getTrendColor(that.setThresholdValues()),
-                                indicator: trendIndicator
-                            });
-                        } else {
-                            fnError.call(that, "no Response from QueryServiceUri");
-                        }
-                    });
-                }
-            } else {
-                try {
-                    if (cachedValue.unit !== undefined) {
-                        that.unit = cachedValue.data.results[0][cachedValue.unit.name];
-                    }
-                    that.queryUriResponseForTrendChart = cachedValue.data;
-                    dimensionName = cachedValue.dimensionName;
-                    const calculatedValueForScaling = cachedValue.numericData.results[0][that.DEFINITION_DATA.EVALUATION.COLUMN_NAME];
-                    const trendIndicator = that.getTrendIndicator(that.setThresholdValues().trendValue, cachedValue.data.results[0][that.DEFINITION_DATA.EVALUATION.COLUMN_NAME]);
-                    const oScaledValue = sap.ushell.components.tiles.indicatorTileUtils.util.getLocaleFormattedValue(Number(calculatedValueForScaling),
-                        that.oConfig.EVALUATION.SCALING, that.oConfig.EVALUATION.DECIMAL_PRECISION);
-                    that.oDualTrendView.oGenericTile.setState(LoadState.Loaded);
-                    _applyData(cachedValue.data, that.DEFINITION_DATA.EVALUATION.VALUES_SOURCE);
-                    that._updateTileModel({
-                        value: oScaledValue.toString(),
-                        valueColor: that.getTrendColor(that.setThresholdValues()),
-                        indicator: trendIndicator
-                    });
-                } catch (e) {
-                    that.logError(e);
-                }
-            }
             function _applyData (data, type) {
                 const dimensionArray = [];
                 const measureArray = [];
@@ -386,10 +291,12 @@ sap.ui.define([
                     formattedLastYLabel += " %";
                 }
                 const lastYLabel = formattedLastYLabel.toString();
+                let minDimension;
+                let maxDimension;
 
                 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
+                    minDimension = sap.ushell.components.tiles.indicatorTileUtils.util.formatOdataObjectToString(Math.min.apply(Math, dimensionArray)); // to obtain the starting value
+                    maxDimension = sap.ushell.components.tiles.indicatorTileUtils.util.formatOdataObjectToString(Math.max.apply(Math, dimensionArray)); // to obtain the last value
                 } catch (e) {
                     that.logError(e);
                 }
@@ -592,22 +499,22 @@ sap.ui.define([
                         }
                         if (type == "FIXED") {
                             updatedModel.firstYLabel.color = (firstYLabelValue > that.ch || firstYLabelValue < that.cl) ? "Error" : ((that.wh <= firstYLabelValue) && (firstYLabelValue <= that.ch)) ||
-                                ((that.cl <= firstYLabelValue) && (firstYLabelValue <= that.wl)) ? "Critical" : ((firstYLabelValue >= that.wl) && (firstYLabelValue <= that.wh)) ? "Good" : "Neutral";
+                            ((that.cl <= firstYLabelValue) && (firstYLabelValue <= that.wl)) ? "Critical" : ((firstYLabelValue >= that.wl) && (firstYLabelValue <= that.wh)) ? "Good" : "Neutral";
                             updatedModel.lastYLabel.color = (lastYLabelValue > that.ch || lastYLabelValue < that.cl) ? "Error" : ((that.wh <= lastYLabelValue) && (lastYLabelValue <= that.ch)) ||
-                                ((that.cl <= lastYLabelValue) && (lastYLabelValue <= that.wl)) ? "Critical" : ((lastYLabelValue >= that.wl) && (lastYLabelValue <= that.wh)) ? "Good" : "Neutral";
+                            ((that.cl <= lastYLabelValue) && (lastYLabelValue <= that.wl)) ? "Critical" : ((lastYLabelValue >= that.wl) && (lastYLabelValue <= that.wh)) ? "Good" : "Neutral";
                         } else if (type == "MEASURE" && that.firstwL && that.lastwL && that.firstcL && that.lastcL && that.firstwH && that.lastwH && that.firstcH && that.lastcH) {
                             updatedModel.firstYLabel.color = (firstYLabelValue > that.firstcH || firstYLabelValue < that.firstcL) ? "Error" : ((that.firstwH <= firstYLabelValue)
                                 && (firstYLabelValue <= that.firstcH)) || ((that.firstcL <= firstYLabelValue) && (firstYLabelValue <= that.firstwL)) ?
                                 "Critical" : ((firstYLabelValue >= that.firstwL) && (firstYLabelValue <= that.firstwH)) ? "Good" : "Neutral";
                             updatedModel.lastYLabel.color = (lastYLabelValue > that.lastcH || lastYLabelValue < that.lastcL) ?
                                 "Error" : ((that.lastwH <= lastYLabelValue) && (lastYLabelValue <= that.lastcH))
-                                    || ((that.lastcL <= lastYLabelValue) && (lastYLabelValue <= that.lastwL)) ? "Critical" :
+                                || ((that.lastcL <= lastYLabelValue) && (lastYLabelValue <= that.lastwL)) ? "Critical" :
                                     ((lastYLabelValue >= that.lastwL) && (lastYLabelValue <= that.lastwH)) ? "Good" : "Neutral";
                         }
                         break;
                 }
 
-                const buildChartItem = function (sName, a, b) {
+                function buildChartItem (sName, a, b) {
                     return new AreaMicroChartItem({
                         color: `{/${sName}/color}`,
                         points: {
@@ -618,7 +525,7 @@ sap.ui.define([
                             })
                         }
                     });
-                };
+                }
                 that.getTile().getTileContent()[1].getContent().setTarget(buildChartItem("target", dimensionName, targetMeasure));
                 that.getTile().getTileContent()[1].getContent().setInnerMinThreshold(buildChartItem("innerMinThreshold", dimensionName, innerMinThresholdMeasure));
                 that.getTile().getTileContent()[1].getContent().setInnerMaxThreshold(buildChartItem("innerMaxThreshold", dimensionName, innerMaxThresholdMeasure));
@@ -627,6 +534,103 @@ sap.ui.define([
                 that.getTile().getTileContent()[1].getContent().setChart(buildChartItem("chart", dimensionName, sMeasure));
                 that._updateTileModel(updatedModel);
             }
+
+            if (!cachedValue) {
+                if (oQuery) {
+                    this.queryUriForTrendChart = oQuery.uri;
+                    that.writeData = {};
+                    try {
+                        this.trendChartODataReadRef = oQuery.model.read(oQuery.uri, null, null, true, (data) => {
+                            if (data && data.results && data.results.length) {
+                                if (oQuery.unit[0]) {
+                                    that.unit = data.results[0][oQuery.unit[0].name];
+                                    that.writeData.unit = oQuery.unit[0];
+                                    that.writeData.unit.name = oQuery.unit[0].name;
+                                }
+                                that.queryUriResponseForTrendChart = data;
+                                dimensionName = sap.ushell.components.tiles.indicatorTileUtils.util.findTextPropertyForDimension(that.oTileApi.url.addSystemToServiceUrl(sUri),
+                                    sEntitySet, dimensionName);
+                                data.firstXlabel = data.results[0][dimensionName];
+                                data.lastXlabel = data.results[data.results.length - 1][dimensionName];
+                                that.writeData.data = data;
+                                that.writeData.dimensionName = dimensionName;
+                                sap.ushell.components.tiles.indicatorTileUtils.cache.setKpivalueById(that.oConfig.TILE_PROPERTIES.id, that.writeData);
+                                const navTarget = sap.ushell.components.tiles.indicatorTileUtils.util.getNavigationTarget(that.oConfig, that.system);
+                                that.oDualTrendView.oGenericTile.$().wrap(`<a href ='${navTarget}'></a>`);
+                                that.oDualTrendView.oGenericTile.setState(LoadState.Loaded);
+                                _applyData(data, that.DEFINITION_DATA.EVALUATION.VALUES_SOURCE);
+                            } else {
+                                that.logError("no Response from QueryServiceUri");
+                            }
+                        }, (eObject) => {
+                            if (eObject && eObject.response) {
+                                that.logError("Data call failed");
+                            }
+                        });
+                    } catch (e) {
+                        that.logError(e);
+                    }
+                } else {
+                    that.logError();
+                }
+
+                variantData = sap.ushell.components.tiles.indicatorTileUtils.util.prepareFilterStructure(
+                    that.DEFINITION_DATA.EVALUATION_FILTERS, that.DEFINITION_DATA.ADDITIONAL_FILTERS);
+
+                oQuery = sap.ushell.components.tiles.indicatorTileUtils.util.prepareQueryServiceUri(
+                    that.oTileApi.url.addSystemToServiceUrl(sUri), sEntitySet, sMeasure, 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, (data) => {
+                        if (data && data.results && data.results.length) {
+                            let oScaledValue = "";
+                            let calculatedValueForScaling = data.results[0][that.DEFINITION_DATA.EVALUATION.COLUMN_NAME];
+                            that.writeData.numericData = data;
+                            if (that.oConfig.EVALUATION.SCALING == -2) {
+                                calculatedValueForScaling *= 100;
+                            }
+                            oScaledValue = sap.ushell.components.tiles.indicatorTileUtils.util.getLocaleFormattedValue(Number(calculatedValueForScaling),
+                                that.oConfig.EVALUATION.SCALING, that.oConfig.EVALUATION.DECIMAL_PRECISION);
+                            if (that.oConfig.EVALUATION.SCALING == -2) {
+                                that._updateTileModel({
+                                    scale: "%"
+                                });
+                            }
+                            const trendIndicator = that.getTrendIndicator(that.setThresholdValues().trendValue, calculatedValueForScaling);
+
+                            that._updateTileModel({
+                                value: oScaledValue.toString(),
+                                valueColor: that.getTrendColor(that.setThresholdValues()),
+                                indicator: trendIndicator
+                            });
+                        } else {
+                            fnError.call(that, "no Response from QueryServiceUri");
+                        }
+                    });
+                }
+            } else {
+                try {
+                    if (cachedValue.unit !== undefined) {
+                        that.unit = cachedValue.data.results[0][cachedValue.unit.name];
+                    }
+                    that.queryUriResponseForTrendChart = cachedValue.data;
+                    dimensionName = cachedValue.dimensionName;
+                    const calculatedValueForScaling = cachedValue.numericData.results[0][that.DEFINITION_DATA.EVALUATION.COLUMN_NAME];
+                    const trendIndicator = that.getTrendIndicator(that.setThresholdValues().trendValue, cachedValue.data.results[0][that.DEFINITION_DATA.EVALUATION.COLUMN_NAME]);
+                    const oScaledValue = sap.ushell.components.tiles.indicatorTileUtils.util.getLocaleFormattedValue(Number(calculatedValueForScaling),
+                        that.oConfig.EVALUATION.SCALING, that.oConfig.EVALUATION.DECIMAL_PRECISION);
+                    that.oDualTrendView.oGenericTile.setState(LoadState.Loaded);
+                    _applyData(cachedValue.data, that.DEFINITION_DATA.EVALUATION.VALUES_SOURCE);
+                    that._updateTileModel({
+                        value: oScaledValue.toString(),
+                        valueColor: that.getTrendColor(that.setThresholdValues()),
+                        indicator: trendIndicator
+                    });
+                } catch (e) {
+                    that.logError(e);
+                }
+            }
         },
 
         flowWithoutDesignTimeCall: function () {

package/src/main/js/sap/ushell/components/tiles/indicatorHarveyBall/HarveyBallTile.controller.js

@@ -134,6 +134,9 @@ sap.ui.define([
             }
         },
         fetchKpiValue: function (oParam) {
+            const that = this;
+            let kpiData;
+            let semaphore;
             function makeODataRequest (oModel, sUri, oConfig, fnS, fnE) {
                 const oDataRef = oModel.read(sUri, null, null, true, (data) => {
                     that.deregisterOpenODataRequest(oConfig.type);
@@ -163,7 +166,6 @@ sap.ui.define([
                 that.registerOpenODataRequest(oConfig.type, oDataRef);
             }
 
-            var that = this;
             const indicatorUtils = this.getVariable("indicatorUtils");
             const cachedValue = this.getVariable("cache").getKpivalueById(this.getVariable("chipId"));
             if (cachedValue) {
@@ -173,9 +175,8 @@ sap.ui.define([
                 const sUri = oParam.url; const sEntitySet = oParam.entitySet;
                 const variantFilters = oParam.filters;
                 const fractionValueFilters = oParam.fractionFilters.concat(variantFilters);
-                let oQuery1; let oQuery2;
-                let unitColumn1; let unitColumn2; var kpiData;
-                var semaphore = 2;// to keep track of race around condition
+                let oQuery1;
+                semaphore = 2;// to keep track of race around condition
                 fractionValueFilters.forEach((cur) => { // this code written only for now. to handler the exception thrown by prepareQueryServiceUri
                     cur.value = `${cur.value}`; // it assumes everyting is string and tries to call split
                     cur.valueTo = `${cur.valueTo}`;
@@ -185,9 +186,9 @@ sap.ui.define([
                 } else {
                     oQuery1 = indicatorUtils.prepareQueryServiceUri(this.getVariable("chip").url.addSystemToServiceUrl(sUri), sEntitySet, sMeasure1, null, variantFilters);
                 }
-                oQuery2 = indicatorUtils.prepareQueryServiceUri(this.getVariable("chip").url.addSystemToServiceUrl(sUri), sEntitySet, sMeasure2, null, fractionValueFilters);
-                unitColumn1 = oQuery1.unit[0];
-                unitColumn2 = oQuery2.unit[0];
+                const oQuery2 = indicatorUtils.prepareQueryServiceUri(this.getVariable("chip").url.addSystemToServiceUrl(sUri), sEntitySet, sMeasure2, null, fractionValueFilters);
+                const unitColumn1 = oQuery1.unit[0];
+                const unitColumn2 = oQuery2.unit[0];
                 kpiData = {
                     kpiValue: null,
                     fractionValue: null,