@sapui5/sap.ushell 1.138.1 → 1.139.1

package/src/main/js/sap/ushell/components/tiles/cdm/applauncherdynamic/DynamicTile.controller.js

@@ -16,7 +16,7 @@ sap.ui.define([
     "sap/ushell/utils/UrlParsing",
     "sap/ushell/EventHub",
     "sap/ushell/Container"
-], function (
+], (
     Controller,
     tileUtils,
     NumberFormat,
@@ -32,32 +32,32 @@ sap.ui.define([
     UrlParsing,
     EventHub,
     Container
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.GenericTileScope
-    var GenericTileScope = mobileLibrary.GenericTileScope;
+    const GenericTileScope = mobileLibrary.GenericTileScope;
 
     // 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.FrameType
-    var FrameType = mobileLibrary.FrameType;
+    const FrameType = mobileLibrary.FrameType;
 
     // shortcut for sap.ushell.DisplayFormat
-    var DisplayFormat = ushellLibrary.DisplayFormat;
+    const DisplayFormat = ushellLibrary.DisplayFormat;
 
     // shortcut for sap.ushell.AppType
-    var AppType = ushellLibrary.AppType;
+    const AppType = ushellLibrary.AppType;
 
-    var COMPONENT_NAME = "sap.ushell.components.tiles.cdm.applauncherdynamic.DynamicTile";
+    const COMPONENT_NAME = "sap.ushell.components.tiles.cdm.applauncherdynamic.DynamicTile";
 
-    var RESET_STRING = "<RESET>";
+    const RESET_STRING = "<RESET>";
 
-    var DEFAULT_VALUES = {
+    const DEFAULT_VALUES = {
         title: "",
         subtitle: "",
         icon: "",
@@ -94,8 +94,8 @@ sap.ui.define([
          * @private
          */
         _getConfiguration: function (oViewData) {
-            var oConfig = {};
-            var oHash;
+            const oConfig = {};
+            let oHash;
 
             oConfig.configuration = oViewData.configuration;
             oConfig.properties = oViewData.properties;
@@ -112,8 +112,8 @@ sap.ui.define([
             oConfig.properties.number_unit = oConfig.properties.numberUnit || DEFAULT_VALUES.number_unit;
 
             // adding sap-system
-            var sSystem = oConfig.configuration["sap-system"];
-            var sTargetURL = oConfig.properties.targetURL;
+            const sSystem = oConfig.configuration["sap-system"];
+            let sTargetURL = oConfig.properties.targetURL;
             if (sTargetURL && sSystem) {
                 // when the navigation url is hash we want to make sure system parameter is in the parameters part
                 if (UrlParsing.isIntentUrl(sTargetURL)) {
@@ -122,10 +122,10 @@ sap.ui.define([
                         oHash.params = {};
                     }
                     oHash.params["sap-system"] = sSystem;
-                    sTargetURL = "#" + UrlParsing.constructShellHash(oHash);
+                    sTargetURL = `#${UrlParsing.constructShellHash(oHash)}`;
                 } else {
-                    sTargetURL += ((sTargetURL.indexOf("?") < 0) ? "?" : "&")
-                        + "sap-system=" + sSystem;
+                    sTargetURL += `${(sTargetURL.indexOf("?") < 0) ? "?" : "&"
+                    }sap-system=${sSystem}`;
                 }
                 oConfig.properties.targetURL = sTargetURL;
             }
@@ -153,10 +153,10 @@ sap.ui.define([
         },
 
         onInit: function () {
-            var oView = this.getView();
-            var oModel = new JSONModel();
-            var oViewData = oView.getViewData();
-            var oViewDataProperties = oViewData.properties;
+            const oView = this.getView();
+            const oModel = new JSONModel();
+            const oViewData = oView.getViewData();
+            const oViewDataProperties = oViewData.properties;
             oModel.setData(this._getConfiguration(oViewData));
             const bProviderInfoEnabled = Config.last("/core/contentProviders/providerInfo/enabled");
             const bShowProviderInfoInSystemInfo = Config.last("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations");
@@ -168,7 +168,7 @@ sap.ui.define([
                 // listen for changes of the "showContentProviderInfoOnVisualizations" config,
                 // as the end user can change it in the settings (if enabled)
                 this._aDoables.push(Config.on("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations")
-                    .do(function (bShowContentProviderInfoOnVisualizations) {
+                    .do((bShowContentProviderInfoOnVisualizations) => {
                         oModel.setProperty("/properties/showContentProviderInfoOnVisualizations", bShowContentProviderInfoOnVisualizations);
                     })
                 );
@@ -177,7 +177,7 @@ sap.ui.define([
             // set model, add content
             oView.setModel(oModel);
             // listen for changes of the size behavior, as the end user can change it in the settings (if enabled)
-            this._aDoables.push(Config.on("/core/home/sizeBehavior").do(function (sSizeBehavior) {
+            this._aDoables.push(Config.on("/core/home/sizeBehavior").do((sSizeBehavior) => {
                 oModel.setProperty("/properties/configSizeBehavior", sSizeBehavior);
             }));
 
@@ -204,7 +204,7 @@ sap.ui.define([
         visibleHandler: function (isVisible) {
             if (isVisible) {
                 if (!this.oDataRequest || this.timer === null) {
-                    //tile is visible and data wasn't requested yet or was invisible before
+                    // tile is visible and data wasn't requested yet or was invisible before
                     this.initRequestInterval();
                 }
             } else {
@@ -218,7 +218,7 @@ sap.ui.define([
          * @param {boolean} editable Indicating if edit mode should be active.
          */
         editModeHandler: function (editable) {
-            var sScope = editable ? GenericTileScope.ActionMore : GenericTileScope.Display;
+            const sScope = editable ? GenericTileScope.ActionMore : GenericTileScope.Display;
             this.getView().getModel().setProperty("/properties/scope", sScope);
         },
 
@@ -240,19 +240,19 @@ sap.ui.define([
          * @since 1.116.0
          */
         previewHandler: function (bPreview) {
-            var oView = this.getView();
-            var oModel = oView.getModel();
+            const oView = this.getView();
+            const oModel = oView.getModel();
 
             if (bPreview) {
-                var oViewData = oView.getViewData();
-                var oPreviewData = merge({}, oViewData, {
+                const oViewData = oView.getViewData();
+                const oPreviewData = merge({}, oViewData, {
                     properties: {
                         preview: true
                     }
                 });
-                var oPreviewConfiguration = this._getConfiguration(oPreviewData);
+                const oPreviewConfiguration = this._getConfiguration(oPreviewData);
 
-                var oPreviewProperties = merge({}, oPreviewConfiguration.properties, {
+                const oPreviewProperties = merge({}, oPreviewConfiguration.properties, {
                     customSizeBehavior: oModel.getProperty("/properties/customSizeBehavior"),
                     configSizeBehavior: oModel.getProperty("/properties/configSizeBehavior")
                 });
@@ -270,8 +270,8 @@ sap.ui.define([
          */
         updateVisualPropertiesHandler: function (oNewProperties) {
             // existing properties
-            var oCurrentProperties = this.getView().getModel().getProperty("/properties");
-            var oOriginalProperties = this.getView().getModel().getProperty("/originalProperties");
+            const oCurrentProperties = this.getView().getModel().getProperty("/properties");
+            const oOriginalProperties = this.getView().getModel().getProperty("/originalProperties");
 
             // override relevant property
             if (ushellUtils.isDefined(oNewProperties.title)) {
@@ -319,8 +319,8 @@ sap.ui.define([
         // trigger to show the configuration UI if the tile is pressed in Admin mode
         onPress: function (oEvent) {
             if (oEvent.getSource().getScope && oEvent.getSource().getScope() === GenericTileScope.Display) {
-                var sTargetURL = this.getView().getModel().getProperty("/properties/targetURL");
-                var sTitle = this.getView().getModel().getProperty("/properties/title");
+                const sTargetURL = this.getView().getModel().getProperty("/properties/targetURL");
+                const sTitle = this.getView().getModel().getProperty("/properties/title");
                 if (!sTargetURL) {
                     return;
                 }
@@ -335,9 +335,9 @@ sap.ui.define([
                     hasher.setHash(sTargetURL);
                 } else {
                     // add theURL to recent activity log
-                    var bLogRecentActivity = Config.last("/core/shell/enableRecentActivity") && Config.last("/core/shell/enableRecentActivityLogging");
+                    const bLogRecentActivity = Config.last("/core/shell/enableRecentActivity") && Config.last("/core/shell/enableRecentActivityLogging");
                     if (bLogRecentActivity) {
-                        var oRecentEntry = {
+                        const oRecentEntry = {
                             title: sTitle,
                             appType: AppType.URL,
                             url: sTargetURL,
@@ -348,7 +348,6 @@ sap.ui.define([
 
                     WindowUtils.openURL(sTargetURL, "_blank");
                 }
-
             }
         },
 
@@ -357,8 +356,8 @@ sap.ui.define([
          * @private
          */
         initRequestInterval: function () {
-            var oModel = this.getView().getModel();
-            var iServiceRefreshInterval = oModel.getProperty("/configuration/serviceRefreshInterval");
+            const oModel = this.getView().getModel();
+            let iServiceRefreshInterval = oModel.getProperty("/configuration/serviceRefreshInterval");
 
             // default to refresh interval 0
             if (!iServiceRefreshInterval || iServiceRefreshInterval === "0") {
@@ -369,10 +368,10 @@ sap.ui.define([
                     this.bShouldNotRefreshDataAfterInit = true;
                 }
             } else if (iServiceRefreshInterval < 10) {
-                var sServiceUrl = oModel.getProperty("/configuration/serviceUrl");
+                const sServiceUrl = oModel.getProperty("/configuration/serviceUrl");
                 Log.warning(
-                    "Refresh Interval " + iServiceRefreshInterval + " seconds for service URL " + sServiceUrl
-                    + " is less than 10 seconds, which is not supported. Increased to 10 seconds automatically.",
+                    `Refresh Interval ${iServiceRefreshInterval} seconds for service URL ${sServiceUrl
+                    } is less than 10 seconds, which is not supported. Increased to 10 seconds automatically.`,
                     null, COMPONENT_NAME
                 );
 
@@ -396,10 +395,10 @@ sap.ui.define([
                 return;
             }
 
-            var oModel = this.getView().getModel();
+            const oModel = this.getView().getModel();
 
-            var bPreview = oModel.getProperty("/properties/preview");
-            var sUrl = oModel.getProperty("/configuration/serviceUrl");
+            const bPreview = oModel.getProperty("/properties/preview");
+            const sUrl = oModel.getProperty("/configuration/serviceUrl");
 
             if (bPreview) {
                 Log.info("Tile in preview mode", COMPONENT_NAME);
@@ -413,9 +412,9 @@ sap.ui.define([
             }
 
             // check whether a timer is running and the previous timeout is over already and wait for it if not
-            var iDiff = (iServiceRefreshInterval * 1000) - (Date.now() - this.iLastTimeoutStart);
+            const iDiff = (iServiceRefreshInterval * 1000) - (Date.now() - this.iLastTimeoutStart);
             if (!bForce && !this.timer && iDiff > 0) {
-                Log.info("Started timeout to call " + sUrl + " again in " + Math.ceil(iDiff / 1000) + " seconds", null, COMPONENT_NAME);
+                Log.info(`Started timeout to call ${sUrl} again in ${Math.ceil(iDiff / 1000)} seconds`, null, COMPONENT_NAME);
                 this.timer = setTimeout(this.loadData.bind(this, iServiceRefreshInterval, false), ushellUtils.sanitizeTimeoutDelay(iDiff));
                 return;
             }
@@ -426,8 +425,8 @@ sap.ui.define([
                     this.oDataRequest.destroy();
                 }
 
-                var sContentProviderId = oModel.getProperty("/properties/contentProviderId");
-                var oOptions = {
+                const sContentProviderId = oModel.getProperty("/properties/contentProviderId");
+                const oOptions = {
                     dataSource: oModel.getProperty("/properties/dataSource")
                 };
 
@@ -438,7 +437,7 @@ sap.ui.define([
 
             // Initialize timeout
             if (iServiceRefreshInterval > 0) {
-                Log.info("Started timeout to call " + sUrl + " again in " + iServiceRefreshInterval + " seconds", null, COMPONENT_NAME);
+                Log.info(`Started timeout to call ${sUrl} again in ${iServiceRefreshInterval} seconds`, null, COMPONENT_NAME);
                 this.iLastTimeoutStart = Date.now();
                 this.timer = setTimeout(this.loadData.bind(this, iServiceRefreshInterval, false), ushellUtils.sanitizeTimeoutDelay(iServiceRefreshInterval * 1000));
             }
@@ -451,25 +450,25 @@ sap.ui.define([
 
         // error handler
         errorHandlerFn: function (oMessage) {
-            var sMessage = oMessage && oMessage.message ? oMessage.message : oMessage;
-            var sUrl = this.getView().getModel().getProperty("/configuration/serviceUrl");
+            let sMessage = oMessage && oMessage.message ? oMessage.message : oMessage;
+            const sUrl = this.getView().getModel().getProperty("/configuration/serviceUrl");
 
             if (oMessage.statusText === "Abort" || oMessage.aborted === true) {
-                Log.info("Data request from service " + sUrl + " was aborted", null, COMPONENT_NAME);
+                Log.info(`Data request from service ${sUrl} was aborted`, null, COMPONENT_NAME);
                 this.bShouldNotRefreshDataAfterInit = false;
             } else {
                 if (oMessage.response) {
-                    sMessage += " - " + oMessage.response.statusCode + " " + oMessage.response.statusText;
+                    sMessage += ` - ${oMessage.response.statusCode} ${oMessage.response.statusText}`;
                 }
 
-                Log.error("Failed to update data via service " + sUrl + ": " + sMessage, null, COMPONENT_NAME);
+                Log.error(`Failed to update data via service ${sUrl}: ${sMessage}`, null, COMPONENT_NAME);
 
                 this._setTileIntoErrorState();
             }
         },
 
         _setTileIntoErrorState: function () {
-            var oResourceBundle = tileUtils.getResourceBundle();
+            const oResourceBundle = tileUtils.getResourceBundle();
             // update model
             this.updatePropertiesHandler({
                 number: "???",
@@ -478,15 +477,15 @@ sap.ui.define([
         },
 
         _normalizeNumber: function (numValue, maxCharactersInDisplayNumber, numberFactor, iNumberDigits) {
-            var number;
+            let number;
 
             if (isNaN(numValue)) {
                 number = numValue;
             } else {
-                var oNForm = NumberFormat.getFloatInstance({ maxFractionDigits: iNumberDigits });
+                const oNForm = NumberFormat.getFloatInstance({ maxFractionDigits: iNumberDigits });
 
                 if (!numberFactor) {
-                    var absNumValue = Math.abs(numValue);
+                    const absNumValue = Math.abs(numValue);
                     if (absNumValue >= 1000000000) {
                         numberFactor = "B";
                         numValue /= 1000000000;
@@ -501,10 +500,10 @@ sap.ui.define([
                 number = oNForm.format(numValue);
             }
 
-            var displayNumber = number;
-            //we have to crop numbers to prevent overflow
-            var cLastAllowedChar = displayNumber[maxCharactersInDisplayNumber - 1];
-            //if last character is '.' or ',', we need to crop it also
+            let displayNumber = number;
+            // we have to crop numbers to prevent overflow
+            const cLastAllowedChar = displayNumber[maxCharactersInDisplayNumber - 1];
+            // if last character is '.' or ',', we need to crop it also
             maxCharactersInDisplayNumber -= (cLastAllowedChar === "." || cLastAllowedChar === ",") ? 1 : 0;
             displayNumber = displayNumber.substring(0, maxCharactersInDisplayNumber);
 
@@ -525,14 +524,14 @@ sap.ui.define([
          * @private
          */
         updatePropertiesHandler: function (oData) {
-            var oOriginalProperties = this.getView().getModel().getProperty("/originalProperties");
-            var oCurrentProperties = this.getView().getModel().getProperty("/properties");
+            const oOriginalProperties = this.getView().getModel().getProperty("/originalProperties");
+            const oCurrentProperties = this.getView().getModel().getProperty("/properties");
 
             // when providing empty string or null the original (static) value is displayed
             // when excluding the property from the response the original (static) value is displayed
             // when providing the string the value is unset to a proper default
 
-            var aPropertyMappings = [
+            const aPropertyMappings = [
                 { dataField: "title", modelField: "title" },
                 { dataField: "subtitle", modelField: "subtitle" },
                 { dataField: "icon", modelField: "icon" },
@@ -545,10 +544,10 @@ sap.ui.define([
                 { dataField: "numberFactor", modelField: "number_factor" }
             ];
 
-            aPropertyMappings.forEach(function (oMapping) {
-                var vValue = oData[oMapping.dataField];
-                var bIsUndefined = !vValue;
-                var vDefaultValue = DEFAULT_VALUES[oMapping.modelField];
+            aPropertyMappings.forEach((oMapping) => {
+                const vValue = oData[oMapping.dataField];
+                const bIsUndefined = !vValue;
+                const vDefaultValue = DEFAULT_VALUES[oMapping.modelField];
 
                 if (bIsUndefined) {
                     oCurrentProperties[oMapping.modelField] = oOriginalProperties[oMapping.modelField] || vDefaultValue;
@@ -557,24 +556,24 @@ sap.ui.define([
                 } else { // response defines a value
                     oCurrentProperties[oMapping.modelField] = vValue;
                 }
-            }.bind(this));
+            });
 
             oCurrentProperties.number_value = !isNaN(oData.number) ? oData.number : DEFAULT_VALUES.number_value;
             oCurrentProperties.number_digits = oData.numberDigits >= 0 ? oData.numberDigits : 4;
 
             // push target parameters to local array
-            var aTargetURLParams = [];
+            const aTargetURLParams = [];
             if (oData.targetParams) {
                 aTargetURLParams.push(oData.targetParams);
             }
 
             // accumulate results field
             if (oData.results) {
-                var sCurrentTargetParams;
-                var oCurrentNumber;
+                let sCurrentTargetParams;
+                let oCurrentNumber;
 
-                var nSum = 0;
-                oData.results.forEach(function (oResult) {
+                let nSum = 0;
+                oData.results.forEach((oResult) => {
                     oCurrentNumber = oResult.number || 0;
                     if (typeof oCurrentNumber === "string") {
                         oCurrentNumber = parseFloat(oCurrentNumber);
@@ -591,7 +590,7 @@ sap.ui.define([
 
             // add target URL properties from local array to targetURL in case needed
             if (aTargetURLParams.length > 0) {
-                var sConcatSymbol = oCurrentProperties.targetURL.indexOf("?") !== -1 ? "&" : "?";
+                const sConcatSymbol = oCurrentProperties.targetURL.indexOf("?") !== -1 ? "&" : "?";
                 oCurrentProperties.targetURL += sConcatSymbol + aTargetURLParams.join("&");
             }
 
@@ -602,16 +601,16 @@ sap.ui.define([
                     oData.number = oData.number.trim();
                 }
 
-                var bShouldProcessDigits = this._shouldProcessDigits(oData.number, oData.numberDigits);
-                var maxCharactersInDisplayNumber = oCurrentProperties.icon ? 4 : 5;
+                const bShouldProcessDigits = this._shouldProcessDigits(oData.number, oData.numberDigits);
+                const maxCharactersInDisplayNumber = oCurrentProperties.icon ? 4 : 5;
 
                 if (oData.number && oData.number.toString().length >= maxCharactersInDisplayNumber || bShouldProcessDigits) {
-                    var oNormalizedNumberData = this._normalizeNumber(oData.number, maxCharactersInDisplayNumber, oData.numberFactor, oData.numberDigits);
+                    const oNormalizedNumberData = this._normalizeNumber(oData.number, maxCharactersInDisplayNumber, oData.numberFactor, oData.numberDigits);
 
                     oCurrentProperties.number_factor = oNormalizedNumberData.numberFactor;
                     oCurrentProperties.number_value = oNormalizedNumberData.displayNumber;
                 } else {
-                    var oNForm = NumberFormat.getFloatInstance({ maxFractionDigits: maxCharactersInDisplayNumber });
+                    const oNForm = NumberFormat.getFloatInstance({ maxFractionDigits: maxCharactersInDisplayNumber });
 
                     oCurrentProperties.number_value = oNForm.format(oData.number);
                 }
@@ -623,7 +622,7 @@ sap.ui.define([
         },
 
         _shouldProcessDigits: function (sDisplayNumber, iDigitsToDisplay) {
-            var nNumberOfDigits;
+            let nNumberOfDigits;
 
             sDisplayNumber = typeof (sDisplayNumber) !== "string" ? sDisplayNumber.toString() : sDisplayNumber;
             if (sDisplayNumber.indexOf(".") !== -1) {
@@ -669,7 +668,7 @@ sap.ui.define([
          * @private
          */
         _getValueColor: function (sValueState) {
-            var sColor = this._formatValueColor(sValueState);
+            const sColor = this._formatValueColor(sValueState);
             if (sColor === ValueColor.Neutral) {
                 return ValueColor.None;
             }
@@ -698,7 +697,7 @@ sap.ui.define([
                 this.stopRequests();
                 this.oDataRequest.destroy();
             }
-            this._aDoables.forEach(function (oDoable) {
+            this._aDoables.forEach((oDoable) => {
                 oDoable.off();
             });
             this._aDoables = [];

package/src/main/js/sap/ushell/components/tiles/cdm/applauncherdynamic/DynamicTile.view.js

@@ -6,17 +6,17 @@ sap.ui.define([
     "sap/m/TileContent",
     "sap/m/NumericContent",
     "sap/m/library"
-], function (
+], (
     View,
     GenericTile,
     TileContent,
     NumericContent,
     mobileLibrary
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.ValueColor
-    var ValueColor = mobileLibrary.ValueColor;
+    const ValueColor = mobileLibrary.ValueColor;
 
     return View.extend("sap.ushell.components.tiles.cdm.applauncherdynamic.DynamicTile", {
         getControllerName: function () {
@@ -26,7 +26,7 @@ sap.ui.define([
             this.setHeight("100%");
             this.setWidth("100%");
 
-            //Return the GenericTile if it already exists instead of creating a new one
+            // Return the GenericTile if it already exists instead of creating a new one
             if (this.getContent().length === 1) {
                 return this.getContent()[0];
             }