@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -11,7 +11,7 @@ sap.ui.define([
     "sap/ushell/utils",
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/Container"
-], function (
+], (
     Controller,
     JSONModel,
     Log,
@@ -22,51 +22,51 @@ sap.ui.define([
     ushellUtils,
     windowUtils,
     Container
-) {
+) => {
     "use strict";
 
     return Controller.extend("sap.ushell.components.shell.Settings.userAccount.UserAccountSelector", {
         onInit: function () {
-            var oShellConfig = Container.getRendererInternal("fiori2").getShellConfig(),
-                bEnableUserImgConsent = oShellConfig.enableUserImgConsent;
-            //determines whether the User Image consent feature is enabled
+            const oShellConfig = Container.getRendererInternal("fiori2").getShellConfig();
+            const bEnableUserImgConsent = oShellConfig.enableUserImgConsent;
+            // determines whether the User Image consent feature is enabled
             this.imgConsentEnabled = bEnableUserImgConsent || false;
             this.oUser = Container.getUser();
 
-            var oConfigModel = this.getConfigurationModel();
+            const oConfigModel = this.getConfigurationModel();
             this.getView().setModel(resources.i18nModel, "i18n");
             this.getView().setModel(oConfigModel, "config");
 
-            this.oUser.attachOnSetImage(function () {
+            this.oUser.attachOnSetImage(() => {
                 oConfigModel.setProperty("/icon", Config.last("/core/shell/model/userImage/personPlaceHolder"));
             });
 
             Container.getServiceAsync("PersonalizationV2")
-                .then(function (oPersonalizationService) {
+                .then((oPersonalizationService) => {
                     return oPersonalizationService.isResetEntirePersonalizationSupported()
-                        .then(function (bIsResetPersonalizationSupported) {
+                        .then((bIsResetPersonalizationSupported) => {
                             if (!bIsResetPersonalizationSupported) {
                                 oConfigModel.setProperty("/isResetPersonalizationVisible", false);
                             }
                         });
                 })
-                .catch(function (oError) {
-                    Log.error("The personalization service could not be loaded because of: ." + oError.toString());
+                .catch((oError) => {
+                    Log.error(`The personalization service could not be loaded because of: .${oError.toString()}`);
                 });
         },
 
         getConfigurationModel: function () {
-            var oModel = new JSONModel({}),
-                oUser = Container.getUser(),
-                sIcon = Config.last("/core/shell/model/userImage/personPlaceHolder") || "sap-icon://person-placeholder";
+            const oModel = new JSONModel({});
+            const oUser = Container.getUser();
+            const sIcon = Config.last("/core/shell/model/userImage/personPlaceHolder") || "sap-icon://person-placeholder";
             oModel.setData({
                 icon: sIcon,
                 name: oUser.getFullName(),
                 id: oUser.getId(),
                 mail: oUser.getEmail(),
                 server: window.location.host,
-                imgConsentEnabled: this.imgConsentEnabled, //to show second tab
-                isImageConsentForUser: oUser.getImageConsent(), //CheckBox state
+                imgConsentEnabled: this.imgConsentEnabled, // to show second tab
+                isImageConsentForUser: oUser.getImageConsent(), // CheckBox state
                 isResetPersonalizationVisible: this.isResetPersonalizationVisible || true,
                 displayUserId: Config.last("/core/userSettings/displayUserId")
             });
@@ -87,23 +87,23 @@ sap.ui.define([
         },
 
         onSaveUserImgConsent: function (fnUpdateUserPreferences) {
-            var oUser = this.oUser,
-                bOrigUserImgConsent = oUser.getImageConsent(),
-                oModel = this.getView().getModel("config"),
-                bCurrentUserImgConsent = oModel.getProperty("/isImageConsentForUser"),
-                oUserPreferencesPromise;
-                Log.debug("[000] onSaveUserImgConsent:current", bCurrentUserImgConsent, "UserAccountSelector.controller");
-                Log.debug("[000] onSaveUserImgConsent:original", bOrigUserImgConsent, "UserAccountSelector.controller");
-            if (bOrigUserImgConsent !== bCurrentUserImgConsent) { //only if there was a change we would like to save it
+            const oUser = this.oUser;
+            const bOrigUserImgConsent = oUser.getImageConsent();
+            const oModel = this.getView().getModel("config");
+            const bCurrentUserImgConsent = oModel.getProperty("/isImageConsentForUser");
+            let oUserPreferencesPromise;
+            Log.debug("[000] onSaveUserImgConsent:current", bCurrentUserImgConsent, "UserAccountSelector.controller");
+            Log.debug("[000] onSaveUserImgConsent:original", bOrigUserImgConsent, "UserAccountSelector.controller");
+            if (bOrigUserImgConsent !== bCurrentUserImgConsent) { // only if there was a change we would like to save it
                 // set the user's image consent
                 oUser.setImageConsent(bCurrentUserImgConsent);
-                return new Promise(function (resolve, reject) {
+                return new Promise((resolve, reject) => {
                     oUserPreferencesPromise = fnUpdateUserPreferences();
-                    oUserPreferencesPromise.then(function () {
+                    oUserPreferencesPromise.then(() => {
                         oUser.resetChangedProperty("isImageConsent");
                         resolve();
                     });
-                    oUserPreferencesPromise.catch(function (sErrorMessage) {
+                    oUserPreferencesPromise.catch((sErrorMessage) => {
                         if (!sErrorMessage.includes("ISIMAGECONSENT")) {
                             oUser.resetChangedProperty("isImageConsent");
                             resolve();
@@ -117,20 +117,18 @@ sap.ui.define([
                         }
                     });
                 });
-
             }
             return Promise.resolve();
         },
 
         termsOfUserPress: function () {
-            var termsOfUseTextBox = this.getView().byId("termsOfUseTextFlexBox"),
-                termsOfUseLink = this.getView().byId("termsOfUseLink"),
-                isTermsOfUseVisible = termsOfUseTextBox.getVisible();
+            const termsOfUseTextBox = this.getView().byId("termsOfUseTextFlexBox");
+            const termsOfUseLink = this.getView().byId("termsOfUseLink");
+            const isTermsOfUseVisible = termsOfUseTextBox.getVisible();
 
             termsOfUseTextBox.setVisible(!isTermsOfUseVisible);
             termsOfUseLink.setText(resources.i18n.getText(isTermsOfUseVisible ? "userImageConsentDialogShowTermsOfUse"
                 : "userImageConsentDialogHideTermsOfUse"));
-
         },
 
         showMessageBoxWarningDeletePersonalization: function () {
@@ -145,19 +143,19 @@ sap.ui.define([
             if (sAction === MessageBox.Action.OK) {
                 this.getView().setBusy(true);
                 Container.getServiceAsync("PersonalizationV2")
-                    .then(function (oPersonalizationService) {
+                    .then((oPersonalizationService) => {
                         return oPersonalizationService.resetEntirePersonalization()
-                            .then(function () {
+                            .then(() => {
                                 MessageToast.show(resources.i18n.getText("userAccountResetPersonalizationWarningDialogSuccessToast"), {
                                     onClose: windowUtils.refreshBrowser
                                 });
                             })
                             .catch(this.showErrorMessageBox.bind(this));
-                    }.bind(this))
+                    })
                     .catch(this.showErrorMessageBox.bind(this))
-                    .finally(function () {
+                    .finally(() => {
                         this.getView().setBusy(false);
-                    }.bind(this));
+                    });
             }
         },
 

package/src/main/js/sap/ushell/components/shell/Settings/userActivities/UserActivitiesEntry.js

@@ -4,17 +4,17 @@ sap.ui.define([
     "sap/ui/core/mvc/XMLView",
     "sap/base/Log",
     "sap/ushell/resources"
-], function (
+], (
     XMLView,
     Log,
     resources
-) {
+) => {
     "use strict";
 
     function getEntry () {
-        var sViewId = "userActivitiesSetting",
-            sComponentNamespace = "sap.ushell.components.shell.Settings.userActivities.UserActivitiesSetting",
-            oViewInstance;
+        const sViewId = "userActivitiesSetting";
+        const sComponentNamespace = "sap.ushell.components.shell.Settings.userActivities.UserActivitiesSetting";
+        let oViewInstance;
 
         return {
             id: "userActivitiesEntry",
@@ -32,7 +32,7 @@ sap.ui.define([
                 return XMLView.create({
                     id: sViewId,
                     viewName: sComponentNamespace
-                }).then(function (oView) {
+                }).then((oView) => {
                     oViewInstance = oView;
                     return oView;
                 });
@@ -61,5 +61,4 @@ sap.ui.define([
     return {
         getEntry: getEntry
     };
-
 });

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

@@ -8,7 +8,7 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell/resources",
     "sap/ushell/Container"
-], function (
+], (
     Controller,
     JSONModel,
     SharedComponentUtils,
@@ -16,12 +16,12 @@ sap.ui.define([
     Log,
     resources,
     Container
-) {
+) => {
     "use strict";
 
     return Controller.extend("sap.ushell.components.shell.Settings.userActivities.UserActivitiesSetting", {
         onInit: function () {
-            var bTrackingEnabled = Config.last("/core/shell/model/enableTrackingActivity") !== undefined ?
+            const bTrackingEnabled = Config.last("/core/shell/model/enableTrackingActivity") !== undefined ?
                 Config.last("/core/shell/model/enableTrackingActivity") :
                 true;
             this.oModel = new JSONModel({checkboxIsChecked: bTrackingEnabled});
@@ -35,7 +35,7 @@ sap.ui.define([
          * @private
          */
         onCancel: function () {
-            var bTrackingEnabled = Config.last("/core/shell/model/enableTrackingActivity") !== undefined ?
+            const bTrackingEnabled = Config.last("/core/shell/model/enableTrackingActivity") !== undefined ?
                 Config.last("/core/shell/model/enableTrackingActivity") :
                 true;
             this.oModel.setProperty("/checkboxIsChecked", bTrackingEnabled);
@@ -63,20 +63,19 @@ sap.ui.define([
          */
         _setTrackingToEnabled: function (enabled) {
             return SharedComponentUtils.getPersonalizer("userActivitesTracking", Container.getRendererInternal("fiori2"))
-                .then(function (oPersonalizer) {
+                .then((oPersonalizer) => {
                     return oPersonalizer.setPersData(enabled);
                 })
-                .then(function () {
+                .then(() => {
                     Config.emit("/core/shell/model/enableTrackingActivity", enabled);
                 })
-                .catch(function (error) {
+                .catch((error) => {
                     // Log failure if occurs.
                     Log.error(
                         "Failed to save the user activities tracking in personalization", error,
                         "sap.ushell.components.ushell.settings.userActivities.UserActivitiesSetting");
                     return Promise.reject(error);
                 });
-
         },
 
         /**

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

@@ -3,10 +3,10 @@
 sap.ui.define([
     "sap/ui/core/mvc/XMLView",
     "sap/ui/core/UIComponent"
-], function (
+], (
     XMLView,
     UIComponent
-) {
+) => {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.Settings.userDefaults.Component", {

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

@@ -5,29 +5,29 @@ sap.ui.define([
     "sap/ui/core/ComponentContainer",
     "sap/ushell/resources",
     "sap/ushell/Container"
-], function (
+], (
     Log,
     ComponentContainer,
     resources,
     Container
-) {
+) => {
     "use strict";
 
     return {
         getEntry: function () {
-            var oContainer;
+            let oContainer;
             return {
                 id: "userDefaultEntry", // defaultParametersSelector
                 entryHelpID: "defaultParameters",
                 title: resources.i18n.getText("defaultsValuesEntry"),
                 valueArgument: function () {
-                    var oUserDefaultParametersServicePromise = Container.getServiceAsync("UserDefaultParameters");
-                    var oCSTRServicePromise = Container.getServiceAsync("ClientSideTargetResolution");
-                    var oContentProviderIdPromise = Container.getServiceAsync("CommonDataModel")
-                        .then(function (oCdmService) {
+                    const oUserDefaultParametersServicePromise = Container.getServiceAsync("UserDefaultParameters");
+                    const oCSTRServicePromise = Container.getServiceAsync("ClientSideTargetResolution");
+                    const oContentProviderIdPromise = Container.getServiceAsync("CommonDataModel")
+                        .then((oCdmService) => {
                             return oCdmService.getContentProviderIds();
                         })
-                        .catch(function () {
+                        .catch(() => {
                             return [""];
                         });
 
@@ -36,29 +36,29 @@ sap.ui.define([
                         oCSTRServicePromise,
                         oContentProviderIdPromise
                     ])
-                        .then(function (aResult) {
-                            var oUserDefaultParametersService = aResult[0];
-                            var oCSTRService = aResult[1];
-                            var aContentProviderIds = aResult[2].length > 0 ? aResult[2] : [""];
+                        .then((aResult) => {
+                            const oUserDefaultParametersService = aResult[0];
+                            const oCSTRService = aResult[1];
+                            const aContentProviderIds = aResult[2].length > 0 ? aResult[2] : [""];
 
                             return Promise.all(
-                                aContentProviderIds.map(function (sContentProviderId) {
+                                aContentProviderIds.map((sContentProviderId) => {
                                     return oCSTRService.getSystemContext(sContentProviderId)
-                                        .then(function (oSystemContext) {
+                                        .then((oSystemContext) => {
                                             return oUserDefaultParametersService.hasRelevantMaintainableParameters(oSystemContext);
                                         });
                                 })
                             );
                         })
                         // as a result we get an array of true, false (and undefined in case hasRelevantMaintainableParameters fails)
-                        .then(function (aResults) {
+                        .then((aResults) => {
                             return {
                                 value: aResults.includes(true)
                             };
                         });
                 },
                 contentFunc: function () {
-                    return new Promise(function (resolve, reject) {
+                    return new Promise((resolve, reject) => {
                         oContainer = new ComponentContainer("defaultParametersSelector", {
                             name: "sap.ushell.components.shell.Settings.userDefaults",
                             manifest: true,

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

@@ -5,20 +5,20 @@ sap.ui.define([
     "sap/ui/comp/smartform/ColumnLayout",
     "sap/ui/comp/smartform/SmartForm",
     "sap/ui/core/Control"
-], function (
+], (
     fnDeepExtend,
     ColumnLayout,
     SmartForm,
     Control
-) {
+) => {
     "use strict";
 
-    var aAllowedFields = [
+    const aAllowedFields = [
         "sap.ui.comp.smartfield.SmartField",
         "sap.m.Input"
     ];
 
-    var UserDefaultsForm = Control.extend("sap.ushell.components.shell.Settings.userDefaults.UserDefaultsForm", {
+    const UserDefaultsForm = Control.extend("sap.ushell.components.shell.Settings.userDefaults.UserDefaultsForm", {
         metadata: {
             properties: {
                 /**
@@ -74,13 +74,13 @@ sap.ui.define([
      * @returns {object} An object with the parameter names as key and the current input values as values.
      */
     UserDefaultsForm.prototype.fetchVariant = function () {
-        var sInputName, oAdditionalValues;
-        var oModel = this.getAggregation("_smartForm").getModel("MdlParameter");
+        let sInputName; let oAdditionalValues;
+        const oModel = this.getAggregation("_smartForm").getModel("MdlParameter");
 
-        return this._getFieldControls().reduce(function (oCollectedControls, oCurrentFieldControl) {
+        return this._getFieldControls().reduce((oCollectedControls, oCurrentFieldControl) => {
             sInputName = oCurrentFieldControl.getName();
-            oCollectedControls[sInputName] = { value: oModel.getProperty("/" + sInputName + "/valueObject/value/") };
-            oAdditionalValues = oModel.getProperty("/" + sInputName + "/valueObject/extendedValue/");
+            oCollectedControls[sInputName] = { value: oModel.getProperty(`/${sInputName}/valueObject/value/`) };
+            oAdditionalValues = oModel.getProperty(`/${sInputName}/valueObject/extendedValue/`);
             if (oAdditionalValues) {
                 oCollectedControls[sInputName].additionalValues = oAdditionalValues;
             }
@@ -94,11 +94,11 @@ sap.ui.define([
      */
     UserDefaultsForm.prototype.applyVariant = function (oVariantData) {
         if (oVariantData) {
-            var oModel = this.getAggregation("_smartForm").getModel("MdlParameter"),
-            aUserDefaultInputs = this._getFieldControls(),
-            sInputName, oValueObject;
+            const oModel = this.getAggregation("_smartForm").getModel("MdlParameter");
+            const aUserDefaultInputs = this._getFieldControls();
+            let sInputName; let oValueObject;
 
-            for (var i = 0; i < aUserDefaultInputs.length; i++) {
+            for (let i = 0; i < aUserDefaultInputs.length; i++) {
                 sInputName = aUserDefaultInputs[i].getName();
                 if (oVariantData[sInputName] !== undefined) {
                     if (aUserDefaultInputs[i].getDataType && aUserDefaultInputs[i].getDataType() === "Edm.DateTime") {
@@ -106,12 +106,12 @@ sap.ui.define([
                     } else {
                         aUserDefaultInputs[i].setValue(oVariantData[sInputName].value);
                     }
-                    oValueObject = oModel.getProperty("/" + sInputName + "/valueObject/");
+                    oValueObject = oModel.getProperty(`/${sInputName}/valueObject/`);
                     oValueObject.extendedValue = undefined;
                     if (oVariantData[sInputName].additionalValues) {
                         oValueObject = fnDeepExtend(oValueObject, {extendedValue: oVariantData[sInputName].additionalValues});
                     }
-                    oModel.setProperty("/" + sInputName + "/valueObject", oValueObject);
+                    oModel.setProperty(`/${sInputName}/valueObject`, oValueObject);
                 }
             }
         }
@@ -123,8 +123,8 @@ sap.ui.define([
      * @private
      */
     UserDefaultsForm.prototype._getFieldControls = function () {
-        return this.getControlsByFieldGroupId("UserDefaults").filter(function (field) {
-            var sFieldName = field.getMetadata().getName();
+        return this.getControlsByFieldGroupId("UserDefaults").filter((field) => {
+            const sFieldName = field.getMetadata().getName();
             return aAllowedFields.indexOf(sFieldName) !== -1;
         });
     };

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

@@ -5,40 +5,40 @@ sap.ui.define([
     "sap/ui/comp/library",
     "sap/ui/model/json/JSONModel",
     "sap/ui/core/Fragment"
-], function (
+], (
     Token,
     compLibrary,
     JSONModel,
     Fragment
-) {
+) => {
     "use strict";
 
     // shortcut for sap.ui.comp.valuehelpdialog.ValueHelpRangeOperation
-    var ValueHelpRangeOperation = compLibrary.valuehelpdialog.ValueHelpRangeOperation;
+    const ValueHelpRangeOperation = compLibrary.valuehelpdialog.ValueHelpRangeOperation;
 
-    var ExtendedValueDialogController = function () {};
+    function ExtendedValueDialogController () {}
 
     ExtendedValueDialogController.prototype.openDialog = function (oRecord, fnOnSave) {
         Fragment.load({
             id: "ExtendedValueDialogFragment",
             name: "sap.ushell.components.shell.Settings.userDefaults.view.ExtendedValueDialog",
             controller: this
-        }).then(function (oValueHelpDialog) {
-            var sPathToTokens = "/" + oRecord.parameterName + "/valueObject/extendedValue/Ranges",
-                oExtendedModel = oRecord.modelBind.extendedModel,
-                aRanges = oExtendedModel.getProperty(sPathToTokens) || [],
-                sLabelText,
-                sNameSpace;
+        }).then((oValueHelpDialog) => {
+            const sPathToTokens = `/${oRecord.parameterName}/valueObject/extendedValue/Ranges`;
+            const oExtendedModel = oRecord.modelBind.extendedModel;
+            const aRanges = oExtendedModel.getProperty(sPathToTokens) || [];
+            let sLabelText;
+            let sNameSpace;
 
             if (oRecord.modelBind.isOdata) {
                 sNameSpace = this._getMetadataNameSpace(oRecord.editorMetadata.editorInfo.odataURL);
-                var oEntityType = oRecord.modelBind.model.getMetaModel().getODataEntityType(sNameSpace + "." + oRecord.editorMetadata.editorInfo.entityName);
+                const oEntityType = oRecord.modelBind.model.getMetaModel().getODataEntityType(`${sNameSpace}.${oRecord.editorMetadata.editorInfo.entityName}`);
                 if (oEntityType) {
                     sLabelText = oRecord.modelBind.model.getMetaModel().getODataProperty(oEntityType, oRecord.editorMetadata.editorInfo.propertyName)["sap:label"];
                 }
             }
 
-            var oModelData = {
+            const oModelData = {
                 label: oRecord.editorMetadata.displayText || sLabelText || oRecord.parameterName,
                 key: oRecord.modelBind.sPropertyName,
                 parameterName: oRecord.parameterName
@@ -51,12 +51,12 @@ sap.ui.define([
                 label: oModelData.label,
                 key: oRecord.parameterName
             }]);
-            oValueHelpDialog.attachOk(function (oEvent) {
+            oValueHelpDialog.attachOk((oEvent) => {
                 fnOnSave(oEvent);
                 oEvent.getSource().close();
             });
             oValueHelpDialog.open();
-        }.bind(this));
+        });
     };
 
     ExtendedValueDialogController.prototype.closeValueHelp = function (oControlEvent) {
@@ -68,24 +68,22 @@ sap.ui.define([
     };
 
     ExtendedValueDialogController.prototype._getMetadataNameSpace = function (sServiceUrl) {
-        var aSplit = sServiceUrl.split("/"),
-            sNamespace;
-        sNamespace = aSplit[aSplit.length - 1];
-        return sNamespace;
+        const aSplit = sServiceUrl.split("/");
+        return aSplit[aSplit.length - 1];
     };
 
     ExtendedValueDialogController.prototype.getListOfSupportedRangeOperations = function () {
         // there is no representation of StartsWith and EndsWith on ABAP so applications won't be able to get these operations
-        var aSupportedOps = Object.keys(ValueHelpRangeOperation);
-        return aSupportedOps.filter(function (operation) {
+        const aSupportedOps = Object.keys(ValueHelpRangeOperation);
+        return aSupportedOps.filter((operation) => {
             return operation !== "StartsWith" && operation !== "EndsWith" && operation !== "Initial";
         });
     };
 
     ExtendedValueDialogController.prototype.getTokensToValueHelpDialog = function (aRanges, sParameterName) {
-        var aTokens = [],
-            oFormattedToken;
-        aRanges.forEach(function (oRange) {
+        const aTokens = [];
+        let oFormattedToken;
+        aRanges.forEach((oRange) => {
             if (oRange) {
                 // convert the Range format to the format that the value help dialog knows how to read
                 oFormattedToken = {};
@@ -101,5 +99,4 @@ sap.ui.define([
     };
 
     return new ExtendedValueDialogController();
-
 });