@sapui5/sap.ushell 1.115.1 → 1.117.0

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

@@ -4,6 +4,7 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ui/base/Object",
     "sap/ui/core/Component",
+    "sap/ui/core/Core",
     "sap/ui/core/library",
     "sap/ui/core/message/Message",
     "sap/ui/core/mvc/Controller",
@@ -20,6 +21,7 @@ sap.ui.define([
     Log,
     BaseObject,
     Component,
+    Core,
     coreLibrary,
     Message,
     Controller,
@@ -100,7 +102,7 @@ sap.ui.define([
             oView.setModel(this.getConfigurationModel(), "config");
 
             // listener
-            sap.ui.getCore().attachThemeChanged(this._handleThemeApplied, this);
+            Core.attachThemeChanged(this._handleThemeApplied, this);
 
             return this.getDarkModeModel(this.aThemeListFromServer)
                 .then(function (oDarkModeModel) {
@@ -117,7 +119,7 @@ sap.ui.define([
         },
 
         onExit: function () {
-            sap.ui.getCore().detachThemeChanged(this._handleThemeApplied, this);
+            Core.detachThemeChanged(this._handleThemeApplied, this);
         },
 
         // Return the ID of the currently selected theme in the theme list.
@@ -392,7 +394,7 @@ sap.ui.define([
         _onSaveContentDensitySuccess: function (sNewContentDensity) {
             var oUser = this.oUser;
             oUser.resetChangedProperty("contentDensity");
-            sap.ui.getCore().getEventBus().publish("launchpad", "toggleContentDensity", {
+            Core.getEventBus().publish("launchpad", "toggleContentDensity", {
                 contentDensity: sNewContentDensity
             });
             EventHub.emit("toggleContentDensity", {
@@ -446,10 +448,9 @@ sap.ui.define([
                         .done(function () {
                             Config.emit("/core/home/sizeBehavior", sNewSizeBehavior);
                             // todo move to other place?
-                            if (sNewSizeBehavior === "Responsive") {
-                                jQuery(".sapUshellTile").removeClass("sapUshellSmall");
-                            } else {
-                                jQuery(".sapUshellTile").addClass("sapUshellSmall");
+                            var aTiles = document.getElementsByClassName(".sapUshellTile");
+                            for (var i = 0; i < aTiles.length; i++) {
+                                aTiles[i].classList.toggle("sapUshellSmall", sNewSizeBehavior !== "Responsive");
                             }
                             resolve();
                         })

package/src/main/js/sap/ushell/components/shell/Settings/appearance/Appearance.view.xml

@@ -63,7 +63,11 @@
                             class="sapUshellFlpSettingsDescription" />
                     </VBox>
                 </HBox>
-                <HBox alignItems="Start" justifyContent="End" class="sapUshellAppearanceBox">
+                <HBox
+                    visible="{config>/contentDensityConfigurable}"
+                    alignItems="Start"
+                    justifyContent="End"
+                    class="sapUshellAppearanceBox">
                     <Label
                         labelFor="contentDensityCheckBox"
                         text="{i18n>AppearanceContentDensityLabel}"
@@ -71,10 +75,7 @@
                         width="auto"
                         textAlign="{config>/textAlign}" />
                     <VBox alignItems="Baseline" class="sapUshellAppearanceContentDensityText">
-                        <CheckBox
-                            id="contentDensityCheckBox"
-                            selected="{config>/isCozyContentMode}"
-                            enabled="{config>/contentDensityConfigurable}" />
+                        <CheckBox id="contentDensityCheckBox" selected="{config>/isCozyContentMode}" />
                         <Text text="{i18n>appearanceCompactCozyDescriptionText}" class="sapUshellFlpSettingsDescription" />
                     </VBox>
                 </HBox>

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

@@ -61,11 +61,13 @@ sap.ui.define([
             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
-                isResetPersonalizationVisible: this.isResetPersonalizationVisible || true
+                isResetPersonalizationVisible: this.isResetPersonalizationVisible || true,
+                displayUserId: Config.last("/core/userSettings/displayUserId")
             });
             return oModel;
         },

package/src/main/js/sap/ushell/components/shell/Settings/userAccount/UserAccountSetting.fragment.xml

@@ -8,6 +8,8 @@
         <form:SimpleForm editable="false" layout="ResponsiveGridLayout" labelSpanS="5" columnsM="7">
             <Label text="{i18n>UserAccountNameFld}" labelFor="userAccountuserName"/>
             <Text text="{config>/name}" id="userAccountuserName"/>
+            <Label text="{i18n>UserAccountIdFld}" labelFor="userAccountuserId" visible="{config>/displayUserId}"/>
+            <Text text="{config>/id}" id="userAccountuserId" visible="{config>/displayUserId}"/>
             <Label text="{i18n>UserAccountEmailFld}" labelFor="userAccountuserMail"/>
             <Text text="{config>/mail}" id="userAccountuserMail"/>
             <Label text="{i18n>UserAccountServerFld}" labelFor="userAccountuserServer"/>

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

@@ -92,7 +92,11 @@ sap.ui.define([
             for (var i = 0; i < aUserDefaultInputs.length; i++) {
                 sInputName = aUserDefaultInputs[i].getName();
                 if (oVariantData[sInputName] !== undefined) {
-                    aUserDefaultInputs[i].setValue(oVariantData[sInputName].value);
+                    if (aUserDefaultInputs[i].getDataType && aUserDefaultInputs[i].getDataType() === "Edm.DateTime") {
+                        aUserDefaultInputs[i].setValue(new Date(oVariantData[sInputName].value));
+                    } else {
+                        aUserDefaultInputs[i].setValue(oVariantData[sInputName].value);
+                    }
                     oValueObject = oModel.getProperty("/" + sInputName + "/valueObject/");
                     oValueObject.extendedValue = undefined;
                     if (oVariantData[sInputName].additionalValues) {

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

@@ -728,8 +728,26 @@ sap.ui.define([
                     var sParameterName = aDisplayedParameters[i].parameterName;
                     if (this.aChangedParamsNames.indexOf(sParameterName) > -1) {
                         var oOriginalParameter = this.oOriginalParameters[sParameterName];
-                        var oBoundModel = aDisplayedParameters[i].modelBind;
-                        oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, oOriginalParameter.valueObject.value || "");
+                        var oParameter = aDisplayedParameters[i];
+                        var oBoundModel = oParameter.modelBind;
+                        var 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; } });
+                            switch (oODataProp.type) {
+                                case "Edm.DateTime":
+                                        oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, new Date(oOriginalParameter.valueObject.value) || null);
+                                    break;
+                                default:
+                                    oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, oOriginalParameter.valueObject.value || "");
+                                    break;
+                            }
+                        } else {
+                            oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, oOriginalParameter.valueObject.value || "");
+                        }
+
                         if (oOriginalParameter.editorMetadata && oOriginalParameter.editorMetadata.extendedUsage) {
                             oBoundModel.extendedModel.setProperty("/" + sParameterName + "/valueObject/extendedValue",
                                 oOriginalParameter.valueObject.extendedValue || {});

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

@@ -168,6 +168,16 @@ sap.ui.define([
                 });
         },
 
+        _resetLanguage: function () {
+            var oUserLanguage = this.oUser.getLanguage(),
+                oModel = this.getView().getModel(),
+                oModelData = oModel.getData();
+            // if the user language isn't personalzied - need to return browser language in select
+            var sSelectedLanguage = oModelData.isLanguagePersonalized ? oUserLanguage : "default";
+            oModel.setProperty("/selectedLanguage", sSelectedLanguage);
+            //Date and time format are taken from current language
+            this._updateTextFields(oUserLanguage);
+        },
 
         onCancel: function () {
             var oModel = this.getView().getModel(),
@@ -175,12 +185,7 @@ sap.ui.define([
                 aLanguageList = oModelData.languageList,
                 isEnableSetLanguage = oModelData.isEnableSetLanguage;
             if (isEnableSetLanguage && aLanguageList) {
-                var oUserLanguage = this.oUser.getLanguage();
-                // if the user language isn't personalzied - need to return browser language in select
-                var sSelectedLanguage = oModelData.isLanguagePersonalized ? oUserLanguage : "default";
-                oModel.setProperty("/selectedLanguage", sSelectedLanguage);
-                //Date and time format are taken from current language
-                this._updateTextFields(oUserLanguage);
+                this._resetLanguage();
             }
             if (oModelData.isEnableUserProfileSetting) {
                 this._restoreUserSettingPreferenceValues();
@@ -214,7 +219,7 @@ sap.ui.define([
                 oModelData = this.getView().getModel().getData(),
                 sSelectedLanguage = oModelData.selectedLanguage,
                 sOriginLanguage = oUser.getLanguage(),
-                bLanguageChanged = sSelectedLanguage !== (oModelData.isLanguagePersonalized ? sOriginLanguage : "default"),
+                bLanguageChanged = sSelectedLanguage && sSelectedLanguage !== (oModelData.isLanguagePersonalized ? sOriginLanguage : "default"),
                 bIsEnableSetUserProfileSetting = oModelData.isEnableUserProfileSetting,
                 bUpdateLanguage = oModelData.isEnableSetLanguage && oModelData.languageList && bLanguageChanged,
                 bUpdate = false,
@@ -229,6 +234,8 @@ sap.ui.define([
             if (bUpdateLanguage) {
                 Log.debug("[000] LanguageRegionSelector:onSave:UserInfo: oUser.setLanguage:", sSelectedLanguage, "LanguageRegionSelector.controller");
                 oUser.setLanguage(sSelectedLanguage);
+            } else {
+                this._resetLanguage();
             }
 
             if (bIsEnableSetUserProfileSetting) {
@@ -255,7 +262,9 @@ sap.ui.define([
                         name: "NUMBER_FORMAT"
                     }, this._getLegacyNumberFormat(oFormatSetting), oModelData.selectedNumberFormat);
                 }
-                if (this.oUser.getTimeZone() !== oModelData.selectedTimeZone) {
+                if (!oModelData.selectedTimeZone) { // Reset invalid time zone entry
+                    this.getView().getModel().setProperty("/selectedTimeZone", this.oUser.getTimeZone());
+                } else if (this.oUser.getTimeZone() !== oModelData.selectedTimeZone) {
                     bUpdate = true;
                     oUser.setChangedProperties({
                         propertyName: "timeZone",
@@ -319,8 +328,10 @@ sap.ui.define([
          * @private
          */
         _handleSelectChange: function (oEvent) {
-            var sSelectedLanguage = oEvent.getParameters().selectedItem.getKey();
-            this._updateTextFields(sSelectedLanguage);
+            var sSelectedLanguage = oEvent.getSource().getSelectedKey();
+            if (sSelectedLanguage) {
+                this._updateTextFields(sSelectedLanguage);
+            }
         },
 
         /**

package/src/main/js/sap/ushell/components/shell/Settings/userLanguageRegion/LanguageRegionSelector.view.xml

@@ -10,7 +10,13 @@
                 <Label text="{i18n>languageAndRegionTit}" visible="{= !${/languageList}}" labelFor="languageSelectionInput"/>
                 <Text id="languageSelectionInput" text="{/selectedLanguageText}" visible="{= !${/languageList} }"/>
                 <Label text="{i18n>languageAndRegionTit}" visible="{= !!${/languageList}}" labelFor="languageSelectionSelect"/>
-                <ComboBox id="languageSelectionSelect" visible="{= !!${/languageList} }" items="{/languageList}" selectedKey="{/selectedLanguage}" width="100%" change="._handleSelectChange">
+                <ComboBox id="languageSelectionSelect"
+                    visible="{= !!${/languageList} }"
+                    items="{/languageList}"
+                    selectedKey="{/selectedLanguage}"
+                    valueState="{= ${/selectedLanguage} ? 'None' : 'Error'}"
+                    width="100%"
+                    change="._handleSelectChange">
                     <core:Item key="{key}" text="{text}" />
                 </ComboBox>
 
@@ -43,6 +49,7 @@
                     }"
                     width="100%"
                     selectedKey="{/selectedTimeZone}"
+                    valueState="{= ${/selectedTimeZone} ? 'None' : 'Error'}"
                 >
                     <core:Item key="{value}" text="{description}" />
                 </ComboBox>

package/src/main/js/sap/ushell/components/shell/Settings/userLanguageRegion/UserLanguageRegionEntry.js

@@ -1,17 +1,13 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ui/core/mvc/XMLView",
-    "sap/ui/core/Locale",
-    "sap/ui/core/LocaleData",
     "sap/base/Log",
+    "sap/ui/core/mvc/XMLView",
     "sap/ushell/resources"
 ], function (
-    XMLView,
-    Locale,
-    LocaleData,
     Log,
-    resources
+    XMLView,
+    ushellResources
 ) {
     "use strict";
 
@@ -21,7 +17,7 @@ sap.ui.define([
         var oEntry = {
             id: "language",
             entryHelpID: "language",
-            title: resources.i18n.getText("languageRegionTit"),
+            title: ushellResources.i18n.getText("languageAndRegionTit"),
             valueResult: null,
             contentResult: null,
             icon: "sap-icon://globe",
@@ -30,22 +26,20 @@ sap.ui.define([
                 if (sUserLanguage.indexOf("-") > -1) {
                     sUserLanguage = sUserLanguage.replace("-", " (").concat(")");
                 }
-
                 return Promise.resolve(sUserLanguage);
             },
             contentFunc: function () {
                 return XMLView.create({
                     id: "languageRegionSelector",
                     viewName: "sap.ushell.components.shell.Settings.userLanguageRegion.LanguageRegionSelector"
-                })
-                    .then(function (oView) {
-                        var oViewController = oView.getController();
-                        oViewInstance = oView;
-                        return oViewController.oUserInfoServicePromise
-                            .then(function () {
-                                return oViewInstance;
-                            });
-                    });
+                }).then(function (oView) {
+                    var oViewController = oView.getController();
+                    oViewInstance = oView;
+                    return oViewController.oUserInfoServicePromise
+                        .then(function () {
+                            return oViewInstance;
+                        });
+                });
             },
             onSave: function (fnUpdateUserPreferences) {
                 if (oViewInstance) {
@@ -55,7 +49,6 @@ sap.ui.define([
                     "Save operation for language settings was not executed, because the languageRegionSelector view was not initialized"
                 );
                 return Promise.resolve();
-
             },
             onCancel: function () {
                 if (oViewInstance) {
@@ -71,10 +64,7 @@ sap.ui.define([
         return oEntry;
     }
 
-
-
     return {
         getEntry: getEntry
     };
-
 });

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

@@ -1,10 +1,12 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
+    "sap/ui/core/Core",
     "sap/ui/core/UIComponent",
     "sap/ushell/components/applicationIntegration/AppLifeCycle",
     "sap/ushell/Config",
     "sap/ushell/components/shell/UserActionsMenu/UserActionsMenu.controller"
 ], function (
+    Core,
     UIComponent,
     AppLifeCycle,
     Config,
@@ -25,7 +27,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserActionsMenu.Component", {
 
         metadata: {
-            version: "1.115.1",
+            version: "1.117.0",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m"]
@@ -61,7 +63,7 @@ sap.ui.define([
                 }
             }], false, ["blank-home", "blank"]);
 
-            sap.ui.getCore().getEventBus().publish("shell", "userActionsMenuCompLoaded", { delay: 0 });
+            Core.getEventBus().publish("shell", "userActionsMenuCompLoaded", { delay: 0 });
         },
 
         exit: function () {

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

@@ -1,45 +1,50 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/base/Log",
+    "sap/m/library",
+    "sap/m/StandardListItem",
+    "sap/ui/core/Core",
+    "sap/ui/core/ElementMetadata",
+    "sap/ui/core/Fragment",
     "sap/ui/core/mvc/Controller",
     "sap/ui/model/json/JSONModel",
-    "sap/m/StandardListItem",
+    "sap/ui/performance/Measurement",
     "sap/ushell/Config",
+    "sap/ushell/EventHub",
     "sap/ushell/resources",
     "sap/ushell/ui/footerbar/AboutButton",
     "sap/ushell/ui/footerbar/ContactSupportButton",
     "sap/ushell/ui/launchpad/ActionItem",
-    "sap/ushell/ui/QuickAccess",
-    "sap/ushell/EventHub",
-    "sap/m/library",
-    "sap/base/Log",
-    "sap/ui/performance/Measurement",
-    "sap/ui/core/ElementMetadata",
-    "sap/ui/core/Fragment"
+    "sap/ushell/ui/QuickAccess"
 ], function (
+    Log,
+    mobileLibrary,
+    StandardListItem,
+    Core,
+    ElementMetadata,
+    Fragment,
     Controller,
     JSONModel,
-    StandardListItem,
+    Measurement,
     Config,
-    resources,
+    EventHub,
+    ushellResources,
     AboutButton,
     ContactSupportButton,
     ActionItem,
-    QuickAccess,
-    EventHub,
-    library,
-    Log,
-    Measurement,
-    ElementMetadata,
-    Fragment
+    QuickAccess
 ) {
     "use strict";
 
-    var ListType = library.ListType;
-    var ButtonType = library.ButtonType;
+    // shortcut for sap.m.ListType
+    var ListType = mobileLibrary.ListType;
+
+    // shortcut for sap.m.ButtonType
+    var ButtonType = mobileLibrary.ButtonType;
 
     function isActionExist (sActionId) {
-        if (!sap.ui.getCore().byId(sActionId)) {
+        if (!Core.byId(sActionId)) {
             Log.debug("Could not render ActionItem because it was not created: " + sActionId);
             return false;
         }
@@ -67,7 +72,7 @@ sap.ui.define([
             }.bind(this)));
 
             this._aDoables.push(EventHub.on("showUserActionsMenu").do(function (bShow) {
-                var oPopover = sap.ui.getCore().byId("sapUshellUserActionsMenuPopover");
+                var oPopover = Core.byId("sapUshellUserActionsMenuPopover");
                 if (oPopover && oPopover.isOpen() || !bShow) {
                     this._toggleUserActionsMenuPopover(false);
                 } else {
@@ -84,7 +89,7 @@ sap.ui.define([
             this._aDanglingControl = [];
             this._aDoables = [];
 
-            var oPopover = sap.ui.getCore().byId("sapUshellUserActionsMenuPopover");
+            var oPopover = Core.byId("sapUshellUserActionsMenuPopover");
             if (oPopover) {
                 oPopover.destroy();
             }
@@ -128,12 +133,12 @@ sap.ui.define([
         },
 
         _createAppFinderButton: function (oConfig, bEnableHelp) {
-            if (sap.ui.getCore().byId("openCatalogBtn")) {
+            if (Core.byId("openCatalogBtn")) {
                 return;
             }
 
             var oOpenCatalogItem = new ActionItem("openCatalogBtn", {
-                text: resources.i18n.getText("open_appFinderBtn"),
+                text: ushellResources.i18n.getText("open_appFinderBtn"),
                 icon: "sap-icon://sys-find",
                 visible: !oConfig.disableAppFinder,
                 actionType: "action",
@@ -152,7 +157,7 @@ sap.ui.define([
 
         _createAboutButton: function (bEnableHelp) {
             var sId = "aboutBtn";
-            if (!sap.ui.getCore().byId(sId)) {
+            if (!Core.byId(sId)) {
                 var oAboutButton = new AboutButton(sId);
                 if (bEnableHelp) {
                     oAboutButton.addStyleClass("help-id-" + sId); // xRay help ID
@@ -164,10 +169,10 @@ sap.ui.define([
 
         _createSettingsButton: function (bEnableHelp) {
             var sId = "userSettingsBtn";
-            if (!sap.ui.getCore().byId(sId)) {
+            if (!Core.byId(sId)) {
                 var oUserPrefButton = new ActionItem(sId, {
-                    tooltip: resources.i18n.getText("ControlKey") + " + " + resources.i18n.getText("CommaKey"),
-                    text: resources.i18n.getText("userSettings"),
+                    tooltip: ushellResources.i18n.getText("ControlKey") + " + " + ushellResources.i18n.getText("CommaKey"),
+                    text: ushellResources.i18n.getText("userSettings"),
                     icon: "sap-icon://action-settings",
                     press: function () {
                         EventHub.emit("openUserSettings", Date.now());
@@ -187,7 +192,7 @@ sap.ui.define([
                 // 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 = sap.ui.getCore().byId(sId);
+                var oContactSupport = Core.byId(sId);
                 if (bConfigured && !oContactSupport) {
                     oContactSupport = new ContactSupportButton(sId);
                     this._addDanglingControl(oContactSupport);
@@ -208,10 +213,10 @@ sap.ui.define([
 
             Config.on("/core/shell/model/enableTrackingActivity").do(function (bEnableTrackingActivity) {
                 if (bEnableTrackingActivity) {
-                    var oRecentActivitiesBtn = sap.ui.getCore().byId(sId);
+                    var oRecentActivitiesBtn = Core.byId(sId);
                     if (!oRecentActivitiesBtn) {
                         oRecentActivitiesBtn = new ActionItem(sId, {
-                            text: resources.i18n.getText("recentActivities"),
+                            text: ushellResources.i18n.getText("recentActivities"),
                             icon: "sap-icon://customer-history",
                             press: function () {
                                 QuickAccess.openQuickAccessDialog("recentActivityFilter", "userActionsMenuHeaderButton");
@@ -231,12 +236,12 @@ sap.ui.define([
 
             Config.on("/core/shell/model/enableTrackingActivity").do(function (bEnableTrackingActivity) {
                 if (bEnableTrackingActivity) {
-                    var oFrequentActivitiesBtn = sap.ui.getCore().byId(sId);
+                    var oFrequentActivitiesBtn = Core.byId(sId);
                     if (!oFrequentActivitiesBtn) {
                         oFrequentActivitiesBtn = new ActionItem(sId, {
-                            text: resources.i18n.getText("frequentActivities"),
+                            text: ushellResources.i18n.getText("frequentActivities"),
                             icon: "sap-icon://activity-individual",
-                            tooltip: resources.i18n.getText("frequentActivitiesTooltip"),
+                            tooltip: ushellResources.i18n.getText("frequentActivitiesTooltip"),
                             press: function () {
                                 QuickAccess.openQuickAccessDialog("frequentlyUsedFilter", "userActionsMenuHeaderButton");
                             }
@@ -252,14 +257,14 @@ sap.ui.define([
 
         _createLogoutButton: function () {
             var sId = "logoutBtn";
-            if (sap.ui.getCore().byId(sId)) {
+            if (Core.byId(sId)) {
                 return;
             }
             var oLogoutBtn = new ActionItem(sId, {
                 visible: true,
                 type: ButtonType.Transparent,
                 icon: "sap-icon://log",
-                text: resources.i18n.getText("signoutBtn_title"),
+                text: ushellResources.i18n.getText("signoutBtn_title"),
                 press: this.logout
             });
             this._addDanglingControl(oLogoutBtn);
@@ -269,10 +274,10 @@ sap.ui.define([
         logout: function () {
             sap.ui.require(["sap/m/MessageBox", "sap/ushell/ui/launchpad/LoadingDialog"],
                 function (MessageBox, LoadingDialog) {
-                    var oLoading = new LoadingDialog({ text: "" }),
-                        bShowLoadingScreen = true,
-                        bIsLoadingScreenShown = false,
-                        oLogoutDetails = {};
+                    var oLoading = new LoadingDialog({ text: "" });
+                    var bShowLoadingScreen = true;
+                    var bIsLoadingScreenShown = false;
+                    var oLogoutDetails = {};
 
                     sap.ushell.Container.getGlobalDirty().done(function (dirtyState) {
                         bShowLoadingScreen = false;
@@ -282,7 +287,7 @@ sap.ui.define([
                         }
 
                         var _getLogoutDetails = function () {
-                            var oResourceBundle = resources.i18n;
+                            var oResourceBundle = ushellResources.i18n;
 
                             if (dirtyState === sap.ushell.Container.DirtyState.DIRTY) {
                                 // show warning only if it is sure that there are unsaved changes
@@ -305,7 +310,7 @@ sap.ui.define([
                             function (oAction) {
                                 if (oAction === MessageBox.Action.OK) {
                                     oLoading.openLoadingScreen();
-                                    oLoading.showAppInfo(resources.i18n.getText("beforeLogoutMsg"), null);
+                                    oLoading.showAppInfo(ushellResources.i18n.getText("beforeLogoutMsg"), null);
                                     sap.ushell.Container.logout();
                                 }
                             }, ElementMetadata.uid("confirm"));
@@ -336,8 +341,7 @@ sap.ui.define([
         /**
          * Method to open or close the UserActionsMenu popover
          *
-         * @param {boolean} bShow flag to open or cloase UserActionsMenu popover
-         *
+         * @param {boolean} bShow flag to open or close UserActionsMenu popover
          * @private
          */
         _toggleUserActionsMenuPopover: function (bShow) {
@@ -353,7 +357,7 @@ sap.ui.define([
                 }.bind(this));
             } else if (bShow) {
                 this.oPopover.getModel().refresh(true); // force refresh by reopen because the visibility of actions may change
-                this.oPopover.openBy(sap.ui.getCore().byId("userActionsMenuHeaderButton"));
+                this.oPopover.openBy(Core.byId("userActionsMenuHeaderButton"));
             } else {
                 this.oPopover.close();
                 if (window.document.activeElement && window.document.activeElement.id !== "userActionsMenuHeaderButton") {
@@ -363,7 +367,7 @@ sap.ui.define([
         },
 
         userActionsMenuPopoverItemFactory: function (sId, oContext) {
-            var oActionItem = sap.ui.getCore().byId(oContext.getObject());
+            var oActionItem = Core.byId(oContext.getObject());
 
             return new StandardListItem({
                 id: sId + "-" + oActionItem.getId(),

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

@@ -37,7 +37,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserImage.Component", {
 
         metadata: {
-            version: "1.115.1",
+            version: "1.117.0",
             library: "sap.ushell.components.shell.UserImage",
             dependencies: {
                 libs: {

package/src/main/js/sap/ushell/components/tiles/applauncher/StaticTile.controller.js

@@ -11,7 +11,8 @@ sap.ui.define([
     "sap/ui/model/json/JSONModel",
     "sap/base/Log",
     "sap/ui/thirdparty/jquery",
-    "sap/ushell/utils/UrlParsing"
+    "sap/ushell/utils/UrlParsing",
+    "sap/ushell/EventHub"
 ], function (
     Controller,
     utils,
@@ -23,7 +24,8 @@ sap.ui.define([
     JSONModel,
     Log,
     jQuery,
-    UrlParsing
+    UrlParsing,
+    EventHub
 ) {
     "use strict";
 
@@ -210,12 +212,18 @@ sap.ui.define([
             var oViewData = oStaticTileView.getViewData();
             var oTileApi = oViewData.chip;
             var oTileConfig = oStaticTileView.getModel().getProperty("/config");
-
             // scope is property of generic tile. It's default value is "Display"
             if (oEvent.getSource().getScope && oEvent.getSource().getScope() === GenericTileScope.Display) {
                 if (oTileApi.configurationUi.isEnabled()) {
                     oTileApi.configurationUi.display();
                 } else if (this.navigationTargetUrl) {
+                    EventHub.emit("UITracer.trace", {
+                        reason: "LaunchApp",
+                        source: "Tile",
+                        data: {
+                            targetUrl: this.navigationTargetUrl
+                        }
+                    });
                     if (this.navigationTargetUrl[0] === "#") {
                         hasher.setHash(this.navigationTargetUrl);
                     } else {