@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/components/shell/UserActionsMenu/UserActionsMenu.controller.js

@@ -20,7 +20,7 @@ sap.ui.define([
     "sap/ushell/ui/QuickAccess",
     "sap/ushell/state/ShellModel",
     "sap/ushell/state/StateManager"
-], function (
+], (
     Log,
     mobileLibrary,
     StandardListItem,
@@ -40,7 +40,7 @@ sap.ui.define([
     QuickAccess,
     ShellModel,
     StateManager
-) {
+) => {
     "use strict";
     // shortcut for sap.m.ListType
     const ListType = mobileLibrary.ListType;
@@ -72,13 +72,13 @@ sap.ui.define([
 
         onExit: function () {
             this._destroyDanglingControls();
-            this._aDoables.forEach(function (oDoable) {
+            this._aDoables.forEach((oDoable) => {
                 oDoable.off();
             });
             this._aDanglingControl = [];
             this._aDoables = [];
 
-            var oPopover = Element.getElementById("sapUshellUserActionsMenuPopover");
+            const oPopover = Element.getElementById("sapUshellUserActionsMenuPopover");
             if (oPopover) {
                 oPopover.destroy();
             }
@@ -99,7 +99,7 @@ sap.ui.define([
 
         filterUserActions: function (sActionId) {
             if (!Element.getElementById(sActionId)) {
-                Log.debug("Could not render ActionItem because it was not created: " + sActionId);
+                Log.debug(`Could not render ActionItem because it was not created: ${sActionId}`);
                 return false;
             } else if (sActionId === "logoutBtn") {
                 // if the avatar shall be displayed, we are using the UI5 web component which comes with its own logout button
@@ -115,9 +115,9 @@ sap.ui.define([
         },
 
         _createActionButtons: function (oConfig) {
-            var bEnableHelp = Config.last("/core/extension/enableHelp");
+            const bEnableHelp = Config.last("/core/extension/enableHelp");
 
-            var bEnableAbout = Config.last("/core/shell/enableAbout");
+            const bEnableAbout = Config.last("/core/shell/enableAbout");
             if (bEnableAbout) {
                 this._createAboutButton(bEnableHelp);
             }
@@ -126,8 +126,8 @@ sap.ui.define([
                 this._createAppFinderButton(oConfig, bEnableHelp);
             }
 
-            //in case the user setting button should move to the shell header, it was already created by header
-            //otherwise, create it as an actionItem for UserActionsMenu
+            // in case the user setting button should move to the shell header, it was already created by header
+            // otherwise, create it as an actionItem for UserActionsMenu
             if (!oConfig.moveUserSettingsActionToShellHeader) {
                 this._createSettingsButton(bEnableHelp);
             }
@@ -152,14 +152,14 @@ sap.ui.define([
                 return;
             }
 
-            var oOpenCatalogItem = new ActionItem("openCatalogBtn", {
+            const oOpenCatalogItem = new ActionItem("openCatalogBtn", {
                 text: ushellResources.i18n.getText("open_appFinderBtn"),
                 icon: "sap-icon://sys-find",
                 visible: !oConfig.disableAppFinder,
                 actionType: "action",
                 press: function () {
                     Measurement.start("FLP:AppFinderLoadingStartToEnd", "AppFinderLoadingStartToEnd", "FLP");
-                    Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                    Container.getServiceAsync("Navigation").then((oNavigationService) => {
                         oNavigationService.navigate({ target: { semanticObject: "Shell", action: "appfinder" } });
                     });
                 }
@@ -173,11 +173,11 @@ sap.ui.define([
         },
 
         _createAboutButton: function (bEnableHelp) {
-            var sId = "aboutBtn";
+            const sId = "aboutBtn";
             if (!Element.getElementById(sId)) {
-                var oAboutButton = new AboutButton(sId);
+                const oAboutButton = new AboutButton(sId);
                 if (bEnableHelp) {
-                    oAboutButton.addStyleClass("help-id-" + sId); // xRay help ID
+                    oAboutButton.addStyleClass(`help-id-${sId}`); // xRay help ID
                 }
                 this._addDanglingControl(oAboutButton);
                 this.getRenderer().showActionButton(sId, false);
@@ -185,10 +185,10 @@ sap.ui.define([
         },
 
         _createSettingsButton: function (bEnableHelp) {
-            var sId = "userSettingsBtn";
+            const sId = "userSettingsBtn";
             if (!Element.getElementById(sId)) {
-                var oUserPrefButton = new ActionItem(sId, {
-                    tooltip: ushellResources.i18n.getText("ControlKey") + " + " + ushellResources.i18n.getText("CommaKey"),
+                const oUserPrefButton = new ActionItem(sId, {
+                    tooltip: `${ushellResources.i18n.getText("ControlKey")} + ${ushellResources.i18n.getText("CommaKey")}`,
                     text: ushellResources.i18n.getText("userSettings"),
                     icon: "sap-icon://action-settings",
                     press: function () {
@@ -206,13 +206,13 @@ sap.ui.define([
         },
 
         _createSupportTicketButton: function (bEnableHelp) {
-            //Create button on demand
-            Config.on("/core/extension/SupportTicket").do(function (bConfigured) {
+            // Create button on demand
+            Config.on("/core/extension/SupportTicket").do((bConfigured) => {
                 // 1) false and no button : do nothing
                 // 2) false and the button exists: probably visible, set visibility to false
                 // 3) true: create the button and set visibility to true
-                var sId = "ContactSupportBtn";
-                var oContactSupport = Element.getElementById(sId);
+                const sId = "ContactSupportBtn";
+                let oContactSupport = Element.getElementById(sId);
                 if (bConfigured && !oContactSupport) {
                     oContactSupport = new ContactSupportButton(sId);
                     this._addDanglingControl(oContactSupport);
@@ -225,15 +225,15 @@ sap.ui.define([
                 } else {
                     this.getRenderer().hideActionButton(sId);
                 }
-            }.bind(this));
+            });
         },
 
         _createRecentActivitiesButton: function () {
-            var sId = "recentActivitiesBtn";
+            const sId = "recentActivitiesBtn";
 
-            Config.on("/core/shell/model/enableTrackingActivity").do(function (bEnableTrackingActivity) {
+            Config.on("/core/shell/model/enableTrackingActivity").do((bEnableTrackingActivity) => {
                 if (bEnableTrackingActivity) {
-                    var oRecentActivitiesBtn = Element.getElementById(sId);
+                    let oRecentActivitiesBtn = Element.getElementById(sId);
                     if (!oRecentActivitiesBtn) {
                         oRecentActivitiesBtn = new ActionItem(sId, {
                             text: ushellResources.i18n.getText("recentActivities"),
@@ -248,15 +248,15 @@ sap.ui.define([
                 } else {
                     this.getRenderer().hideActionButton(sId, false);
                 }
-            }.bind(this));
+            });
         },
 
         _createFrequentActivitiesButton: function () {
-            var sId = "frequentActivitiesBtn";
+            const sId = "frequentActivitiesBtn";
 
-            Config.on("/core/shell/model/enableTrackingActivity").do(function (bEnableTrackingActivity) {
+            Config.on("/core/shell/model/enableTrackingActivity").do((bEnableTrackingActivity) => {
                 if (bEnableTrackingActivity) {
-                    var oFrequentActivitiesBtn = Element.getElementById(sId);
+                    let oFrequentActivitiesBtn = Element.getElementById(sId);
                     if (!oFrequentActivitiesBtn) {
                         oFrequentActivitiesBtn = new ActionItem(sId, {
                             text: ushellResources.i18n.getText("frequentActivities"),
@@ -272,15 +272,15 @@ sap.ui.define([
                 } else {
                     this.getRenderer().hideActionButton(sId, false);
                 }
-            }.bind(this));
+            });
         },
 
         _createLogoutButton: function () {
-            var sId = "logoutBtn";
+            const sId = "logoutBtn";
             if (Element.getElementById(sId)) {
                 return;
             }
-            var oLogoutBtn = new ActionItem(sId, {
+            const oLogoutBtn = new ActionItem(sId, {
                 visible: true,
                 type: ButtonType.Transparent,
                 icon: "sap-icon://log",
@@ -293,12 +293,12 @@ sap.ui.define([
 
         logout: function () {
             sap.ui.require(["sap/m/MessageBox", "sap/ushell/ui/launchpad/LoadingDialog"],
-                function (MessageBox, LoadingDialog) {
-                    var oLoading = new LoadingDialog({ text: "" });
-                    var bShowLoadingScreen = true;
-                    var bIsLoadingScreenShown = false;
+                (MessageBox, LoadingDialog) => {
+                    let oLoading = new LoadingDialog({ text: "" });
+                    let bShowLoadingScreen = true;
+                    let bIsLoadingScreenShown = false;
 
-                    Container.getGlobalDirty().done(function (dirtyState) {
+                    Container.getGlobalDirty().done((dirtyState) => {
                         bShowLoadingScreen = false;
                         if (bIsLoadingScreenShown === true) {
                             oLoading.exit();
@@ -306,7 +306,7 @@ sap.ui.define([
                         }
 
                         const oLogoutDetails = {};
-                        var oResourceBundle = ushellResources.i18n;
+                        const oResourceBundle = ushellResources.i18n;
 
                         if (dirtyState === Container.DirtyState.DIRTY) {
                             // show warning only if it is sure that there are unsaved changes
@@ -322,7 +322,7 @@ sap.ui.define([
 
                         MessageBox.show(oLogoutDetails.message, oLogoutDetails.icon,
                             oLogoutDetails.messageTitle, [MessageBox.Action.OK, MessageBox.Action.CANCEL],
-                            function (oAction) {
+                            (oAction) => {
                                 if (oAction === MessageBox.Action.OK) {
                                     oLoading.openLoadingScreen();
                                     oLoading.showAppInfo(ushellResources.i18n.getText("beforeLogoutMsg"), null);
@@ -344,7 +344,7 @@ sap.ui.define([
 
         _destroyDanglingControls: function () {
             if (this._aDanglingControl) {
-                this._aDanglingControl.forEach(function (oControl) {
+                this._aDanglingControl.forEach((oControl) => {
                     if (oControl.destroyContent) {
                         oControl.destroyContent();
                     }
@@ -361,7 +361,7 @@ sap.ui.define([
          */
         _toggleUserActionsMenuPopover: async function (bShow) {
             let sFragmentName;
-            var pUserMenuItemLoaded = new Promise((resolve) => {
+            const pUserMenuItemLoaded = new Promise((resolve) => {
                 if (this.getDisplayAvatar()) {
                     sFragmentName = "sap.ushell.components.shell.UserActionsMenu.UserActionsMenu";
 
@@ -411,7 +411,6 @@ sap.ui.define([
                 oActionItem.firePress();
                 EventHub.emit("showUserActionsMenu", false);
             }
-
         },
 
         /**
@@ -422,18 +421,18 @@ sap.ui.define([
          * @returns {sap.ushell.gen.ui5.webcomponents-fiori.dist.UserMenuItem} User Menu Item
          */
         userActionsMenuItemFactory: function (sId, oContext) {
-            var oActionItem = Element.getElementById(oContext.getObject());
+            const oActionItem = Element.getElementById(oContext.getObject());
 
             // This module was already asynchronously loaded when the fragment was loaded. This factory is referenced in the fragment,
             // hence we can synchronously access the user menu item.
             const UserMenuItem = sap.ui.require("sap/ushell/gen/ui5/webcomponents-fiori/dist/UserMenuItem");
             return new UserMenuItem({
-                id: sId + "-" + oActionItem.getId(),
+                id: `${sId}-${oActionItem.getId()}`,
                 icon: oActionItem.getIcon(),
                 text: oActionItem.getText(),
                 tooltip: oActionItem.getTooltip(),
                 visible: oActionItem.getVisible(),
-                customData: [{ //used for opa test
+                customData: [{ // used for opa test
                     key: "actionItemId",
                     value: oActionItem.getId()
                 }]
@@ -448,17 +447,17 @@ sap.ui.define([
          * @returns {sap.m.StandardListItem} User Menu Item
          */
         userActionsMenuPopoverItemFactory: function (sId, oContext) {
-            var oActionItem = Element.getElementById(oContext.getObject());
+            const oActionItem = Element.getElementById(oContext.getObject());
 
             return new StandardListItem({
-                id: sId + "-" + oActionItem.getId(),
+                id: `${sId}-${oActionItem.getId()}`,
                 icon: oActionItem.getIcon(),
                 tooltip: oActionItem.getTooltip(),
                 iconInset: true,
                 title: oActionItem.getText(),
                 visible: oActionItem.getVisible(),
                 type: ListType.Active,
-                customData: [{ //used for opa test
+                customData: [{ // used for opa test
                     key: "actionItemId",
                     value: oActionItem.getId()
                 }],

package/src/main/js/sap/ushell/components/shell/UserImage/Component.js

@@ -13,7 +13,7 @@ sap.ui.define([
     "sap/ushell/resources",
     "sap/ushell/Container",
     "sap/ushell/state/ShellModel"
-], function (
+], (
     logger,
     Localization,
     isEmptyObject,
@@ -26,10 +26,10 @@ sap.ui.define([
     resources,
     Container,
     ShellModel
-) {
+) => {
     "use strict";
 
-    var ButtonType = coreLibrary.ButtonType;
+    const ButtonType = coreLibrary.ButtonType;
     /**
      * TODO: This entire thing does not need to have a UI Component as it has no own UI representation.
      * User Image is part of Shell Header and ME area
@@ -39,7 +39,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserImage.Component", {
 
         metadata: {
-            version: "1.138.1",
+            version: "1.139.0",
             library: "sap.ushell.components.shell.UserImage",
             dependencies: {
                 libs: {
@@ -52,20 +52,20 @@ sap.ui.define([
         },
 
         createContent: function () {
-            var oShellConfig = Container.getRendererInternal("fiori2").getShellConfig();
+            const oShellConfig = Container.getRendererInternal("fiori2").getShellConfig();
             this.loadUserImage();
-            var oUser = Container.getUser();
+            const oUser = Container.getUser();
             if (oShellConfig.enableUserImgConsent === true && oUser.getImageConsent() === undefined) {
                 this._showUserConsentPopup();
             }
         },
 
         _showUserConsentPopup: function () {
-            var that = this;
-            var sTextAlign = Localization.getRTL() ? "Right" : "Left";
-            var dialog, fboxUserConsentItem1, fboxUserConsentItem2, fboxUserConsentItem3;
+            const that = this;
+            const sTextAlign = Localization.getRTL() ? "Right" : "Left";
+            let dialog; let fboxUserConsentItem1; let fboxUserConsentItem2; let fboxUserConsentItem3;
 
-            var yesButton = new Button("yesButton", {
+            const yesButton = new Button("yesButton", {
                 text: resources.i18n.getText("DisplayImg"),
                 type: ButtonType.Emphasized,
                 press: function () {
@@ -73,7 +73,7 @@ sap.ui.define([
                     dialog.close();
                 }
             });
-            var noButton = new Button("noButton", {
+            const noButton = new Button("noButton", {
                 text: resources.i18n.getText("DontDisplayImg"),
                 press: function () {
                     that.updateUserImage(false);
@@ -86,13 +86,13 @@ sap.ui.define([
                 "sap/m/Text",
                 "sap/m/Link",
                 "sap/m/FlexBox"
-            ], function (
+            ], (
                 VerticalLayout,
                 Dialog,
                 Text,
                 Link,
                 FlexBox
-            ) {
+            ) => {
                 dialog = new Dialog("userConsentDialog", {
                     title: resources.i18n.getText("userImageConsentDialogTitle"),
                     modal: true,
@@ -103,20 +103,20 @@ sap.ui.define([
                     }
                 }).addStyleClass("sapUshellUserConsentDialog").addStyleClass("sapContrastPlus");
 
-                var useOfTermsText = new Text({
+                const useOfTermsText = new Text({
                     text: resources.i18n.getText("userImageConsentDialogTermsOfUse")
                 }).addStyleClass("sapUshellUserConsentDialogTerms");
 
-                var consentText = new Text({
+                const consentText = new Text({
                     text: resources.i18n.getText("userImageConsentText"),
                     textAlign: sTextAlign
                 }).addStyleClass("sapUshellUserConsentDialogText");
 
-                var useOfTermsLink = new Link({
+                const useOfTermsLink = new Link({
                     text: resources.i18n.getText("userImageConsentDialogShowTermsOfUse"),
                     textAlign: sTextAlign,
                     press: function () {
-                        var isTermsOfUseVisilble = fboxUserConsentItem3.getVisible();
+                        const isTermsOfUseVisilble = fboxUserConsentItem3.getVisible();
                         if (isTermsOfUseVisilble) {
                             fboxUserConsentItem3.setVisible(false);
                             useOfTermsLink.setText(resources.i18n.getText("userImageConsentDialogShowTermsOfUse"));
@@ -151,7 +151,7 @@ sap.ui.define([
                     ]
                 }).addStyleClass("ushellUserImgConsentTermsOfUseFlexBox");
                 fboxUserConsentItem3.setVisible(false);
-                var layout = new VerticalLayout("userConsentDialogLayout", {
+                const layout = new VerticalLayout("userConsentDialogLayout", {
                     content: [fboxUserConsentItem1, fboxUserConsentItem2, fboxUserConsentItem3]
                 });
 
@@ -161,8 +161,8 @@ sap.ui.define([
         },
 
         loadUserImage: function () {
-            var oUser = Container.getUser(),
-                imageURI = oUser.getImage();
+            const oUser = Container.getUser();
+            const imageURI = oUser.getImage();
 
             if (imageURI) {
                 this._setUserImage(imageURI);
@@ -172,13 +172,13 @@ sap.ui.define([
 
         // Changing the property of userImage in the model, which is bound to the userActionsMenuHeaderButton
         _setUserImage: function (param) {
-            var sUrl = typeof param === "string" ? param : param.mParameters;
+            const sUrl = typeof param === "string" ? param : param.mParameters;
 
             if (sUrl && typeof sUrl === "string" || !isEmptyObject(sUrl)) {
                 // Using jQuery.ajax instead of jQuery.get in-order to be able to control the caching.
                 jQuery.ajax({
                     url: sUrl,
-                    //"cache: false" didn't work as expected hence, turning off the cache vie explicit headers.
+                    // "cache: false" didn't work as expected hence, turning off the cache vie explicit headers.
                     headers: {
                         "Cache-Control": "no-cache, no-store, must-revalidate",
                         Pragma: "no-cache",
@@ -190,7 +190,7 @@ sap.ui.define([
                         ShellModel.getConfigModel().setProperty("/userImage/account", sUrl);
                     },
                     error: function () {
-                        logger.error("Could not load user image from: " + sUrl, "", "sap.ushell.renderer.Shell.view");
+                        logger.error(`Could not load user image from: ${sUrl}`, "", "sap.ushell.renderer.Shell.view");
                         Container.getUser().setImage("");
                     }
                 });
@@ -198,25 +198,22 @@ sap.ui.define([
                 ShellModel.getConfigModel().setProperty("/userImage/personPlaceHolder", null);
                 ShellModel.getConfigModel().setProperty("/userImage/account", IconPool.getIconURI("account"));
             }
-
-
         },
 
         updateUserImage: function (isImageConsent) {
-            var oUser = Container.getUser(),
-                oUserPreferencesPromise;
+            const oUser = Container.getUser();
+            let oUserPreferencesPromise;
 
             Container.getServiceAsync("UserInfo")
-                .then(function (UserInfo) {
+                .then((UserInfo) => {
                     if (isImageConsent !== undefined) {
                         oUser.setImageConsent(isImageConsent);
                         oUserPreferencesPromise = UserInfo.updateUserPreferences(oUser);
-                        oUserPreferencesPromise.done(function () {
+                        oUserPreferencesPromise.done(() => {
                             oUser.resetChangedProperty("isImageConsent");
                         });
                     }
                 });
-
         }
     });
 });