@sapui5/sap.ushell 1.112.3 → 1.114.0

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/Log",
@@ -53,7 +53,7 @@ sap.ui.define([
     var ButtonType = mobileLibrary.ButtonType;
 
     // compare parameters by groupId
-    function compareByGroupId (oDefault1, oDefault2) {
+    function compareByGroupId(oDefault1, oDefault2) {
         // handle default without metadata
         if (!(oDefault2.editorMetadata && oDefault2.editorMetadata.groupId)) {
             return -1; // keep order
@@ -73,7 +73,7 @@ sap.ui.define([
     }
 
     // compare parameters by parameterIndex
-    function compareByParameterIndex (oDefault1, oDefault2) {
+    function compareByParameterIndex(oDefault1, oDefault2) {
         // handle default without metadata
         if (!(oDefault2.editorMetadata && oDefault2.editorMetadata.parameterIndex)) {
             return -1; // keep order
@@ -85,7 +85,7 @@ sap.ui.define([
     }
 
     //compare parameters by groupId and then by parameterIndex
-    function compareParameters (oDefault1, oDefault2) {
+    function compareParameters(oDefault1, oDefault2) {
         // first by groupId
         var iComparisonResult = compareByGroupId(oDefault1, oDefault2);
         if (iComparisonResult === 0) {
@@ -117,19 +117,19 @@ sap.ui.define([
                 oView.setModel(oSystemContextModel, "systemContexts");
                 return this._fillGroups();
             }.bind(this))
-            .then(this._saveIsSupportedPlatform.bind(this))
-            .then(this._initializeSmartVariantManagement.bind(this))
-            .then(function () {
-                oView.setBusy(false);
-            })
-            .catch(function (err) {
-                Log.error(
-                    "Error during UserDefaultsSetting controller initialization",
-                    err,
-                    "sap.ushell.components.shell.Settings.userDefaults.UserDefaultsSetting"
-                );
-                oView.setBusy(false);
-            });
+                .then(this._saveIsSupportedPlatform.bind(this))
+                .then(this._initializeSmartVariantManagement.bind(this))
+                .then(function () {
+                    oView.setBusy(false);
+                })
+                .catch(function (err) {
+                    Log.error(
+                        "Error during UserDefaultsSetting controller initialization",
+                        err,
+                        "sap.ushell.components.shell.Settings.userDefaults.UserDefaultsSetting"
+                    );
+                    oView.setBusy(false);
+                });
         },
 
         /**
@@ -141,17 +141,17 @@ sap.ui.define([
          * @private
          */
         getSystemContextsModel: function () {
-            var oSystemContextModel = new JSONModel({systemContexts: [], selectedKey: ""});
+            var oSystemContextModel = new JSONModel({ systemContexts: [], selectedKey: "" });
 
             var oGetContentProviderIdsPromise = this._getContentProviderIds();
             var oClientSideTargetResolutionPromise = sap.ushell.Container.getServiceAsync("ClientSideTargetResolution");
             var oUserDefaultParametersServicePromise = sap.ushell.Container.getServiceAsync("UserDefaultParameters");
 
             return Promise.all([
-                    oGetContentProviderIdsPromise,
-                    oClientSideTargetResolutionPromise,
-                    oUserDefaultParametersServicePromise
-                ])
+                oGetContentProviderIdsPromise,
+                oClientSideTargetResolutionPromise,
+                oUserDefaultParametersServicePromise
+            ])
                 .then(function (aResults) {
                     var aContentProviderIds = aResults[0];
                     var oCSTRService = aResults[1];
@@ -163,15 +163,14 @@ sap.ui.define([
                     }
 
                     return Promise.all(aContentProviderIds.map(function (sContentProvider) {
-                            return oCSTRService.getSystemContext(sContentProvider).then(function (oSystemContext) {
-                                var aSystemContexts = oSystemContextModel.getProperty("/systemContexts");
-                                // eslint-disable-next-line max-nested-callbacks
-                                return oUserDefaultParametersService.hasRelevantMaintainableParameters(oSystemContext).then(function (bRelevant) {
-                                    if (bRelevant) {
-                                        aSystemContexts.push(oSystemContext);
-                                    }
-                                });
+                        return oCSTRService.getSystemContext(sContentProvider).then(function (oSystemContext) {
+                            var aSystemContexts = oSystemContextModel.getProperty("/systemContexts");
+                            return oUserDefaultParametersService.hasRelevantMaintainableParameters(oSystemContext).then(function (bRelevant) {
+                                if (bRelevant) {
+                                    aSystemContexts.push(oSystemContext);
+                                }
                             });
+                        });
                     })).then(function () {
                         var aSystemContexts = oSystemContextModel.getProperty("/systemContexts");
                         if (aSystemContexts.length > 0) {
@@ -184,7 +183,7 @@ sap.ui.define([
 
         /**
          * Gets all contentProvider ids.
-         * If spaces mode is active the content Providers will be recieved from the CDM service,
+         * If spaces mode is active the content Providers will be received from the CDM service,
          * else only the default contentProvider id will be returned
          *
          * @returns {Promise<string[]>} A promise which resolves to a list of content provider ids
@@ -217,7 +216,7 @@ sap.ui.define([
                 var sUserDefaultDiscardText = resources.i18n.getText("userDefaultsDiscard");
                 MessageBox.show(resources.i18n.getText("userDefaultsUnsavedChangesMessage"), {
                     title: resources.i18n.getText("userDefaultsUnsavedChangesTitle"),
-                    actions: [ sUserDefaultSaveText, sUserDefaultDiscardText, MessageBox.Action.CANCEL ],
+                    actions: [sUserDefaultSaveText, sUserDefaultDiscardText, MessageBox.Action.CANCEL],
                     emphasizedAction: sUserDefaultSaveText,
                     icon: MessageBox.Icon.QUESTION,
                     onClose: function (sAction) {
@@ -297,7 +296,6 @@ sap.ui.define([
          * @property {sap.ui.model.json.JSONModel} extendedModel the model which used to bind to the extended dialog
          */
 
-
         /**
          * @typedef {object} ParameterMetadata Metadata of the parameter
          * @property {string} groupId The id of the group which parameter is located
@@ -316,7 +314,7 @@ sap.ui.define([
          * @typedef {object} FormattedParameter A prepared parameter.
          * @property {string} parameterName The name of the parameter
          * @property {ParameterValue} valueObject A value object of the parameter
-         * @property {ParameterModelBind} modelBind A model bindning of the parameter
+         * @property {ParameterModelBind} modelBind A model binding of the parameter
          * @property {ParameterMetadata} editorMetadata A metadata of the parameter
          */
 
@@ -334,17 +332,41 @@ sap.ui.define([
 
                 oParameter.parameterName = sParameter;
                 oParameter.editorMetadata = oParameter.editorMetadata || {};
-                // normalize the value, in the editor, undefined is represented as ""
-                oParameter.valueObject = fnDeepExtend({ value: "" }, oParameter.valueObject);
+
 
                 if (oParameter.editorMetadata.editorInfo && oParameter.editorMetadata.editorInfo.propertyName) {
                     return this._createOdataModelBinding(oParameter, oJsonModel)
                         .then(function (oModelBind) {
                             oParameter.modelBind = oModelBind;
+                            var 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; } });
+                                    switch (oODataProp.type) {
+                                        case "Edm.DateTime":
+                                            // We assume that a SmartField -> Date is used to handle this Parameter, therefore we adapt the data accordingly
+                                            oParameter.valueObject.value = oParameter.valueObject.value ? new Date(oParameter.valueObject.value) : null;
+                                            break;
+                                        default:
+                                            oParameter.valueObject.value = oParameter.valueObject.value ? oParameter.valueObject.value : "";
+                                            break;
+                                    }
+                                    return oParameter;
+                                });
+                            }
+
+                            oParameter.valueObject = fnDeepExtend({ value: "" }, oParameter.valueObject);
                             return oParameter;
                         })
                         .catch(function () {
                             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.
                             oParameter.modelBind = this._createPlainModelBinding(oParameter, oJsonModel);
                             this.oBlockedParameters[oParameter.parameterName] = false;
@@ -352,6 +374,8 @@ sap.ui.define([
                         }.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));
@@ -398,8 +422,8 @@ sap.ui.define([
          * @returns {Promise<BindingInfo>} A modal binding info object for the parameter
          */
         _createOdataModelBinding: function (oParameter, oJsonModel) {
-            var oEditorInfo = oParameter.editorMetadata.editorInfo,
-                oODataServiceData = this._getODataServiceData(oEditorInfo.odataURL, oParameter);
+            var oEditorInfo = oParameter.editorMetadata.editorInfo;
+            var oODataServiceData = this._getODataServiceData(oEditorInfo.odataURL, oParameter);
 
             return oODataServiceData.metadataLoaded.then(function () {
                 var oBindingInfo = {
@@ -487,8 +511,8 @@ sap.ui.define([
             var aGroups = [];
 
             for (var i = 0; i < aFormattedParameters.length; ++i) {
-                var oProperty = aFormattedParameters[i],
-                    oModelBinding = oProperty.modelBind;
+                var oProperty = aFormattedParameters[i];
+                var oModelBinding = oProperty.modelBind;
 
                 if (sLastGroupId !== oProperty.editorMetadata.groupId) {
                     // generate a group on group change
@@ -525,12 +549,11 @@ sap.ui.define([
          * Create GroupElement content
          *
          * @param {FormattedParameter} oFormattedParameters default parameter
-         * @returns {sap.m.FlexBox} FlexBox which containts a label, an input and the extendedUsage button
+         * @returns {sap.m.FlexBox} FlexBox which contains a label, an input and the extendedUsage button
          */
         _createControl: function (oFormattedParameters) {
-            var oField,
-                oLabel,
-                oExtendedParametersButton;
+            var oField;
+            var oExtendedParametersButton;
             // If oRecord supports extended values (ranges), we want to add an additional button to it
             // The style of the button depends on whether there are any ranges in the extendedValues object
             if (oFormattedParameters.editorMetadata.extendedUsage) {
@@ -549,7 +572,7 @@ sap.ui.define([
                 }).addStyleClass("sapUshellExtendedDefaultParamsButton");
             }
 
-            oLabel = new SmartLabel({
+            var oLabel = new SmartLabel({
                 width: Device.system.phone ? "auto" : "12rem",
                 textAlign: Device.system.phone ? "Left" : "Right"
             });
@@ -589,15 +612,14 @@ sap.ui.define([
         },
 
         saveExtendedValue: function (oControlEvent) {
-            var sParameterName = oControlEvent.getSource().getModel().getProperty("/parameterName"),
-                //JSONModel is used for the extend values
-                oExtendedModel = this.oModel,
-                aTokens = oControlEvent.getParameters().tokens || [],
-                sPathToTokens = "/" + sParameterName + "/valueObject/extendedValue/Ranges",
-                aFormattedTokensData;
+            var 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";
 
             // convert the Ranges that are coming from the dialog to the format that should be persisted in the service and that applications can read
-            aFormattedTokensData = aTokens.map(function (oToken) {
+            var aFormattedTokensData = aTokens.map(function (oToken) {
                 var oTokenData = oToken.data("range");
                 return {
                     Sign: oTokenData.exclude ? "E" : "I",
@@ -659,15 +681,12 @@ sap.ui.define([
          */
         storeChangedData: function () {
             var aDisplayedUserDefaults = this.aDisplayedUserDefaults || [];
-            var sParameterName,
-                oValueObject,
-                oModelBinding;
 
             // check for all changed parameters...
             for (var i = 0; i < aDisplayedUserDefaults.length; ++i) {
-                sParameterName = aDisplayedUserDefaults[i].parameterName;
-                oValueObject = this.oModel.getProperty("/" + sParameterName + "/valueObject/");
-                oModelBinding = aDisplayedUserDefaults[i].modelBind;
+                var sParameterName = aDisplayedUserDefaults[i].parameterName;
+                var oValueObject = this.oModel.getProperty("/" + sParameterName + "/valueObject/");
+                var oModelBinding = aDisplayedUserDefaults[i].modelBind;
 
                 if (!this.oBlockedParameters[sParameterName]) {
                     var oldValues = {
@@ -702,17 +721,14 @@ sap.ui.define([
         onCancel: function () {
             this._setDirtyState(false);
 
-            var aDisplayedParameters = this.aDisplayedUserDefaults,
-                sParameterName,
-                oBoundModel,
-                oOriginalParameter;
+            var aDisplayedParameters = this.aDisplayedUserDefaults;
 
             if (this.aChangedParamsNames.length > 0) {
                 for (var i = 0; i < aDisplayedParameters.length && this.aChangedParamsNames.length > 0; i++) {
-                    sParameterName = aDisplayedParameters[i].parameterName;
+                    var sParameterName = aDisplayedParameters[i].parameterName;
                     if (this.aChangedParamsNames.indexOf(sParameterName) > -1) {
-                        oOriginalParameter = this.oOriginalParameters[sParameterName];
-                        oBoundModel = aDisplayedParameters[i].modelBind;
+                        var oOriginalParameter = this.oOriginalParameters[sParameterName];
+                        var oBoundModel = aDisplayedParameters[i].modelBind;
                         oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, oOriginalParameter.valueObject.value || "");
                         if (oOriginalParameter.editorMetadata && oOriginalParameter.editorMetadata.extendedUsage) {
                             oBoundModel.extendedModel.setProperty("/" + sParameterName + "/valueObject/extendedValue",
@@ -747,21 +763,16 @@ sap.ui.define([
 
             return pSave.then(this._resetSmartVariantManagement.bind(this))
                 .then(this._setDefaultVariant.bind(this));
-
         },
 
         _saveParameterValues: function (aChangedParameterNames, oSystemContext) {
             var aPromises = [];
-            var sParameterName;
-            var oSetValuePromise;
-            var oValueObject;
-            var oOriginalValueObject;
 
             // we change the effectively changed parameters, once, in alphabetic order
             for (var i = 0; i < aChangedParameterNames.length; i++) {
-                sParameterName = aChangedParameterNames[i];
-                oValueObject = this.oModel.getProperty("/" + sParameterName + "/valueObject/");
-                oOriginalValueObject = this.oOriginalParameters[sParameterName].valueObject;
+                var sParameterName = aChangedParameterNames[i];
+                var oValueObject = this.oModel.getProperty("/" + sParameterName + "/valueObject/");
+                var oOriginalValueObject = this.oOriginalParameters[sParameterName].valueObject;
 
                 if (!fnDeepEqual(oOriginalValueObject, oValueObject)) {
                     // as the editor does not distinguish empty string from deletion, and has no "reset" button
@@ -778,8 +789,7 @@ sap.ui.define([
                         oValueObject.extendedValue = undefined;
                     }
 
-                    oSetValuePromise = this._saveParameterValue(sParameterName, oValueObject, oOriginalValueObject, oSystemContext);
-
+                    var oSetValuePromise = this._saveParameterValue(sParameterName, oValueObject, oOriginalValueObject, oSystemContext);
                     aPromises.push(oSetValuePromise);
                 }
             }
@@ -842,19 +852,19 @@ sap.ui.define([
          */
         _initializeSmartVariantManagement: function () {
             if (!this._bIsSupportedPlatform) { return Promise.resolve(); }
-            var oSmartVariantManagement = this.getView().byId("defaultSettingsVariantManagement"),
-                fnSetVariant = function () {
-                    this._setSelectedVariant(oSmartVariantManagement.getSelectionKey());
-                }.bind(this);
+            var oSmartVariantManagement = this.getView().byId("defaultSettingsVariantManagement");
+            var fnSetVariant = function () {
+                this._setSelectedVariant(oSmartVariantManagement.getSelectionKey());
+            }.bind(this);
 
             return new Promise(function (resolve) {
-                var oUserDefaultsForm = this.getView().byId("userDefaultsForm"),
-                    oPersInfo = new PersonalizableInfo({
-                        type: "wrapper",
-                        keyName: "persistencyKey",
-                        dataSource: "none",
-                        control: oUserDefaultsForm
-                    });
+                var oUserDefaultsForm = this.getView().byId("userDefaultsForm");
+                var oPersInfo = new PersonalizableInfo({
+                    type: "wrapper",
+                    keyName: "persistencyKey",
+                    dataSource: "none",
+                    control: oUserDefaultsForm
+                });
 
                 oSmartVariantManagement.detachSelect(fnSetVariant)
                     .detachAfterSave(fnSetVariant)
@@ -886,16 +896,15 @@ sap.ui.define([
          */
         displayDiffText: function () {
             if (!this._bIsSupportedPlatform) { return false; }
-            var oSmartVariantManagement = this.getView().byId("defaultSettingsVariantManagement"),
-                oUserDefaultsForm = this.getView().byId("userDefaultsForm"),
-                sStandardKey = oSmartVariantManagement.getStandardVariantKey(),
-                sSelectionKey = oSmartVariantManagement.getSelectionKey(),
-                oStandardContent, oVariantContent;
+            var oSmartVariantManagement = this.getView().byId("defaultSettingsVariantManagement");
+            var oUserDefaultsForm = this.getView().byId("userDefaultsForm");
+            var sStandardKey = oSmartVariantManagement.getStandardVariantKey();
+            var sSelectionKey = oSmartVariantManagement.getSelectionKey();
 
             if (sSelectionKey === sStandardKey) { return false; }
 
-            oStandardContent = oSmartVariantManagement.getVariantContent(oUserDefaultsForm, sStandardKey);
-            oVariantContent = oSmartVariantManagement.getVariantContent(oUserDefaultsForm, sSelectionKey);
+            var oStandardContent = oSmartVariantManagement.getVariantContent(oUserDefaultsForm, sStandardKey);
+            var oVariantContent = oSmartVariantManagement.getVariantContent(oUserDefaultsForm, sSelectionKey);
 
             // workaround to get a deepEqual === true
             delete oVariantContent.executeOnSelection;

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/Log",
@@ -6,18 +6,22 @@ sap.ui.define([
     "sap/ui/core/Configuration",
     "sap/ui/core/Locale",
     "sap/ui/core/LocaleData",
+    "sap/ui/core/format/DateFormat",
     "sap/ui/core/mvc/Controller",
     "sap/ui/model/json/JSONModel",
-    "sap/ui/performance/Measurement"
+    "sap/ui/performance/Measurement",
+    "sap/ushell/Config"
 ], function (
     Log,
     UriParameters,
     Configuration,
     Locale,
     LocaleData,
+    DateFormat,
     Controller,
     JSONModel,
-    Measurement
+    Measurement,
+    Config
 ) {
     "use strict";
 
@@ -65,15 +69,10 @@ sap.ui.define([
                         isLanguagePersonalized: bIsLanguagePersonalized,
                         isEnableSetLanguage: bIsEnableSetLanguage,
                         isEnableUserProfileSetting: bIsEnableSetUserPreference,
-                        isTimeZoneIanaAvailable: true
+                        isTimeZoneFromServerInUI5: Config.last("/core/ui5/timeZoneFromServerInUI5")
                     });
                     oModel.setSizeLimit(1000);
 
-                    var sTimeZoneIana = sap.ushell.Container.getUser().getTimeZoneIana();
-                    if (sTimeZoneIana === undefined || (sTimeZoneIana !== "" && typeof sTimeZoneIana === "string")) {
-                        oModel.setProperty("/isTimeZoneIanaAvailable", false);
-                    }
-
                     if (bIsEnableSetLanguage) {
                         aUserPreferenceAndLanguageSettingPromises.push(this._loadLanguagesList());
                     }
@@ -104,7 +103,12 @@ sap.ui.define([
                                 oModel.setProperty("/DateFormatList", aUserSettingList.DATE_FORMAT);
                             }
                             if (aUserSettingList && aUserSettingList.TIME_ZONE && aUserSettingList.TIME_ZONE.length > 0) {
-                                oModel.setProperty("/TimeZoneList", aUserSettingList.TIME_ZONE);
+                                var oDateTimeWithTimezone = DateFormat.getDateTimeWithTimezoneInstance({showDate: false, showTime: false});
+                                var aTimeZones = aUserSettingList.TIME_ZONE.map(function (timeZone) {
+                                    var sTimeZomeText = oDateTimeWithTimezone.format(null, timeZone.description) || timeZone.description;
+                                    return {description: sTimeZomeText, value: timeZone.value};
+                                });
+                                oModel.setProperty("/TimeZoneList", aTimeZones);
                             }
                             if (aUserSettingList && aUserSettingList.NUMBER_FORMAT && aUserSettingList.NUMBER_FORMAT.length > 0) {
                                 oModel.setProperty("/NumberFormatList", aUserSettingList.NUMBER_FORMAT);
@@ -193,18 +197,7 @@ sap.ui.define([
             if (bUpdateLanguage) {
                 Log.debug("[000] onSaveSuccess: oUser.resetChangedPropertyLanguage:", "LanguageRegionSelector.controller");
                 oUser.resetChangedProperty("language");
-                var sLanguageinUrl = UriParameters.fromQuery(window.location.search).get("sap-language");
-                if (sLanguageinUrl && sSelectedLanguage !== "default") {
-                    oResolvedResult.urlParams = [{
-                        "sap-language": sSelectedLanguage
-                    }];
-                }
-
-                // the backend would use the language of the sap-usercontext cookie after the reload
-                // without the language in the cookie the backend uses the language from the user defaults
-                // this has to be done after the last backend request and right before the reload as a
-                // backend request would reset the language in the cookie
-                this._removeLanguageFromUserContextCookie();
+                oResolvedResult.obsoleteUrlParams = ["sap-language"];
             }
             return oResolvedResult; //refresh the page to apply changes.
         },
@@ -319,31 +312,6 @@ sap.ui.define([
             oModel.setProperty("/selectedTimeZone", this.oUser.getTimeZone());
         },
 
-        /**
-         * Remove the language from the sap-usercontext cookie
-         *
-         * @private
-         * @since 1.79.0
-         */
-        _removeLanguageFromUserContextCookie: function () {
-            var sUserContextCookie = document.cookie.split(";").find(function (cookie) {
-                return cookie.indexOf("sap-usercontext") !== -1;
-            });
-
-            // the cookie is only present on the ABAP platform
-            if (!sUserContextCookie) {
-                return;
-            }
-
-            // the cookie should always look like this: sap-usercontext=sap-language=EN&sap-client=120
-            // to be on the safe side the language is removed while preserving the other parameters
-            var aCookieValues = sUserContextCookie.replace("sap-usercontext=", "").split("&");
-            aCookieValues = aCookieValues.filter(function (sValue) {
-                return sValue.indexOf("sap-language") === -1;
-            });
-
-            document.cookie = "sap-usercontext=" + aCookieValues.join("&") + ";path=/";
-        },
 
         /**
          * This method call handle the change in the selection language

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

@@ -10,9 +10,9 @@
                 <Label text="{i18n>languageAndRegionTit}" visible="{= !${/languageList}}" labelFor="languageSelectionInput"/>
                 <Text id="languageSelectionInput" text="{/selectedLanguageText}" visible="{= !${/languageList} }"/>
                 <Label text="{i18n>languageAndRegionTit}" visible="{= !!${/languageList}}" labelFor="languageSelectionSelect"/>
-                <Select id="languageSelectionSelect" visible="{= !!${/languageList} }" items="{/languageList}" selectedKey="{/selectedLanguage}" width="100%" change="._handleSelectChange">
+                <ComboBox id="languageSelectionSelect" visible="{= !!${/languageList} }" items="{/languageList}" selectedKey="{/selectedLanguage}" width="100%" change="._handleSelectChange">
                     <core:Item key="{key}" text="{text}" />
-                </Select>
+                </ComboBox>
 
                 <Label text="{i18n>dateFormatFld}" visible="{= !${/DateFormatList}}" labelFor="dateFormatCombo"/>
                 <Text id="dateFormatCombo" visible="{= !${/DateFormatList}}" text="{/selectedDatePattern}" />
@@ -34,11 +34,20 @@
                 </Select>
 
                 <Label text="{i18n>timeZoneFld}" visible="{= ${/isEnableUserProfileSetting}}" labelFor="TimeZoneSelectionSelect" />
-                <Select id="TimeZoneSelectionSelect" visible="{= !!${/TimeZoneList}}" items="{/TimeZoneList}" width="100%" selectedKey="{/selectedTimeZone}">
+                <ComboBox
+                    id="TimeZoneSelectionSelect"
+                    visible="{= !!${/TimeZoneList}}"
+                    items="{
+                        path: '/TimeZoneList',
+                        sorter: { path: 'description' }
+                    }"
+                    width="100%"
+                    selectedKey="{/selectedTimeZone}"
+                >
                     <core:Item key="{value}" text="{description}" />
-                </Select>
-                <Label visible="false"/>
-                <Text text="{i18n>TimeZoneHelpingText}" class="sapUshellFlpSettingsHint" visible="{/isTimeZoneIanaAvailable}" width="100%"/>
+                </ComboBox>
+                <Label visible="{= !${/isTimeZoneFromServerInUI5}}"/>
+                <Text text="{i18n>TimeZoneHelpingText}" class="sapUshellFlpSettingsHint" visible="{= !${/isTimeZoneFromServerInUI5}}" width="100%"/>
 
                 <Label text="{i18n>numberFormatFld}" visible="{= ${/isEnableUserProfileSetting}}" labelFor="NumberFormatSelectionSelect" />
                 <Select id="NumberFormatSelectionSelect" visible="{= !!${/NumberFormatList}}" items="{/NumberFormatList}" width="100%" selectedKey="{/selectedNumberFormat}">

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/mvc/XMLView",

package/src/main/js/sap/ushell/components/shell/Settings/userProfiling/UsageAnalyticsProfiling.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/Log",

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

package/src/main/js/sap/ushell/components/shell/Settings/userProfiling/UserProfilingEntry.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/Log",

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/UIComponent",
     "sap/ushell/components/applicationIntegration/AppLifeCycle",
@@ -25,7 +25,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserActionsMenu.Component", {
 
         metadata: {
-            version: "1.112.3",
+            version: "1.114.0",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m"]

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/mvc/Controller",
@@ -307,8 +307,6 @@ sap.ui.define([
                                     oLoading.openLoadingScreen();
                                     oLoading.showAppInfo(resources.i18n.getText("beforeLogoutMsg"), null);
                                     sap.ushell.Container.logout();
-                                } else if (window.document.activeElement && window.document.activeElement.tagName === "BODY") {
-                                    window.document.getElementById("userActionsMenuHeaderButton").focus();
                                 }
                             }, ElementMetadata.uid("confirm"));
                     });
@@ -358,6 +356,9 @@ sap.ui.define([
                 this.oPopover.openBy(sap.ui.getCore().byId("userActionsMenuHeaderButton"));
             } else {
                 this.oPopover.close();
+                if (window.document.activeElement && window.document.activeElement.id !== "userActionsMenuHeaderButton") {
+                    window.document.getElementById("userActionsMenuHeaderButton").focus();
+                }
             }
         },
 

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

@@ -1,5 +1,5 @@
 /*!
- * Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+ * Copyright (c) 2009-2023 SAP SE, All Rights Reserved
  */
 sap.ui.define([
     "sap/base/Log",
@@ -37,7 +37,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserImage.Component", {
 
         metadata: {
-            version: "1.112.3",
+            version: "1.114.0",
             library: "sap.ushell.components.shell.UserImage",
             dependencies: {
                 libs: {