@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -21,7 +21,7 @@ sap.ui.define([
     "sap/m/MessageBox",
     "./ExtendedValueDialog.controller",
     "sap/ushell/Container"
-], function (
+], (
     Log,
     Localization,
     fnDeepExtend,
@@ -42,11 +42,11 @@ sap.ui.define([
     MessageBox,
     ExtendedValueDialog,
     Container
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.ButtonType
-    var ButtonType = mobileLibrary.ButtonType;
+    const ButtonType = mobileLibrary.ButtonType;
 
     // compare parameters by groupId
     function compareByGroupId (oDefault1, oDefault2) {
@@ -80,10 +80,10 @@ sap.ui.define([
         return oDefault1.editorMetadata.parameterIndex - oDefault2.editorMetadata.parameterIndex;
     }
 
-    //compare parameters by groupId and then by parameterIndex
+    // compare parameters by groupId and then by parameterIndex
     function compareParameters (oDefault1, oDefault2) {
         // first by groupId
-        var iComparisonResult = compareByGroupId(oDefault1, oDefault2);
+        const iComparisonResult = compareByGroupId(oDefault1, oDefault2);
         if (iComparisonResult === 0) {
             // then by parameterIdx
             return compareByParameterIndex(oDefault1, oDefault2);
@@ -103,22 +103,22 @@ sap.ui.define([
             });
             this.getView().setModel(this.oDirtyStateModel, "DirtyState");
 
-            this.oOriginalParameters = {}; //the original parameters which was loaded from service
+            this.oOriginalParameters = {}; // the original parameters which was loaded from service
 
-            var oView = this.getView();
+            const oView = this.getView();
             oView.setBusy(true);
             oView.setModel(ushellResources.i18nModel, "i18n");
 
-            this.getSystemContextsModel().then(function (oSystemContextModel) {
+            this.getSystemContextsModel().then((oSystemContextModel) => {
                 oView.setModel(oSystemContextModel, "systemContexts");
                 return this._fillGroups();
-            }.bind(this))
+            })
                 .then(this._saveIsSupportedPlatform.bind(this))
                 .then(this._initializeSmartVariantManagement.bind(this))
-                .then(function () {
+                .then(() => {
                     oView.setBusy(false);
                 })
-                .catch(function (err) {
+                .catch((err) => {
                     Log.error(
                         "Error during UserDefaultsSetting controller initialization",
                         err,
@@ -137,38 +137,38 @@ sap.ui.define([
          * @private
          */
         getSystemContextsModel: function () {
-            var oSystemContextModel = new JSONModel({ systemContexts: [], selectedKey: "" });
+            const oSystemContextModel = new JSONModel({ systemContexts: [], selectedKey: "" });
 
-            var oGetContentProviderIdsPromise = this._getContentProviderIds();
-            var oClientSideTargetResolutionPromise = Container.getServiceAsync("ClientSideTargetResolution");
-            var oUserDefaultParametersServicePromise = Container.getServiceAsync("UserDefaultParameters");
+            const oGetContentProviderIdsPromise = this._getContentProviderIds();
+            const oClientSideTargetResolutionPromise = Container.getServiceAsync("ClientSideTargetResolution");
+            const oUserDefaultParametersServicePromise = Container.getServiceAsync("UserDefaultParameters");
 
             return Promise.all([
                 oGetContentProviderIdsPromise,
                 oClientSideTargetResolutionPromise,
                 oUserDefaultParametersServicePromise
             ])
-                .then(function (aResults) {
-                    var aContentProviderIds = aResults[0];
-                    var oCSTRService = aResults[1];
-                    var oUserDefaultParametersService = aResults[2];
+                .then((aResults) => {
+                    const aContentProviderIds = aResults[0];
+                    const oCSTRService = aResults[1];
+                    const oUserDefaultParametersService = aResults[2];
 
                     // If there are no content providers we use the local systemContext
                     if (aContentProviderIds.length === 0) {
                         aContentProviderIds.push("");
                     }
 
-                    return Promise.all(aContentProviderIds.map(function (sContentProvider) {
-                        return oCSTRService.getSystemContext(sContentProvider).then(function (oSystemContext) {
-                            var aSystemContexts = oSystemContextModel.getProperty("/systemContexts");
-                            return oUserDefaultParametersService.hasRelevantMaintainableParameters(oSystemContext).then(function (bRelevant) {
+                    return Promise.all(aContentProviderIds.map((sContentProvider) => {
+                        return oCSTRService.getSystemContext(sContentProvider).then((oSystemContext) => {
+                            const aSystemContexts = oSystemContextModel.getProperty("/systemContexts");
+                            return oUserDefaultParametersService.hasRelevantMaintainableParameters(oSystemContext).then((bRelevant) => {
                                 if (bRelevant) {
                                     aSystemContexts.push(oSystemContext);
                                 }
                             });
                         });
-                    })).then(function () {
-                        var aSystemContexts = oSystemContextModel.getProperty("/systemContexts");
+                    })).then(() => {
+                        const aSystemContexts = oSystemContextModel.getProperty("/systemContexts");
                         if (aSystemContexts.length > 0) {
                             oSystemContextModel.setProperty("/selectedKey", aSystemContexts[0].id);
                         }
@@ -190,10 +190,10 @@ sap.ui.define([
          */
         _getContentProviderIds: function () {
             return Container.getServiceAsync("CommonDataModel")
-                .then(function (oCdmService) {
+                .then((oCdmService) => {
                     return oCdmService.getContentProviderIds();
                 })
-                .catch(function () {
+                .catch(() => {
                     return [""];
                 });
         },
@@ -208,8 +208,8 @@ sap.ui.define([
          */
         handleSystemContextChanged: function () {
             if (this.oDirtyStateModel.getProperty("/isDirty")) {
-                var sUserDefaultSaveText = ushellResources.i18n.getText("userDefaultsSave");
-                var sUserDefaultDiscardText = ushellResources.i18n.getText("userDefaultsDiscard");
+                const sUserDefaultSaveText = ushellResources.i18n.getText("userDefaultsSave");
+                const sUserDefaultDiscardText = ushellResources.i18n.getText("userDefaultsDiscard");
                 MessageBox.show(ushellResources.i18n.getText("userDefaultsUnsavedChangesMessage"), {
                     title: ushellResources.i18n.getText("userDefaultsUnsavedChangesTitle"),
                     actions: [sUserDefaultSaveText, sUserDefaultDiscardText, MessageBox.Action.CANCEL],
@@ -244,11 +244,11 @@ sap.ui.define([
          * @since 1.80.0
          */
         _fillGroups: async function () {
-            var oUserDefaultsForm = this.getView().byId("userDefaultsForm");
+            const oUserDefaultsForm = this.getView().byId("userDefaultsForm");
             oUserDefaultsForm.removeAllGroups();
 
-            var sKey = this.getView().getModel("systemContexts").getProperty("/selectedKey");
-            var oSystemContext = this.getView().getModel("systemContexts").getProperty("/systemContexts").find(function (oContext) {
+            const sKey = this.getView().getModel("systemContexts").getProperty("/selectedKey");
+            const oSystemContext = this.getView().getModel("systemContexts").getProperty("/systemContexts").find((oContext) => {
                 return oContext.id === sKey;
             });
 
@@ -258,14 +258,14 @@ sap.ui.define([
             // take a deep copy of the original parameters
             this.oOriginalParameters = fnDeepExtend({}, oParameters);
 
-            //Used to save extendedValues and value of the plain inputs
+            // Used to save extendedValues and value of the plain inputs
             this.oModel = new JSONModel(oParameters);
             this.oModel.setDefaultBindingMode("TwoWay");
             this.getView().setModel(this.oModel, "MdlParameter");
             const aModelInfoObjects = await this._getFormattedParameters(this.oModel);
 
-            var aGroups = this._createContent(aModelInfoObjects);
-            aGroups.forEach(function (oGroup) {
+            const aGroups = this._createContent(aModelInfoObjects);
+            aGroups.forEach((oGroup) => {
                 oUserDefaultsForm.addGroup(oGroup);
             });
         },
@@ -316,25 +316,24 @@ sap.ui.define([
          * @returns {Promise<FormattedParameter[]>} The list of sorted formatted parameters.
          */
         _getFormattedParameters: function (oJsonModel) {
-            var oParameters = oJsonModel.getData("/");
-            var aParametersPromises = Object.keys(oParameters).map(function (sParameter) {
-                var oParameter = fnDeepExtend({}, oParameters[sParameter]);
+            const oParameters = oJsonModel.getData("/");
+            const aParametersPromises = Object.keys(oParameters).map((sParameter) => {
+                const oParameter = fnDeepExtend({}, oParameters[sParameter]);
 
                 oParameter.parameterName = sParameter;
                 oParameter.editorMetadata = oParameter.editorMetadata || {};
 
-
                 if (oParameter.editorMetadata.editorInfo && oParameter.editorMetadata.editorInfo.propertyName) {
                     return this._createOdataModelBinding(oParameter, oJsonModel)
-                        .then(function (oModelBind) {
+                        .then((oModelBind) => {
                             oParameter.modelBind = oModelBind;
-                            var oODataMetadataModel = oModelBind.model ? oModelBind.model.getMetaModel() : undefined;
+                            const oODataMetadataModel = oModelBind.model ? oModelBind.model.getMetaModel() : undefined;
 
                             if (oODataMetadataModel) {
-                                return oODataMetadataModel.loaded().then(function () {
-                                    var sNS = oODataMetadataModel.getObject("/dataServices/schema/0/namespace");
-                                    var oType = oODataMetadataModel.getODataEntityType(sNS + "." + oParameter.editorMetadata.editorInfo.entityName);
-                                    var oODataProp = oType.property.find(function (obj) { if (obj.name === oParameter.editorMetadata.editorInfo.propertyName) { return true; } });
+                                return oODataMetadataModel.loaded().then(() => {
+                                    const sNS = oODataMetadataModel.getObject("/dataServices/schema/0/namespace");
+                                    const oType = oODataMetadataModel.getODataEntityType(`${sNS}.${oParameter.editorMetadata.editorInfo.entityName}`);
+                                    const oODataProp = oType.property.find((obj) => { if (obj.name === oParameter.editorMetadata.editorInfo.propertyName) { return true; } });
                                     switch (oODataProp.type) {
                                         case "Edm.DateTime":
                                             // We assume that a SmartField -> Date is used to handle this Parameter, therefore we adapt the data accordingly
@@ -351,34 +350,34 @@ sap.ui.define([
                             oParameter.valueObject = fnDeepExtend({ value: "" }, oParameter.valueObject);
                             return oParameter;
                         })
-                        .catch(function () {
-                            Log.error("Metadata loading for parameter " + oParameter.parameterName + " failed" + JSON.stringify(oParameter.editorMetadata));
+                        .catch(() => {
+                            Log.error(`Metadata loading for parameter ${oParameter.parameterName} failed${JSON.stringify(oParameter.editorMetadata)}`);
 
                             // normalize the value, in the editor, undefined is represented as ""
                             oParameter.valueObject = fnDeepExtend({ value: "" }, oParameter.valueObject);
 
-                            //When odata loading fails, switch to the normal (not smart) control.
+                            // When odata loading fails, switch to the normal (not smart) control.
                             oParameter.modelBind = this._createPlainModelBinding(oParameter, oJsonModel);
                             this.oBlockedParameters[oParameter.parameterName] = false;
                             return Promise.resolve(oParameter);
-                        }.bind(this));
+                        });
                 }
 
                 // normalize the value, in the editor, undefined is represented as ""
                 oParameter.valueObject = fnDeepExtend({ value: "" }, oParameter.valueObject);
                 oParameter.modelBind = this._createPlainModelBinding(oParameter, oJsonModel);
                 return Promise.resolve(oParameter);
-            }.bind(this));
+            });
 
-            return Promise.all(aParametersPromises).then(function (aParameters) {
+            return Promise.all(aParametersPromises).then((aParameters) => {
                 aParameters.sort(compareParameters);
                 this.aDisplayedUserDefaults = aParameters;
-                aParameters.forEach(function (oParameter) {
+                aParameters.forEach((oParameter) => {
                     oParameter.modelBind.model.setProperty(oParameter.modelBind.sFullPropertyPath, oParameter.valueObject.value);
                     oParameter.modelBind.model.bindTree(oParameter.modelBind.sFullPropertyPath).attachChange(this.storeChangedData.bind(this));
-                }.bind(this));
+                });
                 return aParameters;
-            }.bind(this));
+            });
         },
 
         /**
@@ -389,17 +388,17 @@ sap.ui.define([
          * @returns {ParameterModelBind} The modal binding for the parameter
          */
         _createPlainModelBinding: function (oParameter, oJsonModel) {
-            var sModelPath = "/" + oParameter.parameterName + "/valueObject/value";
-            //create object if not exist
-            if (!oJsonModel.getProperty("/" + oParameter.parameterName + "/valueObject")) {
-                oJsonModel.setProperty("/" + oParameter.parameterName + "/valueObject", {});
+            const sModelPath = `/${oParameter.parameterName}/valueObject/value`;
+            // create object if not exist
+            if (!oJsonModel.getProperty(`/${oParameter.parameterName}/valueObject`)) {
+                oJsonModel.setProperty(`/${oParameter.parameterName}/valueObject`, {});
             }
-            var oBindingInfo = {
+            const oBindingInfo = {
                 isOdata: false,
                 model: oJsonModel,
                 extendedModel: oJsonModel, // same model!
                 sFullPropertyPath: sModelPath,
-                sPropertyName: "{" + sModelPath + "}"
+                sPropertyName: `{${sModelPath}}`
             };
             return oBindingInfo;
         },
@@ -412,16 +411,16 @@ sap.ui.define([
          * @returns {Promise<BindingInfo>} A modal binding info object for the parameter
          */
         _createOdataModelBinding: function (oParameter, oJsonModel) {
-            var oEditorInfo = oParameter.editorMetadata.editorInfo;
-            var oODataServiceData = this._getODataServiceData(oEditorInfo.odataURL, oParameter);
+            const oEditorInfo = oParameter.editorMetadata.editorInfo;
+            const oODataServiceData = this._getODataServiceData(oEditorInfo.odataURL, oParameter);
 
-            return oODataServiceData.metadataLoaded.then(function () {
-                var oBindingInfo = {
+            return oODataServiceData.metadataLoaded.then(() => {
+                const oBindingInfo = {
                     isOdata: true,
                     model: oODataServiceData.model,
                     extendedModel: oJsonModel,
-                    sPropertyName: "{" + oEditorInfo.propertyName + "}",
-                    sFullPropertyPath: oEditorInfo.bindingPath + "/" + oEditorInfo.propertyName
+                    sPropertyName: `{${oEditorInfo.propertyName}}`,
+                    sFullPropertyPath: `${oEditorInfo.bindingPath}/${oEditorInfo.propertyName}`
                 };
                 return oBindingInfo;
             });
@@ -444,7 +443,7 @@ sap.ui.define([
             if (!this.oModelRecords[sUrl]) {
                 // In order to reduce the volume of the metadata response
                 // We pass only relevant parameters to oDataModel constructor
-                var oModel = new ODataModel(sUrl, {
+                const oModel = new ODataModel(sUrl, {
                     metadataUrlParams: {
                         "sap-documentation": "heading,quickinfo",
                         "sap-value-list": "none",
@@ -458,7 +457,7 @@ sap.ui.define([
                 this.oModelRecords[sUrl] = {
                     attachedListeners: [],
                     model: oModel,
-                    metadataLoaded: new Promise(function (resolve, reject) {
+                    metadataLoaded: new Promise((resolve, reject) => {
                         oModel.attachMetadataLoaded(resolve);
                         oModel.attachMetadataFailed(reject);
                     })
@@ -475,13 +474,13 @@ sap.ui.define([
         },
 
         _overrideOdataModelValue: function (oParameter, oEvent) {
-            var oModel = oEvent.getSource();
-            var sUrlSegment = "/" + oEvent.getParameter("url").replace(/\?.*/, "");
+            const oModel = oEvent.getSource();
+            const sUrlSegment = `/${oEvent.getParameter("url").replace(/\?.*/, "")}`;
 
             if (oParameter.editorMetadata.editorInfo.bindingPath === sUrlSegment) {
                 // if the property value in the model is not the same as the one we got from the service,
                 // change the property value accordingly
-                var sFullPath = oParameter.editorMetadata.editorInfo.bindingPath + "/" + oParameter.editorMetadata.editorInfo.propertyName;
+                const sFullPath = `${oParameter.editorMetadata.editorInfo.bindingPath}/${oParameter.editorMetadata.editorInfo.propertyName}`;
                 if (oModel.getProperty(sFullPath) !== oParameter.valueObject.value) {
                     oModel.setProperty(sFullPath, oParameter.valueObject.value);
                 }
@@ -500,7 +499,7 @@ sap.ui.define([
             const oBindingContexts = {};
             const aGroups = [];
 
-            for (var i = 0; i < aFormattedParameters.length; ++i) {
+            for (let i = 0; i < aFormattedParameters.length; ++i) {
                 const oProperty = aFormattedParameters[i];
                 const oModelBinding = oProperty.modelBind;
 
@@ -518,19 +517,19 @@ sap.ui.define([
                 const oGroupElement = this._createGroupElement(oProperty);
                 oGroupElement.setModel(oModelBinding.model);
                 if (oModelBinding.isOdata) {
-                    var sUrl = oProperty.editorMetadata.editorInfo.odataURL;
+                    const sUrl = oProperty.editorMetadata.editorInfo.odataURL;
                     // in order to avoid OData requests to the same URL
                     // we try to reuse the BindingContext that was previously created for the same URL
                     // the call to bindElement creates a new BindingContext, and triggers an OData request
                     if (!oBindingContexts[sUrl]) {
-                        var sBindingPath = oProperty.editorMetadata.editorInfo.bindingPath;
+                        const sBindingPath = oProperty.editorMetadata.editorInfo.bindingPath;
                         oGroupElement.bindElement(sBindingPath);
                         oBindingContexts[sUrl] = oProperty.modelBind.model.getContext(sBindingPath);
                     } else {
                         oGroupElement.setBindingContext(oBindingContexts[sUrl]);
                     }
                 }
-              oGroup.addGroupElement(oGroupElement);
+                oGroup.addGroupElement(oGroupElement);
             }
             return aGroups;
         },
@@ -555,7 +554,7 @@ sap.ui.define([
                 visible: !!oFormattedParameters.editorMetadata.extendedUsage,
                 type: {
                     parts: [`MdlParameter>/${oFormattedParameters.parameterName}/valueObject/extendedValue/Ranges`],
-                   formatter: (aRanges) => {
+                    formatter: (aRanges) => {
                         return aRanges && aRanges.length ? ButtonType.Emphasized : ButtonType.Transparent;
                     }
                 },
@@ -572,7 +571,7 @@ sap.ui.define([
                 });
                 oLabel.setLabelFor(oField);
             } else {
-               oField = new Input({
+                oField = new Input({
                     name: oFormattedParameters.parameterName,
                     value: oFormattedParameters.modelBind.sPropertyName,
                     fieldGroupIds: ["UserDefaults"],
@@ -586,7 +585,7 @@ sap.ui.define([
             oField.attachChange(this.storeChangedData.bind(this));
             oField.attachChange(this._setDirtyState.bind(this, true), this);
 
-           const oGroupElement = new GroupElement({
+            const oGroupElement = new GroupElement({
                 elements: [oField, oExtendedParametersButton],
                 label: oLabel
             });
@@ -594,15 +593,15 @@ sap.ui.define([
         },
 
         saveExtendedValue: function (oControlEvent) {
-            var sParameterName = oControlEvent.getSource().getModel().getProperty("/parameterName");
+            const sParameterName = oControlEvent.getSource().getModel().getProperty("/parameterName");
             // JSONModel is used for the extend values
-            var oExtendedModel = this.oModel;
-            var aTokens = oControlEvent.getParameters().tokens || [];
-            var sPathToTokens = "/" + sParameterName + "/valueObject/extendedValue/Ranges";
+            const oExtendedModel = this.oModel;
+            const aTokens = oControlEvent.getParameters().tokens || [];
+            const sPathToTokens = `/${sParameterName}/valueObject/extendedValue/Ranges`;
 
             // convert the Ranges that are coming from the dialog to the format that should be persisted in the service and that applications can read
-            var aFormattedTokensData = aTokens.map(function (oToken) {
-                var oTokenData = oToken.data("range");
+            const aFormattedTokensData = aTokens.map((oToken) => {
+                const oTokenData = oToken.data("range");
                 return {
                     Sign: oTokenData.exclude ? "E" : "I",
                     Option: oTokenData.operation !== "Contains" ? oTokenData.operation : "CP",
@@ -611,8 +610,8 @@ sap.ui.define([
                 };
             });
 
-            if (!oExtendedModel.getProperty("/" + sParameterName + "/valueObject/extendedValue")) {
-                oExtendedModel.setProperty("/" + sParameterName + "/valueObject/extendedValue", {});
+            if (!oExtendedModel.getProperty(`/${sParameterName}/valueObject/extendedValue`)) {
+                oExtendedModel.setProperty(`/${sParameterName}/valueObject/extendedValue`, {});
             }
             oExtendedModel.setProperty(sPathToTokens, aFormattedTokensData);
             this.aChangedParamsNames.push(sParameterName);
@@ -662,27 +661,27 @@ sap.ui.define([
          *  Thus it is important not to overwrite or recreate the valueObject, but only set the value property.
          */
         storeChangedData: function () {
-            var aDisplayedUserDefaults = this.aDisplayedUserDefaults || [];
+            const aDisplayedUserDefaults = this.aDisplayedUserDefaults || [];
 
             // check for all changed parameters...
-            for (var i = 0; i < aDisplayedUserDefaults.length; ++i) {
-                var sParameterName = aDisplayedUserDefaults[i].parameterName;
-                var oValueObject = this.oModel.getProperty("/" + sParameterName + "/valueObject/");
-                var oModelBinding = aDisplayedUserDefaults[i].modelBind;
+            for (let i = 0; i < aDisplayedUserDefaults.length; ++i) {
+                const sParameterName = aDisplayedUserDefaults[i].parameterName;
+                const oValueObject = this.oModel.getProperty(`/${sParameterName}/valueObject/`);
+                const oModelBinding = aDisplayedUserDefaults[i].modelBind;
 
                 if (!this.oBlockedParameters[sParameterName]) {
-                    var oldValues = {
+                    const oldValues = {
                         value: oValueObject && oValueObject.value,
                         extendedValue: oValueObject && oValueObject.extendedValue
                     };
                     if (oModelBinding && oModelBinding.model) {
-                        var oModel = oModelBinding.model;
-                        var oModelExtended = oModelBinding.extendedModel;
-                        var sPropValuePath = oModelBinding.sFullPropertyPath;
+                        const oModel = oModelBinding.model;
+                        const oModelExtended = oModelBinding.extendedModel;
+                        const sPropValuePath = oModelBinding.sFullPropertyPath;
 
-                        var oCurrentValues = {
+                        const oCurrentValues = {
                             value: oModel.getProperty(sPropValuePath) !== "" ? oModel.getProperty(sPropValuePath) : undefined,
-                            extendedValue: oModelExtended.getProperty("/" + sParameterName + "/valueObject/extendedValue") || undefined
+                            extendedValue: oModelExtended.getProperty(`/${sParameterName}/valueObject/extendedValue`) || undefined
                         };
                         if (!fnDeepEqual(oCurrentValues, oldValues)) {
                             oValueObject.value = oCurrentValues.value;
@@ -691,7 +690,7 @@ sap.ui.define([
                                 fnDeepExtend(oValueObject.extendedValue, oCurrentValues.extendedValue);
                             }
                             // Update also JSON Model's value
-                            this.oModel.setProperty("/" + sParameterName + "/valueObject", oValueObject);
+                            this.oModel.setProperty(`/${sParameterName}/valueObject`, oValueObject);
 
                             this.aChangedParamsNames.push(sParameterName);
                         }
@@ -703,24 +702,24 @@ sap.ui.define([
         onCancel: function () {
             this._setDirtyState(false);
 
-            var aDisplayedParameters = this.aDisplayedUserDefaults;
+            const aDisplayedParameters = this.aDisplayedUserDefaults;
 
             if (this.aChangedParamsNames.length > 0) {
-                for (var i = 0; i < aDisplayedParameters.length && this.aChangedParamsNames.length > 0; i++) {
-                    var sParameterName = aDisplayedParameters[i].parameterName;
+                for (let i = 0; i < aDisplayedParameters.length && this.aChangedParamsNames.length > 0; i++) {
+                    const sParameterName = aDisplayedParameters[i].parameterName;
                     if (this.aChangedParamsNames.indexOf(sParameterName) > -1) {
-                        var oOriginalParameter = this.oOriginalParameters[sParameterName];
-                        var oParameter = aDisplayedParameters[i];
-                        var oBoundModel = oParameter.modelBind;
-                        var oODataMetadataModel = oBoundModel.model ? oBoundModel.model.getMetaModel() : undefined;
+                        const oOriginalParameter = this.oOriginalParameters[sParameterName];
+                        const oParameter = aDisplayedParameters[i];
+                        const oBoundModel = oParameter.modelBind;
+                        const oODataMetadataModel = oBoundModel.model ? oBoundModel.model.getMetaModel() : undefined;
 
                         if (oODataMetadataModel) {
-                            var sNS = oODataMetadataModel.getObject("/dataServices/schema/0/namespace");
-                            var oType = oODataMetadataModel.getODataEntityType(sNS + "." + oParameter.editorMetadata.editorInfo.entityName);
-                            var oODataProp = oType.property.find(function (obj) { if (obj.name === oParameter.editorMetadata.editorInfo.propertyName) { return true; } });
+                            const sNS = oODataMetadataModel.getObject("/dataServices/schema/0/namespace");
+                            const oType = oODataMetadataModel.getODataEntityType(`${sNS}.${oParameter.editorMetadata.editorInfo.entityName}`);
+                            const oODataProp = oType.property.find((obj) => { if (obj.name === oParameter.editorMetadata.editorInfo.propertyName) { return true; } });
                             switch (oODataProp.type) {
                                 case "Edm.DateTime":
-                                        oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, new Date(oOriginalParameter.valueObject.value) || null);
+                                    oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, new Date(oOriginalParameter.valueObject.value) || null);
                                     break;
                                 default:
                                     oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, oOriginalParameter.valueObject.value || "");
@@ -731,7 +730,7 @@ sap.ui.define([
                         }
 
                         if (oOriginalParameter.editorMetadata && oOriginalParameter.editorMetadata.extendedUsage) {
-                            oBoundModel.extendedModel.setProperty("/" + sParameterName + "/valueObject/extendedValue",
+                            oBoundModel.extendedModel.setProperty(`/${sParameterName}/valueObject/extendedValue`,
                                 oOriginalParameter.valueObject.extendedValue || {});
                         }
                     }
@@ -745,20 +744,20 @@ sap.ui.define([
             this.storeChangedData();
             this._setDirtyState(false);
 
-            var pSave;
+            let pSave;
 
             if (this.aChangedParamsNames.length === 0) {
                 pSave = Promise.resolve();
             } else {
                 pSave = Container.getServiceAsync("ClientSideTargetResolution")
-                    .then(function (oClientSideTargetResolution) {
+                    .then((oClientSideTargetResolution) => {
                         return oClientSideTargetResolution.getSystemContext(this.sLastSelectedKey);
-                    }.bind(this))
-                    .then(function (oSystemContext) {
-                        var aChangedParameterNames = this.aChangedParamsNames.sort();
+                    })
+                    .then((oSystemContext) => {
+                        const aChangedParameterNames = this.aChangedParamsNames.sort();
                         this.aChangedParamsNames = [];
                         return this._saveParameterValues(aChangedParameterNames, oSystemContext);
-                    }.bind(this));
+                    });
             }
 
             return pSave.then(this._resetSmartVariantManagement.bind(this))
@@ -766,13 +765,13 @@ sap.ui.define([
         },
 
         _saveParameterValues: function (aChangedParameterNames, oSystemContext) {
-            var aPromises = [];
+            const aPromises = [];
 
             // we change the effectively changed parameters, once, in alphabetic order
-            for (var i = 0; i < aChangedParameterNames.length; i++) {
-                var sParameterName = aChangedParameterNames[i];
-                var oValueObject = this.oModel.getProperty("/" + sParameterName + "/valueObject/");
-                var oOriginalValueObject = this.oOriginalParameters[sParameterName].valueObject;
+            for (let i = 0; i < aChangedParameterNames.length; i++) {
+                const sParameterName = aChangedParameterNames[i];
+                const oValueObject = this.oModel.getProperty(`/${sParameterName}/valueObject/`);
+                const oOriginalValueObject = this.oOriginalParameters[sParameterName].valueObject;
 
                 if (!fnDeepEqual(oOriginalValueObject, oValueObject)) {
                     // as the editor does not distinguish empty string from deletion, and has no "reset" button
@@ -789,7 +788,7 @@ sap.ui.define([
                         oValueObject.extendedValue = undefined;
                     }
 
-                    var oSetValuePromise = this._saveParameterValue(sParameterName, oValueObject, oOriginalValueObject, oSystemContext);
+                    const oSetValuePromise = this._saveParameterValue(sParameterName, oValueObject, oOriginalValueObject, oSystemContext);
                     aPromises.push(oSetValuePromise);
                 }
             }
@@ -819,7 +818,7 @@ sap.ui.define([
          */
         _setDefaultVariant: function () {
             if (!this._bIsSupportedPlatform) { return; }
-            var oSmartVariantManagement = this.getView().byId("defaultSettingsVariantManagement");
+            const oSmartVariantManagement = this.getView().byId("defaultSettingsVariantManagement");
             oSmartVariantManagement.setCurrentVariantId(oSmartVariantManagement.getDefaultVariantKey());
             this._setSelectedVariant(oSmartVariantManagement.getDefaultVariantKey());
         },
@@ -845,14 +844,14 @@ sap.ui.define([
          */
         _initializeSmartVariantManagement: function () {
             if (!this._bIsSupportedPlatform) { return Promise.resolve(); }
-            var oSmartVariantManagement = this.getView().byId("defaultSettingsVariantManagement");
-            var fnSetVariant = function () {
+            const oSmartVariantManagement = this.getView().byId("defaultSettingsVariantManagement");
+            const fnSetVariant = function () {
                 this._setSelectedVariant(oSmartVariantManagement.getSelectionKey());
             }.bind(this);
 
-            return new Promise(function (resolve) {
-                var oUserDefaultsForm = this.getView().byId("userDefaultsForm");
-                var oPersInfo = new PersonalizableInfo({
+            return new Promise((resolve) => {
+                const oUserDefaultsForm = this.getView().byId("userDefaultsForm");
+                const oPersInfo = new PersonalizableInfo({
                     type: "wrapper",
                     keyName: "persistencyKey",
                     dataSource: "none",
@@ -864,11 +863,11 @@ sap.ui.define([
                     .addPersonalizableControl(oPersInfo)
                     .attachSelect(fnSetVariant)
                     .attachAfterSave(fnSetVariant)
-                    .initialise(function () {
+                    .initialise(() => {
                         oSmartVariantManagement.setVisible(true);
                         resolve();
                     }, oUserDefaultsForm);
-            }.bind(this)).then(fnSetVariant);
+            }).then(fnSetVariant);
         },
 
         /**
@@ -878,7 +877,7 @@ sap.ui.define([
          * @private
          */
         _saveIsSupportedPlatform: function () {
-            var sPlatform = Container.getLogonSystem().getPlatform();
+            const sPlatform = Container.getLogonSystem().getPlatform();
             this._bIsSupportedPlatform = (sPlatform !== "cdm");
             return Promise.resolve(this._bIsSupportedPlatform);
         },
@@ -889,15 +888,15 @@ sap.ui.define([
          */
         displayDiffText: function () {
             if (!this._bIsSupportedPlatform) { return false; }
-            var oSmartVariantManagement = this.getView().byId("defaultSettingsVariantManagement");
-            var oUserDefaultsForm = this.getView().byId("userDefaultsForm");
-            var sStandardKey = oSmartVariantManagement.getStandardVariantKey();
-            var sSelectionKey = oSmartVariantManagement.getSelectionKey();
+            const oSmartVariantManagement = this.getView().byId("defaultSettingsVariantManagement");
+            const oUserDefaultsForm = this.getView().byId("userDefaultsForm");
+            const sStandardKey = oSmartVariantManagement.getStandardVariantKey();
+            const sSelectionKey = oSmartVariantManagement.getSelectionKey();
 
             if (sSelectionKey === sStandardKey) { return false; }
 
-            var oStandardContent = oSmartVariantManagement.getVariantContent(oUserDefaultsForm, sStandardKey);
-            var oVariantContent = oSmartVariantManagement.getVariantContent(oUserDefaultsForm, sSelectionKey);
+            const oStandardContent = oSmartVariantManagement.getVariantContent(oUserDefaultsForm, sStandardKey);
+            const oVariantContent = oSmartVariantManagement.getVariantContent(oUserDefaultsForm, sSelectionKey);
 
             // workaround to get a deepEqual === true
             delete oVariantContent.executeOnSelection;