@sapui5/sap.ushell 1.138.1 → 1.139.1

package/src/main/js/sap/ushell/components/shell/Settings/UserSettings.controller.js

@@ -17,7 +17,7 @@ sap.ui.define([
     "sap/ui/base/Object",
     "sap/base/util/deepClone",
     "sap/ushell/Container"
-], function (
+], (
     Log,
     Element,
     Controller,
@@ -34,7 +34,7 @@ sap.ui.define([
     BaseObject,
     deepClone,
     Container
-) {
+) => {
     "use strict";
 
     return Controller.extend("sap.ushell.components.shell.Settings.UserSettings", {
@@ -45,7 +45,7 @@ sap.ui.define([
          */
         onInit: function () {
             const oSettingView = this.getView();
-            var oDeviceModel = new JSONModel(Device);
+            const oDeviceModel = new JSONModel(Device);
             oDeviceModel.setDefaultBindingMode("OneWay");
             oSettingView.setModel(oDeviceModel, "device");
 
@@ -80,7 +80,7 @@ sap.ui.define([
         },
 
         _fnOrientationChange: function () {
-            var oSplitApp = this.getView().byId("settingsApp");
+            const oSplitApp = this.getView().byId("settingsApp");
             this._updateHeaderButtonVisibility(oSplitApp.isMasterShown());
         },
 
@@ -111,31 +111,31 @@ sap.ui.define([
          * @since 1.111
          */
         _processNewEntries: function (aEntries) {
-            var oView = this.getView();
-            var oResultsModel = oView.getModel("results");
-            aEntries.forEach(function (oEntry) {
-                var oResult = oResultsModel.getProperty("/entries/" + oEntry.id);
+            const oView = this.getView();
+            const oResultsModel = oView.getModel("results");
+            aEntries.forEach((oEntry) => {
+                const oResult = oResultsModel.getProperty(`/entries/${oEntry.id}`);
                 if (!oResult) {
-                    oResultsModel.setProperty("/entries/" + oEntry.id, {
+                    oResultsModel.setProperty(`/entries/${oEntry.id}`, {
                         valueResult: null,
                         contentResult: null
                     });
                 }
 
                 this._setEntryValueResult(oEntry.id);
-            }.bind(this));
+            });
 
-            var oModel = oView.getModel();
-            var oMasterEntryList = oView.byId("userSettingEntryList");
-            var oSelectedItem = oMasterEntryList.getSelectedItem();
+            const oModel = oView.getModel();
+            const oMasterEntryList = oView.byId("userSettingEntryList");
+            let oSelectedItem = oMasterEntryList.getSelectedItem();
 
             if (!Device.system.phone && !oSelectedItem) {
                 oSelectedItem = oMasterEntryList.getItems()[0];
             }
 
             if (oSelectedItem) {
-                var oEntry = oSelectedItem.getBindingContext().getObject();
-                this._aPreviouslySelectedItems = oEntry.tabs.map(function (oTabEntry) {
+                const oEntry = oSelectedItem.getBindingContext().getObject();
+                this._aPreviouslySelectedItems = oEntry.tabs.map((oTabEntry) => {
                     return oTabEntry.id;
                 });
             }
@@ -153,22 +153,22 @@ sap.ui.define([
          * @private
          */
         _calculateEntryGroups: function (aEntries) {
-            var aNewEntries = [];
-            var mGroups = new Map();
-            var oResultsModel = this.getView().getModel("results");
+            const aNewEntries = [];
+            const mGroups = new Map();
+            const oResultsModel = this.getView().getModel("results");
 
-            aEntries.forEach(function (oEntry) {
+            aEntries.forEach((oEntry) => {
                 // Ignore invisible entries
                 if (oEntry.visible === false) {
                     // Cleanup in case entry was rendered before
-                    var sDetailPageId = oResultsModel.getProperty("/entries/" + oEntry.id + "/contentResult");
+                    const sDetailPageId = oResultsModel.getProperty(`/entries/${oEntry.id}/contentResult`);
                     if (sDetailPageId) {
                         this.getView().byId("settingsApp").removeDetailPage(sDetailPageId);
-                        oResultsModel.setProperty("/entries/" + oEntry.id + "/contentResult", null);
+                        oResultsModel.setProperty(`/entries/${oEntry.id}/contentResult`, null);
                     }
 
                     // prevent save / cancel being called on an invisible entry
-                    var oUserSettingsEntriesToSave = EventHub.last("UserSettingsOpened") || {};
+                    const oUserSettingsEntriesToSave = EventHub.last("UserSettingsOpened") || {};
                     delete oUserSettingsEntriesToSave[oEntry.id];
                     EventHub.emit("UserSettingsOpened", oUserSettingsEntriesToSave);
 
@@ -177,9 +177,9 @@ sap.ui.define([
 
                 if (oEntry.groupingEnablement) {
                     // always reset contentResult because the grouping might have changed
-                    oResultsModel.setProperty("/entries/" + oEntry.id + "/contentResult", null);
+                    oResultsModel.setProperty(`/entries/${oEntry.id}/contentResult`, null);
 
-                    var iGroupIndex = mGroups.get(oEntry.groupingId);
+                    const iGroupIndex = mGroups.get(oEntry.groupingId);
                     if (iGroupIndex || iGroupIndex === 0) {
                         aNewEntries[iGroupIndex].tabs.push(oEntry);
                         return;
@@ -188,7 +188,7 @@ sap.ui.define([
                 }
                 oEntry.tabs = [oEntry];
                 aNewEntries.push(oEntry);
-            }.bind(this));
+            });
 
             return aNewEntries;
         },
@@ -227,31 +227,31 @@ sap.ui.define([
          * @private
          */
         _listAfterRendering: function () {
-            var oView = this.getView();
-            var oMasterEntryList = oView.byId("userSettingEntryList");
-            var aItems = oMasterEntryList.getItems();
-            var oTargetItem;
-            var sSelectedTabId;
+            const oView = this.getView();
+            const oMasterEntryList = oView.byId("userSettingEntryList");
+            const aItems = oMasterEntryList.getItems();
+            let oTargetItem;
+            let sSelectedTabId;
 
             // Update descriptions eg: when theme updates
-            aItems.forEach(function (oItem) {
-                var oEntry = oItem.getBindingContext().getObject();
+            aItems.forEach((oItem) => {
+                const oEntry = oItem.getBindingContext().getObject();
                 this._setEntryValueResult(oEntry.id);
                 sSelectedTabId = oEntry?.tabs?.find((oTabEntry) => oTabEntry.id === this.sTargetEntryId)?.id;
                 if (oEntry.id === this.sTargetEntryId || sSelectedTabId) {
                     oTargetItem = oItem;
                     this.sTargetEntryId = null;
                 }
-            }.bind(this));
+            });
 
             if (!Device.system.phone) {
                 // If an entry was selected before the list was rerendered,
                 // this code will try to find either the main entry or any of its tabs,
                 // so that the user stays on the same entry, even if a tab was removed.
                 if (!oTargetItem && this._aPreviouslySelectedItems) {
-                    for (var i = 0; i < this._aPreviouslySelectedItems.length; i++) {
-                        for (var j = 0; j < aItems.length; j++) {
-                            var oItem = aItems[j];
+                    for (let i = 0; i < this._aPreviouslySelectedItems.length; i++) {
+                        for (let j = 0; j < aItems.length; j++) {
+                            const oItem = aItems[j];
                             if (oItem.getBindingContext().getObject().id === this._aPreviouslySelectedItems[i]) {
                                 oMasterEntryList.setSelectedItem(oItem);
                                 this._toDetail(oItem, sSelectedTabId);
@@ -282,10 +282,10 @@ sap.ui.define([
          * @private
          */
         _setEntryValueResult: function (sEntryId) {
-            var oEntryResults;
-            var oResultsModel = this.getView().getModel("results");
-            var aEntries = Config.last("/core/userPreferences/entries");
-            var iEntryIndex = aEntries.findIndex(function (oEntry) {
+            let oEntryResults;
+            const oResultsModel = this.getView().getModel("results");
+            let aEntries = Config.last("/core/userPreferences/entries");
+            let iEntryIndex = aEntries.findIndex((oEntry) => {
                 return oEntry.id === sEntryId;
             });
 
@@ -294,12 +294,12 @@ sap.ui.define([
             }
 
             return Promise.resolve()
-                .then(function () {
-                    var sEntryTitle = aEntries[iEntryIndex].title;
-                    var vValueArgument = aEntries[iEntryIndex].valueArgument;
+                .then(() => {
+                    const sEntryTitle = aEntries[iEntryIndex].title;
+                    const vValueArgument = aEntries[iEntryIndex].valueArgument;
 
                     if (typeof vValueArgument !== "function") {
-                        var sOldValueResult = oResultsModel.getProperty("/entries/" + sEntryId + "/valueResult");
+                        const sOldValueResult = oResultsModel.getProperty(`/entries/${sEntryId}/valueResult`);
                         if (sOldValueResult !== null && sOldValueResult !== undefined) {
                             return sOldValueResult;
                         }
@@ -313,7 +313,7 @@ sap.ui.define([
 
                     return Promise.resolve()
                         .then(vValueArgument)
-                        .then(function (valueResult) {
+                        .then((valueResult) => {
                             if (typeof (valueResult) !== "object") {
                                 return valueResult;
                             }
@@ -321,7 +321,7 @@ sap.ui.define([
                             // update visibility
                             if (valueResult && valueResult.value !== undefined) {
                                 aEntries = Config.last("/core/userPreferences/entries");
-                                iEntryIndex = aEntries.findIndex(function (oEntry) {
+                                iEntryIndex = aEntries.findIndex((oEntry) => {
                                     return oEntry.id === sEntryId;
                                 });
                                 if (iEntryIndex > -1) {
@@ -332,12 +332,12 @@ sap.ui.define([
 
                             return valueResult.displayText;
                         })
-                        .catch(function (error) {
-                            Log.error("Can not load value for " + sEntryTitle + " entry", error);
+                        .catch((error) => {
+                            Log.error(`Can not load value for ${sEntryTitle} entry`, error);
                             return resources.i18n.getText("loadingErrorMessage");
                         });
                 })
-                .then(function (sDisplayText) {
+                .then((sDisplayText) => {
                     // update entry description
                     oEntryResults = deepClone(oResultsModel.getProperty("/entries"));
                     oEntryResults[sEntryId].valueResult = sDisplayText || "";
@@ -351,7 +351,7 @@ sap.ui.define([
          * @private
          */
         _navBackButtonPressHandler: function () {
-            var oSplitApp = this.byId("settingsApp");
+            const oSplitApp = this.byId("settingsApp");
             oSplitApp.backDetail();
             oSplitApp.getCurrentDetailPage().setBusy(false);
             this._updateHeaderButtonVisibility(true);
@@ -363,8 +363,8 @@ sap.ui.define([
          * @private
          */
         _navToggleButtonPressHandler: function () {
-            var oSplitApp = this.byId("settingsApp");
-            var bIsMasterShown = oSplitApp.isMasterShown();
+            const oSplitApp = this.byId("settingsApp");
+            const bIsMasterShown = oSplitApp.isMasterShown();
 
             if (bIsMasterShown) {
                 oSplitApp.hideMaster();
@@ -383,10 +383,10 @@ sap.ui.define([
          */
         _updateHeaderButtonVisibility: function (bIsMasterShown) {
             if (Device.system.phone) {
-                var oBackButton = this.getView().byId("userSettingsNavBackButton");
+                const oBackButton = this.getView().byId("userSettingsNavBackButton");
                 oBackButton.setVisible(!bIsMasterShown);
             } else {
-                var oMenuButton = this.getView().byId("userSettingsMenuButton");
+                const oMenuButton = this.getView().byId("userSettingsMenuButton");
                 if (Device.orientation.portrait) {
                     oMenuButton.setVisible(true);
                     oMenuButton.setPressed(bIsMasterShown);
@@ -421,18 +421,18 @@ sap.ui.define([
          * @private
          */
         _toDetail: function (oSelectedItem, sSelectedTabId) {
-            var oView = this.getView();
-            var oModel = oView.getModel();
-            var oResultsModel = oView.getModel("results");
+            const oView = this.getView();
+            const oModel = oView.getModel();
+            const oResultsModel = oView.getModel("results");
 
-            var oSplitApp = oView.byId("settingsApp");
-            var sEntryPath = oSelectedItem.getBindingContextPath();
-            var oEntry = oModel.getProperty(sEntryPath);
-            var sEntryId = oEntry.id;
-            var sDetailPageId = oResultsModel.getProperty("/entries/" + sEntryId + "/contentResult");
+            const oSplitApp = oView.byId("settingsApp");
+            const sEntryPath = oSelectedItem.getBindingContextPath();
+            const oEntry = oModel.getProperty(sEntryPath);
+            const sEntryId = oEntry.id;
+            const sDetailPageId = oResultsModel.getProperty(`/entries/${sEntryId}/contentResult`);
 
             if (oEntry.tabs) {
-                this._aPreviouslySelectedItems = oEntry.tabs.map(function (oTabEntry) {
+                this._aPreviouslySelectedItems = oEntry.tabs.map((oTabEntry) => {
                     return oTabEntry.id;
                 });
             } else {
@@ -447,20 +447,20 @@ sap.ui.define([
             // Entry result was already saved
             if (sDetailPageId) {
                 this._navToDetail(sDetailPageId, oView);
-                var sWrapperId = oEntry.tabs.map(function (oTabEntry) {
+                const sWrapperId = oEntry.tabs.map((oTabEntry) => {
                     return oTabEntry.id;
                 }).join("-");
-                var oWrapperPromise = this._mLoadedWrappers.get(sWrapperId);
+                const oWrapperPromise = this._mLoadedWrappers.get(sWrapperId);
                 // Loading of actual wrapper+entry was started
                 if (oWrapperPromise) {
-                    oWrapperPromise.then(function (oWrapper) {
-                        var oIconTabBar = oWrapper.getContent()[1];
+                    oWrapperPromise.then((oWrapper) => {
+                        const oIconTabBar = oWrapper.getContent()[1];
                         if (sSelectedTabId) {
                             oIconTabBar.setSelectedKey(sSelectedTabId);
                         }
-                        var sSelectedKey = oIconTabBar.getSelectedKey();
-                        var aItems = oIconTabBar.getItems();
-                        var iTabIndex = aItems.findIndex(function (oItem) {
+                        const sSelectedKey = oIconTabBar.getSelectedKey();
+                        const aItems = oIconTabBar.getItems();
+                        let iTabIndex = aItems.findIndex((oItem) => {
                             return oItem.getId() === sSelectedKey;
                         });
 
@@ -471,7 +471,7 @@ sap.ui.define([
                         }
 
                         this._emitEntryOpened(oEntry.tabs[iTabIndex].id);
-                    }.bind(this));
+                    });
                     return Promise.resolve();
                 }
             }
@@ -479,19 +479,19 @@ sap.ui.define([
             return Promise.all([
                 this._createContentWrapper(oEntry),
                 this._createEntryContent(oEntry)
-            ]).then(function (aResults) {
-                var oWrapper = aResults[0];
-                var oEntryContent = aResults[1];
+            ]).then((aResults) => {
+                const oWrapper = aResults[0];
+                const oEntryContent = aResults[1];
 
-                var aEntries = Config.last("/core/userPreferences/entries");
-                var bEntryAvailable = aEntries.some(function (entry) {
+                const aEntries = Config.last("/core/userPreferences/entries");
+                const bEntryAvailable = aEntries.some((entry) => {
                     return entry.id === sEntryId && entry.visible !== false;
                 });
 
-                var oMasterEntryList = oView.byId("userSettingEntryList");
-                var oCurrentSelectedItem = oMasterEntryList.getSelectedItem() || this._oSelectedItemOnMobile;
+                const oMasterEntryList = oView.byId("userSettingEntryList");
+                const oCurrentSelectedItem = oMasterEntryList.getSelectedItem() || this._oSelectedItemOnMobile;
                 // Since the entry content creation is delayed, it might be that the user already selected a different settings entry.
-                var bLoadedDetailMatchesSelectedEntry = oSelectedItem === oCurrentSelectedItem;
+                const bLoadedDetailMatchesSelectedEntry = oSelectedItem === oCurrentSelectedItem;
 
                 if (!bEntryAvailable) {
                     if (bLoadedDetailMatchesSelectedEntry) {
@@ -515,11 +515,11 @@ sap.ui.define([
                     oWrapper.addContent(oEntryContent);
                 }
 
-                var sNewDetailPageId = oWrapper.getId();
-                oResultsModel.setProperty("/entries/" + sEntryId + "/contentResult", sNewDetailPageId);
+                const sNewDetailPageId = oWrapper.getId();
+                oResultsModel.setProperty(`/entries/${sEntryId}/contentResult`, sNewDetailPageId);
 
                 if (sSelectedTabId) {
-                    var oIconTabBar = oWrapper.getContent()?.[1];
+                    const oIconTabBar = oWrapper.getContent()?.[1];
                     oIconTabBar?.setSelectedKey(sSelectedTabId);
                 }
 
@@ -529,7 +529,7 @@ sap.ui.define([
                 }
 
                 return oWrapper.getId();
-            }.bind(this));
+            });
         },
 
         /**
@@ -543,19 +543,19 @@ sap.ui.define([
         _createEntryContent: function (oEntry) {
             if (!this._mLoadedEntryContent.get(oEntry.id)) {
                 if (typeof oEntry.contentFunc === "function") {
-                    this._mLoadedEntryContent.set(oEntry.id, new Promise(function (resolve) {
+                    this._mLoadedEntryContent.set(oEntry.id, new Promise((resolve) => {
                         oEntry.contentFunc()
-                            .then(function (oContentResult) {
+                            .then((oContentResult) => {
                                 if (BaseObject.isObjectA(oContentResult, "sap.ui.core.Control")) {
                                     resolve(oContentResult);
                                 } else {
                                     this._createErrorContent(resources.i18n.getText("loadingErrorMessage")).then(resolve);
                                 }
-                            }.bind(this))
-                            .catch(function () {
+                            })
+                            .catch(() => {
                                 this._createErrorContent(resources.i18n.getText("loadingErrorMessage")).then(resolve);
-                            }.bind(this));
-                    }.bind(this)));
+                            });
+                    }));
                 } else {
                     this._mLoadedEntryContent.set(oEntry.id, this._createErrorContent(resources.i18n.getText("userSettings.noContent")));
                 }
@@ -572,28 +572,28 @@ sap.ui.define([
          * @private
          */
         _createContentWrapper: function (oEntry) {
-            var aEntryIds = oEntry.tabs.map(function (oTabEntry) {
+            const aEntryIds = oEntry.tabs.map((oTabEntry) => {
                 return oTabEntry.id;
             });
-            var sWrapperId = aEntryIds.join("-");
+            const sWrapperId = aEntryIds.join("-");
 
             if (!this._mLoadedWrappers.get(sWrapperId)) {
                 this._mLoadedWrappers.set(sWrapperId, Fragment.load({
                     name: "sap.ushell.components.shell.Settings.ContentWrapper",
                     controller: {
                         onTabSelected: function (oEvent) {
-                            var oIconTabBar = Element.getElementById(oEvent.getParameter("id"));
-                            var oIconTabFilter = oEvent.getParameter("item");
-                            var iTabIndex = oIconTabBar.indexOfItem(oIconTabFilter);
-                            var oTabEntryContext = oEntry.tabs[iTabIndex];
+                            const oIconTabBar = Element.getElementById(oEvent.getParameter("id"));
+                            const oIconTabFilter = oEvent.getParameter("item");
+                            const iTabIndex = oIconTabBar.indexOfItem(oIconTabFilter);
+                            const oTabEntryContext = oEntry.tabs[iTabIndex];
 
                             this._emitEntryOpened(oTabEntryContext.id);
-                            this._createEntryContent(oTabEntryContext).then(function (oEntryContent) {
+                            this._createEntryContent(oTabEntryContext).then((oEntryContent) => {
                                 oIconTabFilter.addContent(oEntryContent);
                             });
                         }.bind(this)
                     }
-                }).then(function (oContentWrapper) {
+                }).then((oContentWrapper) => {
                     oContentWrapper.setModel(new JSONModel({
                         title: oEntry.title,
                         showHeader: !oEntry.provideEmptyWrapper,
@@ -603,21 +603,21 @@ sap.ui.define([
                 }));
             }
 
-            return this._mLoadedWrappers.get(sWrapperId).then(function (oWrapper) {
-                var oIconTabBar = oWrapper.getContent()[1];
-                var sSelectedKey = oIconTabBar.getSelectedKey();
+            return this._mLoadedWrappers.get(sWrapperId).then((oWrapper) => {
+                const oIconTabBar = oWrapper.getContent()[1];
+                const sSelectedKey = oIconTabBar.getSelectedKey();
 
-                var iTabIndex = oIconTabBar.getItems().findIndex(function (oItem) {
+                const iTabIndex = oIconTabBar.getItems().findIndex((oItem) => {
                     return oItem.getId() === sSelectedKey;
                 });
 
                 if (iTabIndex > -1) {
-                    var oTabEntryContext = oEntry.tabs[iTabIndex];
+                    const oTabEntryContext = oEntry.tabs[iTabIndex];
                     this._emitEntryOpened(oTabEntryContext.id);
                 }
 
                 return oWrapper;
-            }.bind(this));
+            });
         },
 
         /**
@@ -629,7 +629,7 @@ sap.ui.define([
         _createErrorContent: function (sMessage) {
             return Fragment.load({
                 name: "sap.ushell.components.shell.Settings.ErrorContent"
-            }).then(function (oErrorContent) {
+            }).then((oErrorContent) => {
                 oErrorContent.setModel(new JSONModel({
                     errorMessage: sMessage
                 }));
@@ -645,7 +645,7 @@ sap.ui.define([
          * @private
          */
         _navToDetail: function (sId, oView) {
-            var oSplitApp = oView.byId("settingsApp");
+            const oSplitApp = oView.byId("settingsApp");
 
             oSplitApp.toDetail(sId);
             oSplitApp.getCurrentDetailPage().setBusy(false);
@@ -662,7 +662,7 @@ sap.ui.define([
          * @private
          */
         _emitEntryOpened: function (sEntryId) {
-            var oUserSettingsEntriesToSave = EventHub.last("UserSettingsOpened") || {};
+            const oUserSettingsEntriesToSave = EventHub.last("UserSettingsOpened") || {};
             oUserSettingsEntriesToSave[sEntryId] = true;
             EventHub.emit("UserSettingsOpened", oUserSettingsEntriesToSave);
         },
@@ -685,26 +685,26 @@ sap.ui.define([
                 return this._updateUserPreferencesPromise;
             }
 
-            var _resolve, _reject;
+            let _resolve; let _reject;
 
-            this._updateUserPreferencesPromise = new Promise(function (resolve, reject) {
+            this._updateUserPreferencesPromise = new Promise((resolve, reject) => {
                 _resolve = resolve;
                 _reject = reject;
             });
 
             // the request is not sent immediately but when .sendRequest is called onSave
             this._updateUserPreferencesPromise.sendRequest = function () {
-                Container.getServiceAsync("UserInfo").then(function (oUserInfo) {
+                Container.getServiceAsync("UserInfo").then((oUserInfo) => {
                     Log.debug("[000] updateUserPreferences: sendRequest", "UserSettings.controller");
                     oUserInfo.updateUserPreferences()
                         .done(_resolve)
                         .fail(_reject)
-                        .always(function () {
+                        .always(() => {
                             // prepare for the next call; tests have to make sure that the previous call is always finished
                             Log.debug("[000] updateUserPreferences: sendRequest: _updateUserPreferencesPromise", "UserSettings.controller");
                             this._updateUserPreferencesPromise = null;
-                        }.bind(this));
-                }.bind(this));
+                        });
+                });
             }.bind(this);
 
             return this._updateUserPreferencesPromise;
@@ -719,12 +719,12 @@ sap.ui.define([
          * @returns {boolean} bReloaded true if FLP was reloaded
          */
         _maybeReload: function (aResults) {
-            var bRefresh = false;
-            var bClearSapUserContextCookie = false;
-            var bNoHash = false;
-            var aUrlParams = [];
-            var aObsoleteUrlParams = [];
-            aResults.forEach(function (oResult) {
+            let bRefresh = false;
+            let bClearSapUserContextCookie = false;
+            let bNoHash = false;
+            let aUrlParams = [];
+            let aObsoleteUrlParams = [];
+            aResults.forEach((oResult) => {
                 if (oResult && oResult.clearSapUserContextCookie) {
                     bClearSapUserContextCookie = true;
                 }
@@ -768,9 +768,9 @@ sap.ui.define([
         _handleSaveButtonPress: function () {
             ErrorMessageHelper.removeErrorMessages();
 
-            var oDialog = this.getView().byId("userSettingsDialog");
-            var aEntries = Config.last("/core/userPreferences/entries");
-            var oOpenedEntries = EventHub.last("UserSettingsOpened") || {};
+            const oDialog = this.getView().byId("userSettingsDialog");
+            const aEntries = Config.last("/core/userPreferences/entries");
+            const oOpenedEntries = EventHub.last("UserSettingsOpened") || {};
 
             if (Object.keys(oOpenedEntries).length === 0) {
                 this._handleSettingsDialogClose();
@@ -779,24 +779,24 @@ sap.ui.define([
             }
             oDialog.setBusy(true);
 
-            var aSavePromises = aEntries.reduce(function (aResult, oEntry) {
+            const aSavePromises = aEntries.reduce((aResult, oEntry) => {
                 if (oOpenedEntries[oEntry.id]) {
                     // onSave can be native Promise or jQuery promise.
                     Log.debug("[000] _handleSaveButtonPress: oEntry.id: ", oEntry.id, "UserSettings.controller");
                     aResult.push(this._executeEntrySave(oEntry));
                 }
                 return aResult;
-            }.bind(this), []);
+            }, []);
             Log.debug("[000] _handleSaveButtonPress:_updateUserPreferencesPromise", this._updateUserPreferencesPromise, "UserSettings.controller");
             if (this._updateUserPreferencesPromise) {
                 this._updateUserPreferencesPromise.sendRequest(); // Send the combined batch request.
             }
-            return Promise.all(aSavePromises).then(function (aResults) {
+            return Promise.all(aSavePromises).then((aResults) => {
                 Log.debug("[000] _handleSaveButtonPress: then save aResults", JSON.stringify(aResults), "UserSettings.controller");
-                var aFailedExecutions = ErrorMessageHelper.filterMessagesToDisplay();
-                var oFirstError = {};
-                var sFirstErrorMessageDescription = "";
-                var sErrMessageLog = "";
+                const aFailedExecutions = ErrorMessageHelper.filterMessagesToDisplay();
+                let oFirstError = {};
+                let sFirstErrorMessageDescription = "";
+                let sErrMessageLog = "";
 
                 oDialog.setBusy(false);
                 this._handleSettingsDialogClose();
@@ -805,8 +805,8 @@ sap.ui.define([
                     oFirstError = aFailedExecutions[0];
                     sFirstErrorMessageDescription = oFirstError.getDescription();
                     EventHub.emit("UserSettingsOpened", null);
-                    aFailedExecutions.forEach(function (oError) {
-                        sErrMessageLog += "Entry: " + oError.getAdditionalText() + " - Error message: " + oError.getDescription() + "\n";
+                    aFailedExecutions.forEach((oError) => {
+                        sErrMessageLog += `Entry: ${oError.getAdditionalText()} - Error message: ${oError.getDescription()}\n`;
                     });
                     Log.error("Failed to save the following entries", sErrMessageLog);
                     if (this._maybeReload(aResults)) {
@@ -814,7 +814,7 @@ sap.ui.define([
                         return;
                     }
                     return Container.getServiceAsync("MessageInternal")
-                        .then(function (oMessage) {
+                        .then((oMessage) => {
                             oMessage.init();
                             oMessage.show(
                                 oMessage.Type.ERROR,
@@ -828,12 +828,12 @@ sap.ui.define([
                 this._showSuccessMessageToast();
                 EventHub.emit("UserSettingsOpened", null);
                 this._maybeReload(aResults);
-            }.bind(this));
+            });
         },
 
         _executeEntrySave: function (oEntry) {
-            var onSavePromise,
-                oResultPromise;
+            let onSavePromise;
+            let oResultPromise;
 
             function onSuccess (params) {
                 return params || {};
@@ -841,16 +841,16 @@ sap.ui.define([
 
             function onError (errorInformation) {
                 Log.debug("[000] _onError: errorInformation", JSON.stringify(errorInformation), "UserSettings.controller");
-                var sMessage;
-                var sEntryId = oEntry.id;
-                var sEntryTitle = oEntry.title;
+                let sMessage;
+                const sEntryId = oEntry.id;
+                const sEntryTitle = oEntry.title;
 
                 if (!errorInformation) {
                     sMessage = resources.i18n.getText("userSettings.SavingError.Undefined");
                 } else if (typeof (errorInformation) === "string") {
                     sMessage = errorInformation;
                 } else if (Array.isArray(errorInformation)) {
-                    errorInformation.forEach(function (message) {
+                    errorInformation.forEach((message) => {
                         message.setAdditionalText(sEntryTitle);
                         message.setTechnicalDetails({ pluginId: sEntryId });
                         ErrorMessageHelper.addMessage(message);
@@ -877,7 +877,7 @@ sap.ui.define([
             }
 
             try {
-                Log.debug("[000] onSave: oEntry.id: " + oEntry.id, "UserSettings.controller");
+                Log.debug(`[000] onSave: oEntry.id: ${oEntry.id}`, "UserSettings.controller");
                 this._isExecuteEntrySavedInUserSettingsController = true;
                 onSavePromise = oEntry.onSave(this.updateUserPreferences.bind(this));
             } catch (error) {
@@ -887,14 +887,14 @@ sap.ui.define([
             // jQuery promise
             if (onSavePromise) {
                 if (onSavePromise.promise) {
-                    Log.warning("jQuery.promise is used to save " + oEntry.title + " settings entry.\n"
+                    Log.warning(`jQuery.promise is used to save ${oEntry.title} settings entry.\n`
                         + "The using of jQuery.promise for onSave is deprecated. Please use the native promise instead.");
-                    oResultPromise = new Promise(function (resolve) {
+                    oResultPromise = new Promise((resolve) => {
                         onSavePromise
-                            .done(function (params) {
+                            .done((params) => {
                                 resolve(onSuccess(params));
                             })
-                            .fail(function (sErrorMessage) {
+                            .fail((sErrorMessage) => {
                                 resolve(onError(sErrorMessage));
                             });
                     });
@@ -906,7 +906,7 @@ sap.ui.define([
             } else {
                 oResultPromise = Promise.resolve();
                 // onSave needs to return a jQuery.promise or better a native Promise.
-                Log.warning(oEntry.title + " settings might not be saved correctly, it seems like the API contract is not correctly fullfilled.\n"
+                Log.warning(`${oEntry.title} settings might not be saved correctly, it seems like the API contract is not correctly fullfilled.\n`
                     + "Please contact the owner of the setting.");
             }
 
@@ -914,8 +914,8 @@ sap.ui.define([
         },
 
         _showSuccessMessageToast: function () {
-            sap.ui.require(["sap/m/MessageToast"], function (MessageToast) {
-                var sMessage = resources.i18n.getText("savedChanges");
+            sap.ui.require(["sap/m/MessageToast"], (MessageToast) => {
+                const sMessage = resources.i18n.getText("savedChanges");
 
                 MessageToast.show(sMessage, {
                     offset: "0 -50"
@@ -929,11 +929,11 @@ sap.ui.define([
          * @private
          */
         _handleCancel: function () {
-            var aEntries = Config.last("/core/userPreferences/entries");
+            const aEntries = Config.last("/core/userPreferences/entries");
             // Invoke onCancel function for opened entity
-            var oInvokedEntities = EventHub.last("UserSettingsOpened") || {};
+            const oInvokedEntities = EventHub.last("UserSettingsOpened") || {};
             if (oInvokedEntities) {
-                aEntries.forEach(function (oEntry) {
+                aEntries.forEach((oEntry) => {
                     if (oInvokedEntities[oEntry.id] && oEntry.onCancel) {
                         try {
                             oEntry.onCancel();
@@ -953,7 +953,7 @@ sap.ui.define([
          * @private
          */
         _handleSettingsDialogClose: function () {
-            //to be sure that all user changes reset
+            // to be sure that all user changes reset
             Container.getUser().resetChangedProperties();
             // Clear selection from list.
             if (Device.system.phone) {