@sapui5/sap.ushell 1.131.1 → 1.132.0

package/src/main/js/sap/ushell/components/pages/controller/PageRuntime.controller.js

@@ -2,10 +2,11 @@
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.131.1
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/ui/core/Element",
+    "sap/ui/core/Fragment",
     "sap/ui/core/EventBus",
     "sap/ushell/library",
     "sap/ui/core/mvc/Controller",
@@ -34,6 +35,7 @@ sap.ui.define([
     "sap/ui/dom/jquery/Focusable"
 ], function (
     Element,
+    Fragment,
     EventBus,
     ushellLibrary,
     Controller,
@@ -120,7 +122,9 @@ sap.ui.define([
             this._oErrorPageModel = new JSONModel({
                 title: "",
                 description: "",
-                details: ""
+                details: "",
+                pageAndSpaceId: "",
+                technicalError: ""
             });
             this.getView().setModel(this._oErrorPageModel, "errorPage");
 
@@ -433,7 +437,7 @@ sap.ui.define([
          */
         _openFLPPage: function () {
             return PagesAndSpaceId.getPageAndSpaceId()
-                .then(({pageId, spaceId}) => {
+                .then(({ pageId, spaceId }) => {
 
                     // this property may be updated by consecutive calls to _openFLPPage and prevents race conditions when opening pages
                     this.sCurrentTargetPageId = pageId;
@@ -499,19 +503,22 @@ sap.ui.define([
             if (vError instanceof Error) {
                 // E.g. UI5 modules cannot be loaded
                 this._oErrorPageModel.setProperty("/details", vError.toString());
-
                 this._oErrorPageModel.setProperty("/title", resources.i18n.getText("PageRuntime.GeneralError.Text"));
+                this._oErrorPageModel.setProperty("/technicalError", vError.toString());
+                this._oErrorPageModel.setProperty("/pageAndSpaceId", "");
+
+            } else if (sPageId && sSpaceId) {
+                this._oErrorPageModel.setProperty("/title", resources.i18n.getText("PageRuntime.CannotLoadPage.Title"));
+                this._oErrorPageModel.setProperty("/details", resources.i18n.getText("PageRuntime.CannotLoadPage.Details", [JSON.stringify(vError)]));
+                this._oErrorPageModel.setProperty("/pageAndSpaceId", resources.i18n.getText("PageRuntime.CannotLoadPage.PageAndSpaceId", [sPageId, sSpaceId]));
+                this._oErrorPageModel.setProperty("/technicalError", JSON.stringify(vError));
             } else {
-                this._oErrorPageModel.setProperty("/details", resources.i18n.getText("PageRuntime.CannotLoadPage.Description", [JSON.stringify(vError)]));
-
-                if (sPageId && sSpaceId) {
-                    this._oErrorPageModel.setProperty("/title", resources.i18n.getText("PageRuntime.CannotLoadPage.Text", [sPageId, sSpaceId]));
-                } else {
-                    this._oErrorPageModel.setProperty("/title", resources.i18n.getText("PageRuntime.GeneralError.Text"));
-                }
+                this._oErrorPageModel.setProperty("/title", resources.i18n.getText("PageRuntime.GeneralError.Text"));
+                this._oErrorPageModel.setProperty("/details", resources.i18n.getText("PageRuntime.CannotLoadPage.SystemErrorMessagePrefix", [JSON.stringify(vError)]));
+                this._oErrorPageModel.setProperty("/technicalError", JSON.stringify(vError));
+                this._oErrorPageModel.setProperty("/pageAndSpaceId", "");
             }
 
-            // reset description
             this._oErrorPageModel.setProperty("/description", "");
 
             this.oPagesRuntimeNavContainer.to(this.oErrorPage);
@@ -521,7 +528,6 @@ sap.ui.define([
 
             this._onAfterPageNavigated();
         },
-
         /**
          * Loops through every page in the inner NavContainer and displays
          * the one which was specified. Also determines if the page title should be shown.
@@ -656,8 +662,29 @@ sap.ui.define([
          * @private
          */
         _pressViewDetailsButton: function () {
-            var sErrorDetails = this._oErrorPageModel.getProperty("/details") || "";
-            this._oErrorPageModel.setProperty("/description", sErrorDetails);
+            if (!this._oDialog) {
+                Fragment.load({
+                    name: "sap.ushell.components.pages.fragment.DialogPageNotExists",
+                    controller: this
+                }).then(function (oDialog) {
+                    this._oDialog = oDialog;
+                    this.getView().addDependent(this._oDialog);
+                    this._oDialog.open();
+                }.bind(this));
+            } else {
+                this._oDialog.open();
+
+            }
+        },
+
+        /**
+         * Closes the PageNotExists Dialog
+         *
+         * @since 1.132.0
+         * @private
+         */
+        _onDialogClose: function () {
+            this._oDialog.close();
         },
 
         /**
@@ -667,7 +694,13 @@ sap.ui.define([
          * @private
          */
         _copyToClipboard: function () {
-            var bResult = ushellUtils.copyToClipboard(this._oErrorPageModel.getProperty("/description"));
+            let sError;
+            if (this._oErrorPageModel.getProperty("/pageAndSpaceId")) {
+                sError = this._oErrorPageModel.getProperty("/technicalError") + "\n" + this._oErrorPageModel.getProperty("/pageAndSpaceId");
+            } else {
+                sError = this._oErrorPageModel.getProperty("/technicalError");
+            }
+            var bResult = ushellUtils.copyToClipboard(sError);
             if (bResult) {
                 MessageToast.show(resources.i18n.getText("PageRuntime.CannotLoadPage.CopySuccess"), {
                     closeOnBrowserNavigation: false

package/src/main/js/sap/ushell/components/pages/fragment/DialogPageNotExists.fragment.xml

@@ -0,0 +1,27 @@
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
+    <Dialog
+        id="pageNotExistsDialog"
+        title="Error"
+        class="sapUiResponsivePadding"
+        state="Error">
+        <content>
+            <VBox class="sapUiSmallMargin">
+                <Text text="{errorPage>/details}" />
+                <Text text="{errorPage>/pageAndSpaceId}" />
+            </VBox>
+        </content>
+        <beginButton>
+            <Button
+                id="pageNotExistsDialogCopyButton"
+                text="Copy"
+                press="._copyToClipboard" />
+        </beginButton>
+        <endButton>
+            <Button
+                id="pageNotExistsDialogCancelButton"
+                text="Close"
+                press="._onDialogClose"
+                type="Emphasized" />
+        </endButton>
+    </Dialog>
+</core:FragmentDefinition>

package/src/main/js/sap/ushell/components/pages/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.pages",
         "applicationVersion": {
-            "version": "1.131.1"
+            "version": "1.132.0"
         },
         "i18n": {
             "bundleUrl": "../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/pages/view/PageRuntime.view.xml

@@ -80,18 +80,13 @@
             <IllustratedMessage
                 title="{errorPage>/title}"
                 illustrationType="{= mobileLibrary.IllustratedMessageType.PageNotFound }"
-                enableDefaultTitleAndDescription="false"
-                description="{errorPage>/description}">
+                enableDefaultTitleAndDescription="false">
                 <additionalContent>
                     <Button
                         class="sapUiTinyMarginEnd"
                         text="{i18n>PageRuntime.CannotLoadPage.DetailsButton}"
                         visible="{= !!${errorPage>/details} &amp;&amp; !${errorPage>/description}}"
                         press="._pressViewDetailsButton"/>
-                    <Button
-                        text="{i18n>PageRuntime.CannotLoadPage.CopyButton}"
-                        visible="{= !!${errorPage>/details}}"
-                        press="._copyToClipboard"/>
                 </additionalContent>
             </IllustratedMessage>
         </Page>

package/src/main/js/sap/ushell/components/runtimeSwitcher/controller/RuntimeSwitcher.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.131.1
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

package/src/main/js/sap/ushell/components/runtimeSwitcher/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.runtimeSwitcher",
         "applicationVersion": {
-            "version": "1.131.1"
+            "version": "1.132.0"
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",

package/src/main/js/sap/ushell/components/shell/FloatingContainer/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.FloatingContainer",
         "applicationVersion": {
-            "version": "1.131.1"
+            "version": "1.132.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -340,6 +340,7 @@ sap.ui.define([
             return new IconTabFilter(sId, {
                 key: oData.uid, // is not unique if used multiple times in a hierarchy
                 text: "{menu>title}",
+                icon: "{menu>icon}",
                 enabled: "{viewConfiguration>/enableMenuBarNavigation}",
                 items: {
                     path: "menu>menuEntries",

package/src/main/js/sap/ushell/components/shell/MenuBar/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
         "applicationVersion": {
-            "version": "1.131.1"
+            "version": "1.132.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.131.1
+ * @version 1.132.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.NavigationBarMenu",
         "applicationVersion": {
-            "version": "1.131.1"
+            "version": "1.132.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -49,7 +49,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.Notifications.Component", {
         metadata: {
-            version: "1.131.1",
+            version: "1.132.0",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]

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

@@ -35,7 +35,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.ProductSwitch.Component", {
 
         metadata: {
-            version: "1.131.1",
+            version: "1.132.0",
             library: "sap.ushell.components.shell.ProductSwitch",
             dependencies: {
                 libs: {

package/src/main/js/sap/ushell/components/shell/Search/manifest.json

@@ -4,7 +4,7 @@
         "id": "sap.ushell.components.shell.Search",
 
         "applicationVersion": {
-            "version": "1.131.1"
+            "version": "1.132.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -31,7 +31,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.131.1",
+            version: "1.132.0",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]

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

@@ -57,7 +57,6 @@ sap.ui.define([
             this._toggleSearchPopover(false);
             this._oPlaceHolderSF = Element.getElementById("PlaceHolderSearchField");
             this._registerHandleHashChange();
-
             var sPlatform = Container.getFLPPlatform(true);
             if (sPlatform === "MYHOME") {
                 this._bIsMyHome = true;
@@ -72,11 +71,6 @@ sap.ui.define([
 
             this.oSF.focus();
 
-            if (this.bOpeningPopOver === true && this._oPopover.isOpen() === true) {
-                this.bOpeningPopOver = false;
-                return;
-            }
-
             var sValue = oEvent.getParameter("suggestValue");
             this._testProviders(sValue);
         },
@@ -113,7 +107,6 @@ sap.ui.define([
 
                 this.oSF.setValue("");
                 this._oPlaceHolderSF.setValue("");
-                this.bOpeningPopOver = false;
 
                 this._testProviders();
 
@@ -485,7 +478,7 @@ sap.ui.define([
             sIconPath = oContext.getProperty("icon"),
             sScreenSize = this._getScreenSize(),
             sProviderLabel = oContext.getProperty("contentProviderLabel"),
-            aDisplayingLists = ["SearchResultList","FrequentlyUsedAppsList"],
+            aDisplayingLists = ["SearchResultList", "FrequentlyUsedAppsList"],
             bEnabled = Config.last("/core/contentProviders/providerInfo/enabled"),
             bShowContentProviderInfoOnVisualizations = Config.last("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations");
 
@@ -714,7 +707,7 @@ sap.ui.define([
                                     break;
                             }
                             this.oSF.focus();
-                        }  else {
+                        } else {
                             oModel.setProperty("/" + oProviderRef.name, []);
                             // custom behavior for default providers
                             switch (oListRef.getId()) {
@@ -740,9 +733,9 @@ sap.ui.define([
 
             // add items to list
             if (iNumOfItems === 1) {
-                sNewAriaText = resources.i18n.getText("one_result_search_aria", iNumOfItems);
+                sNewAriaText = resources.i18n.getText("one_result_search_aria", [iNumOfItems]);
             } else if (iNumOfItems > 1) {
-                sNewAriaText = resources.i18n.getText("multiple_results_search_aria", iNumOfItems);
+                sNewAriaText = resources.i18n.getText("multiple_results_search_aria", [iNumOfItems]);
             } else {
                 sNewAriaText = resources.i18n.getText("no_results_search_aria");
             }
@@ -794,7 +787,6 @@ sap.ui.define([
                 }.bind(this));
             } else if (bOpen) {
                 this._oPopover.openBy(this._oPlaceHolderSF);
-                this.bOpeningPopOver = true;
 
                 if (this._oPlaceHolderSF.getValue() !== "") {
                     this.oSF.setValue(this._oPlaceHolderSF.getValue());

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.131.1
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.131.1
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module is the search provider main interface
- * @version 1.131.1
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/ushell/resources",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchServiceProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.131.1
+ * @version 1.132.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -49,7 +49,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.Settings.Component", {
 
         metadata: {
-            version: "1.131.1",
+            version: "1.132.0",
             library: "sap.ushell",
             dependencies: {
                 libs: {

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

@@ -136,6 +136,7 @@ sap.ui.define([
                     name: oCurrentTheme?.name || sCurrentThemeId,
                     icon: "sap-icon://palette",
                     avatar: _getAvatarUrl(oCurrentTheme),
+                    mode: "InlineSvg", // can be a combined svg
                     deprecated: false,
                     isSelected: true
                 }];
@@ -149,7 +150,8 @@ sap.ui.define([
                         id: set.id,
                         name: sCommonText,
                         icon: "sap-icon://sys-monitor",
-                        avatar: undefined, // TBD: replace with _getAvatarUrl(set), as soon as the sap.m.Image bug is fixed
+                        avatar: _getAvatarUrl(set),
+                        mode: "InlineSvg", // combined svg files can be only shown with inline decomposition
                         deprecated: set.deprecated === true,
                         setId: set.id,
                         isSelected: false
@@ -166,6 +168,7 @@ sap.ui.define([
                     name: theme?.name || theme?.id || "",
                     icon: "sap-icon://palette",
                     avatar: _getAvatarUrl(theme),
+                    mode: "Image", // specific theme svg can be displayed with an img tag
                     deprecated: theme?.deprecated === true,
                     setId: oThemeSet.id,
                     isSelected: false

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

@@ -41,7 +41,7 @@
                                 <Image
                                     class="sapUiSmallMarginBeginEnd"
                                     src="{avatar}"
-                                    mode="InlineSvg"
+                                    mode="{mode}"
                                     visible="{= !!${avatar}}"
                                     height="50px"
                                     width="50px"

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

@@ -42,6 +42,21 @@ sap.ui.define([
                     var bIsEnableSetUserPreference = UserInfo.getUserSettingListEditSupported();//Check if adapter supports user setting editing
 
                     var aUserPreferenceAndLanguageSettingPromises = [];
+
+                    // todo: ABAP specific code should be moved to ushell_abap
+                    // Some preferences are managed by CUA (Central User Administration) and should not be set by the user in FLP settings
+                    // The ABAP platform sets only 1 (read_only) and 3 (optional) to the related fields. For read_only fields, set editable to false.
+                    // Note: CUA editState flags are available only on ABAP platform.
+                    const _isEnabled = (sParameter) => this.oUser.getEditState(sParameter) !== 1;
+                    const oCuaFlags = {
+                        preferredLogonLanguage: _isEnabled("PREFERRED_LOGON_LANGUAGE"),
+                        dateFormat: _isEnabled("DATE_FORMAT"),
+                        timeFormat: _isEnabled("TIME_FORMAT"),
+                        numberFormat: _isEnabled("DECIMAL_NOTATION"),
+                        timeZone: _isEnabled("TIME_ZONE")
+                    };
+                    oCuaFlags.showWarning = Object.values(oCuaFlags).some((bEnabled) => bEnabled === false);
+
                     if (bIsEnableSetUserPreference) {
                         sDatePattern = Formatting.getABAPDateFormat();
                         sTimeFormat = Formatting.getABAPTimeFormat();
@@ -62,6 +77,7 @@ sap.ui.define([
                         NumberFormatList: null,
                         TimeZoneList: null,
                         CalendarWeekNumberingList: null,
+                        cuaFlags: oCuaFlags,
                         selectedLanguage: this.oUser.getLanguage(),
                         selectedLanguageText: this.oUser.getLanguageText(),
                         selectedDatePattern: sDatePattern,

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

@@ -5,6 +5,13 @@
     xmlns:core="sap.ui.core">
 
     <VBox class="sapUiSmallMargin" visible="{= !!${/isSettingsLoaded}}">
+        <MessageStrip
+            text="{i18n>SettingsCuaWarning}"
+            type="Information"
+            visible="{/cuaFlags/showWarning}"
+            showIcon="true"
+            showCloseButton="false"
+            class="sapUiMediumMarginBottom" />
         <form:SimpleForm
             id="languageForm"
             editable="true"
@@ -18,6 +25,7 @@
                 <Label text="{i18n>languageAndRegionTit}" visible="{= !!${/languageList}}" labelFor="languageSelectionSelect"/>
                 <ComboBox id="languageSelectionSelect"
                     visible="{= !!${/languageList} }"
+                    enabled="{/cuaFlags/preferredLogonLanguage}"
                     items="{/languageList}"
                     selectedKey="{/selectedLanguage}"
                     valueState="{= ${/selectedLanguage} ? 'None' : 'Error'}"
@@ -29,23 +37,36 @@
                 <Label text="{i18n>dateFormatFld}" visible="{= !${/DateFormatList}}" labelFor="dateFormatCombo"/>
                 <Text id="dateFormatCombo" visible="{= !${/DateFormatList}}" text="{/selectedDatePattern}" />
                 <Label text="{i18n>dateFormatFld}" visible="{= !!${/DateFormatList}}" labelFor="DateFormatSelectionSelect"/>
-                <Select id="DateFormatSelectionSelect" visible="{= !!${/DateFormatList}}" items="{/DateFormatList}" width="100%" selectedKey="{/selectedDatePattern}">
+                <Select id="DateFormatSelectionSelect"
+                    visible="{= !!${/DateFormatList}}"
+                    enabled="{/cuaFlags/dateFormat}"
+                    items="{/DateFormatList}"
+                    width="100%"
+                    selectedKey="{/selectedDatePattern}">
                     <core:Item key="{value}" text="{description}" />
                 </Select>
 
                 <Label text="{i18n>weekNumberingFld}" visible="{=!!${/CalendarWeekNumberingList}}" labelFor="WeekNumberingSelectionSelect"/>
-                <Select id="WeekNumberingSelectionSelect" showSecondaryValues="true" visible="{=!!${/CalendarWeekNumberingList}}" items="{/CalendarWeekNumberingList}" width="100%" selectedKey="{/selectedCalendarWeekNumbering}" wrapItemsText="true" columnRatio="2:3">
+                <Select id="WeekNumberingSelectionSelect"
+                    showSecondaryValues="true"
+                    visible="{=!!${/CalendarWeekNumberingList}}"
+                    items="{/CalendarWeekNumberingList}"
+                    width="100%"
+                    selectedKey="{/selectedCalendarWeekNumbering}"
+                    wrapItemsText="true"
+                    columnRatio="2:3">
                     <core:ListItem text="{title}" additionalText="{description}" key="{value}"/>
                 </Select>
 
                 <Label text="{i18n>timeZoneFld}" visible="{= ${/isEnableUserProfileSetting}}" labelFor="TimeZoneSelectionSelect" />
                 <ComboBox
                     id="TimeZoneSelectionSelect"
-                        visible="{= !!${/TimeZoneList}}"
-                        items="{
-                            path: '/TimeZoneList',
-                            sorter: { path: 'description' }
-                        }"
+                    visible="{= !!${/TimeZoneList}}"
+                    enabled="{/cuaFlags/timeZone}"
+                    items="{
+                        path: '/TimeZoneList',
+                        sorter: { path: 'description' }
+                    }"
                     width="100%"
                     selectedKey="{/selectedTimeZone}"
                     valueState="{= ${/selectedTimeZone} ? 'None' : 'Error'}"
@@ -63,12 +84,22 @@
                     </items>
                 </SegmentedButton>
                 <Label text="{i18n>timeFormatFld}" visible="{= !!${/TimeFormatList}}" labelFor="TimeFormatSelectionSelect"/>
-                <Select id="TimeFormatSelectionSelect" visible="{= !!${/TimeFormatList}}" items="{/TimeFormatList}" width="100%" selectedKey="{/selectedTimeFormat}">
+                <Select id="TimeFormatSelectionSelect"
+                    visible="{= !!${/TimeFormatList}}"
+                    enabled="{/cuaFlags/timeFormat}"
+                    items="{/TimeFormatList}"
+                    width="100%"
+                    selectedKey="{/selectedTimeFormat}">
                     <core:Item key="{value}" text="{description}" />
                 </Select>
 
                 <Label text="{i18n>numberFormatFld}" visible="{= ${/isEnableUserProfileSetting}}" labelFor="NumberFormatSelectionSelect" />
-                <Select id="NumberFormatSelectionSelect" visible="{= !!${/NumberFormatList}}" items="{/NumberFormatList}" width="100%" selectedKey="{/selectedNumberFormat}">
+                <Select id="NumberFormatSelectionSelect"
+                    visible="{= !!${/NumberFormatList}}"
+                    enabled="{/cuaFlags/numberFormat}"
+                    items="{/NumberFormatList}"
+                    width="100%"
+                    selectedKey="{/selectedNumberFormat}">
                     <core:Item key="{value}" text="{description}" />
                 </Select>
 

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

@@ -0,0 +1,57 @@
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+sap.ui.define([
+    "sap/ui/core/ComponentContainer",
+    "sap/ui/core/mvc/XMLView",
+    "sap/ui/core/UIComponent",
+    "sap/ushell/Container"
+], function (ComponentContainer, XMLView, UIComponent, Container) {
+    "use strict";
+
+    return UIComponent.extend("sap.ushell.components.shell.SideNavigation.Component", {
+        metadata: {
+            manifest: "json",
+            library: "sap.ushell",
+            interfaces: ["sap.ui.core.IAsyncContentCreation"]
+        },
+        init: function () {
+            UIComponent.prototype.init.apply(this, arguments);
+
+            this.oMenuModelPromise = Container.getServiceAsync("Menu")
+                .then((oMenuService) => {
+                    return Promise.all([
+                        oMenuService.getMenuModel(),
+                        oMenuService.isSideNavigationEnabled()
+                    ]);
+                })
+                .then((aResults) => {
+                    const oMenuModel = aResults[0];
+                    const bSideNavigationEnabled = aResults[1];
+
+                    this.setModel(oMenuModel, "sideNavigation");
+
+                    if (bSideNavigationEnabled) {
+                        return this.oViewPromise.then(() => {
+                            const oSideNavigation = new ComponentContainer({
+                                id: "SideNavigationComponentContainer",
+                                height: "100%",
+                                component: this
+                            });
+                            Container.getRendererInternal().setSideNavigation(oSideNavigation);
+                        });
+                    }
+            });
+        },
+
+        getMenuModelPromise: function () {
+            return this.oMenuModelPromise;
+        },
+
+        createContent: function () {
+            this.oViewPromise = XMLView.create({
+                viewName: "sap.ushell.components.shell.SideNavigation.view.SideNavigation"
+            });
+
+            return this.oViewPromise;
+        }
+    });
+});