@sapui5/sap.ushell 1.114.0 → 1.114.2

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

@@ -4,26 +4,38 @@
  * @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.114.0
+ * @version 1.114.2
  * @private
  */
 sap.ui.define([
+    "sap/ui/core/InvisibleMessage",
+    "sap/ui/core/library",
     "sap/ui/core/mvc/Controller",
     "sap/ui/core/Fragment",
     "sap/ui/model/Filter",
     "sap/ui/model/FilterOperator",
     "sap/ui/model/Sorter",
+    "sap/ushell/resources",
     "sap/ushell/utils/WindowUtils"
 ], function (
+    InvisibleMessage,
+    coreLibrary,
     Controller,
     Fragment,
     Filter,
     FilterOperator,
     Sorter,
+    resources,
     WindowUtils
 ) {
     "use strict";
 
+    // shortcut for sap.ui.core.dnd.RelativeDropPosition
+    var RelativeDropPosition = coreLibrary.dnd.RelativeDropPosition;
+
+    // shortcut for sap.ui.core.InvisibleMessageMode
+    var InvisibleMessageMode = coreLibrary.InvisibleMessageMode;
+
     /**
      * Controller of the NavigationBarMenu view.
      * It is responsible for the popover handling, pinning / unpinning spaces, rearranging spaces via DnD and do persistence of these changes.
@@ -46,8 +58,20 @@ sap.ui.define([
          * @since 1.114.0
          */
         onInit: function () {
-            this.oResourceBundle = this.getOwnerComponent().getModel("i18n").getResourceBundle();
             this.pMenuServicePromise = sap.ushell.Container.getServiceAsync("Menu");
+            this._oInvisibleMessageInstance = InvisibleMessage.getInstance();
+        },
+
+        /**
+         * UI5 lifecycle method which is called upon controller destruction.
+         *
+         * @private
+         * @since 1.117.0
+         */
+        onExit: function () {
+            if (this._oInvisibleMessageInstance) {
+                this._oInvisibleMessageInstance.destroy();
+            }
         },
 
         /**
@@ -58,7 +82,8 @@ sap.ui.define([
          * @private
          */
         _onPinnedSpacesUpdateFinished: function (oEvent) {
-            this.byId("PinnedSpacesTreeTitle").setText(this.oResourceBundle.getText("NavigationBarMenu.PinnedSpaces.Title", [oEvent.getParameter("total") || 0]));
+            var sPinnedSpacesTreeTitleText = resources.i18n.getText("NavigationBarMenu.PinnedSpaces.Title", [oEvent.getParameter("total") || 0]);
+            this.byId("PinnedSpacesTreeTitle").setText(sPinnedSpacesTreeTitleText);
         },
 
         /**
@@ -83,9 +108,11 @@ sap.ui.define([
                     return oNavigationBarMenuPopover;
                 }.bind(this));
             }
+
             this._pPopoverPromise.then(function (oNavigationBarMenuPopover) {
-                this._bindPinnedSpaces();
-                oNavigationBarMenuPopover.openBy(oNavigationBarMenuButton);
+                this._bindPinnedSpaces().then(function () {
+                    oNavigationBarMenuPopover.openBy(oNavigationBarMenuButton);
+                });
             }.bind(this));
         },
 
@@ -103,23 +130,42 @@ sap.ui.define([
 
         /**
          * Handles the click Event of the Pin Button. If the Space is pinned it will be unpinned and vice versa.
-         * @param {sap.ui.base.Event} oEvent Klick Event of the List Item Pin
+         * @param {sap.ui.base.Event} oEvent Click event of the list item pin button
          *
          * @since 1.114.0
          * @private
          */
         handlePinButtonPress: function (oEvent) {
-            var sSpacePath = oEvent.getSource().getBindingContext("spaces").getPath();
-            var isPinned = this.byId("NavigationBarMenuPopover").getModel("spaces").getProperty(sSpacePath + "/pinned");
+            var oPinButton = oEvent.getSource();
+            var sSpacePath = oPinButton.getBindingContext("spaces").getPath();
+            var isPinned = this.oModel.getProperty(sSpacePath + "/pinned");
             if (!isPinned) {
                 this._pinSpace(sSpacePath);
             } else {
                 this._unpinSpace(sSpacePath, true);
             }
+
+            // Focus the pinned spaces list again after the list item that had the focus is removed.
+            if (oPinButton.getId().includes("PinnedSpaces")) {
+                // First move the focus away from the list. Otherwise the pin button of the
+                // next item is focused instead of the item itself.
+                var oNavigationBarMenuPopover = this.byId("NavigationBarMenuPopover");
+                oNavigationBarMenuPopover.focus();
+                var oPinnedSpacesList = this.byId("PinnedSpaces");
+                var oDelegate = {
+                    onAfterRendering: function () {
+                        // This needs to be done in onAfterRendering as the Popover gets closed
+                        // if setting the focus is triggered too early.
+                        oPinnedSpacesList.focus();
+                        oPinnedSpacesList.removeEventDelegate(oDelegate);
+                    }
+                };
+                oPinnedSpacesList.addEventDelegate(oDelegate);
+            }
         },
 
         /**
-         * Unpins all pinnes Spaces.
+         * Unpins all pinned Spaces.
          *
          * @since 1.114.0
          * @private
@@ -144,16 +190,56 @@ sap.ui.define([
          * @private
          */
         rearrangePinnedSpaces: function (oEvent) {
-            var oSpacesModel = oEvent.getSource().getModel("spaces");
             var oDraggedSpaceContext = oEvent.getParameter("draggedControl").getBindingContext("spaces");
-            var iSourcePinnedSortOrder = oSpacesModel.getProperty(oDraggedSpaceContext.getPath()).pinnedSortOrder;
-            var oDroppedSpaceContext = oEvent.getParameter("droppedControl").getBindingContext("spaces");
-            var iDroppedPinnedSortOrder = oSpacesModel.getProperty(oDroppedSpaceContext.getPath()).pinnedSortOrder;
+            var iSourcePinnedSortOrder = this.oModel.getProperty(oDraggedSpaceContext.getPath()).pinnedSortOrder;
+            var oDroppedSpace = oEvent.getParameter("droppedControl");
+            var oDroppedSpaceContext = oDroppedSpace.getBindingContext("spaces");
+            var iDroppedPinnedSortOrder = this.oModel.getProperty(oDroppedSpaceContext.getPath()).pinnedSortOrder;
             var sDropPosition = oEvent.getParameter("dropPosition");
-            var iTargetPinnedSortOrder = iDroppedPinnedSortOrder + (sDropPosition === "After" ? 1 : 0);
+            var iTargetPinnedSortOrder = iDroppedPinnedSortOrder + (sDropPosition === RelativeDropPosition.After ? 1 : 0);
+
+            this._rearrangePinnedSpaces(iSourcePinnedSortOrder, iTargetPinnedSortOrder, oDroppedSpace, sDropPosition);
+        },
 
+
+        /**
+         * Rearranges the pinned spaces by using the Menu service.
+         *
+         * @param {int} sourceIndex Initial index of the control to be rearranged.
+         * @param {int} targetIndex Target index for the control to be rearranged.
+         *
+         * @since 1.117.0
+         * @private
+         */
+        _rearrangePinnedSpaces: function (sourceIndex, targetIndex, droppedItem, dropPosition) {
             this.pMenuServicePromise.then(function (oMenu) {
-                oMenu.moveMenuEntry(iSourcePinnedSortOrder, iTargetPinnedSortOrder);
+                oMenu.moveMenuEntry(sourceIndex, targetIndex);
+
+                // manage focus after move happened
+                var oPinnedSpacesTree = this.byId("PinnedSpaces");
+                var oDelegate = {
+                    onAfterRendering: function () {
+                        var aPinnedSpaces = oPinnedSpacesTree.getItems();
+                        var iDroppedItemPosition = oPinnedSpacesTree.indexOfItem(droppedItem);
+                        var focusIndex;
+                        if (sourceIndex < targetIndex) {
+                            focusIndex = iDroppedItemPosition - (dropPosition === RelativeDropPosition.Before ? 1 : 0);
+                        } else {
+                            focusIndex = iDroppedItemPosition + (dropPosition === RelativeDropPosition.After ? 1 : 0);
+                        }
+                        var oPinnedSpaceToFocus = aPinnedSpaces[focusIndex];
+                        if (oPinnedSpaceToFocus) {
+                            oPinnedSpaceToFocus.focus();
+                        }
+                        droppedItem.removeEventDelegate(oDelegate);
+                    }
+                };
+                droppedItem.addEventDelegate(oDelegate);
+
+                // announces the move
+                var sPinnedSpaceMovedMessage = resources.i18n.getText("NavigationBarMenu.PinnedSpaces.Moved");
+                this._oInvisibleMessageInstance.announce(sPinnedSpaceMovedMessage, InvisibleMessageMode.Polite);
+
                 this._savePinnedSpaces();
             }.bind(this));
         },
@@ -161,31 +247,89 @@ sap.ui.define([
         /**
          * Binds the pinned spaces to the Tree for pinned spaces.
          *
+         * @returns {Promise}
+         *  A promise which is resolved after the binding is performed
+         *
          * @since 1.114.0
          * @private
          */
         _bindPinnedSpaces: function () {
             var oPinnedSpaces = this.byId("PinnedSpaces");
-            Fragment.load({
-                type: "XML",
-                async: true,
-                controller: this,
-                name: "sap.ushell.components.shell.NavigationBarMenu.view.CustomTreeItem"
-            }).then(function (oCustomTreeItem) {
-                oPinnedSpaces.bindItems({
-                    path: "spaces>/",
-                    filters: [
-                        new Filter({ path: "pinned", operator: FilterOperator.EQ, value1: true }),
-                        new Filter({ path: "type", operator: FilterOperator.NE, value1: "separator" }),
-                        new Filter({ path: "isHomeEntry", operator: FilterOperator.EQ, value1: false })],
-                    sorter: [new Sorter({ path: "pinnedSortOrder", descending: false })],
-                    parameters: {
-                        arrayNames: ["menuEntries"]
-                    },
-                    template: oCustomTreeItem,
-                    templateShareable: false
-                });
-            });
+
+            if (!this._pCustomTreeItemPromise) {
+                this._pCustomTreeItemPromise = Fragment.load({
+                    type: "XML",
+                    async: true,
+                    controller: this,
+                    name: "sap.ushell.components.shell.NavigationBarMenu.view.CustomTreeItem"
+                }).then(function (oCustomTreeItem) {
+                    oCustomTreeItem.addEventDelegate({
+                        onsapdownmodifiers: this._handleSpacesSwap.bind(this),
+                        onsapupmodifiers: this._handleSpacesSwap.bind(this)
+                    });
+                    oPinnedSpaces.bindItems({
+                        path: "spaces>/",
+                        filters: [
+                            new Filter({ path: "pinned", operator: FilterOperator.EQ, value1: true }),
+                            new Filter({ path: "type", operator: FilterOperator.NE, value1: "separator" }),
+                            new Filter({ path: "isHomeEntry", operator: FilterOperator.EQ, value1: false })],
+                        sorter: [new Sorter({ path: "pinnedSortOrder", descending: false })],
+                        parameters: {
+                            arrayNames: ["menuEntries"]
+                        },
+                        template: oCustomTreeItem,
+                        templateShareable: false
+                    });
+                }.bind(this));
+            }
+
+            return this._pCustomTreeItemPromise;
+        },
+
+        /**
+         * Handles keydown events to rearranges the pinned spaces.
+         *
+         * @param {sap.ui.base.Event} oEvent Keydown Event to rearrange the pinned spaces
+         *
+         * @since 1.117.0
+         * @private
+         */
+        _handleSpacesSwap: function (oEvent) {
+            var oPinnedSpacesTree = this.byId("PinnedSpaces");
+            var aPinnedSpaces = oPinnedSpacesTree.getItems();
+            var oPinnedSpace;
+
+            for (var i = 0; i < aPinnedSpaces.length; i++) {
+                oPinnedSpace = aPinnedSpaces[i];
+
+                if (document.activeElement === oPinnedSpace.getFocusDomRef()) {
+                    var oSourceContext = oPinnedSpace.getBindingContext("spaces");
+                    var iSourcePinnedSortOrder = this.oModel.getProperty(oSourceContext.getPath()).pinnedSortOrder;
+                    var oTargetContext;
+                    var iTargetPinnedSortOrder;
+
+                    if (oEvent.type === "sapupmodifiers") {
+                        var oPreviousPinnedSpace = aPinnedSpaces[i - 1];
+                        if (oPreviousPinnedSpace) {
+                            oTargetContext = oPreviousPinnedSpace.getBindingContext("spaces");
+                            iTargetPinnedSortOrder = this.oModel.getProperty(oTargetContext.getPath()).pinnedSortOrder;
+                            this._rearrangePinnedSpaces(iSourcePinnedSortOrder, iTargetPinnedSortOrder, oPreviousPinnedSpace, RelativeDropPosition.Before);
+                            oEvent.preventDefault();
+                            oEvent.stopPropagation();
+                        }
+                    } else if (oEvent.type === "sapdownmodifiers") {
+                        var oNextPinnedSpace = aPinnedSpaces[i + 1];
+                        if (oNextPinnedSpace) {
+                            oTargetContext = oNextPinnedSpace.getBindingContext("spaces");
+                            iTargetPinnedSortOrder = this.oModel.getProperty(oTargetContext.getPath()).pinnedSortOrder;
+                            this._rearrangePinnedSpaces(iSourcePinnedSortOrder, iTargetPinnedSortOrder + 1, oNextPinnedSpace, RelativeDropPosition.After);
+                            oEvent.preventDefault();
+                            oEvent.stopPropagation();
+                        }
+                    }
+                    return;
+                }
+            }
         },
 
         /**
@@ -198,18 +342,19 @@ sap.ui.define([
          * @private
          */
         allSpacesFactory: function (sId, oContext) {
-            var oContextModel = oContext.getModel().getProperty(oContext.sPath);
+            var oMenuEntry = oContext.getModel().getProperty(oContext.getPath());
+            var aSubMenuEntries = oMenuEntry.menuEntries || [];
+
             var oSpaceItem = this.byId("AllSpaces").getDependents()[0].clone(sId);
-            var aMenuEntries = oContext.getModel().getProperty(oContext.sPath).menuEntries || [];
             oSpaceItem.setType("Active");
             oSpaceItem.attachPress(this.onMenuItemSelection, this);
             // If the space has only one page, this means no sub menu:
             // Hide expander & enable navigation
-            if (aMenuEntries.length < 1) {
+            if (aSubMenuEntries.length < 1) {
                 oSpaceItem.addStyleClass("sapMTreeItemBaseLeaf");
             }
 
-            if (oContextModel.type === "separator" || oContextModel.isHomeEntry) {
+            if (oMenuEntry.type === "separator" || oMenuEntry.isHomeEntry) {
                 oSpaceItem.setVisible(false);
             }
 
@@ -225,11 +370,8 @@ sap.ui.define([
          * @private
          */
         _unpinSpace: function (sSpacePath, bSaveUnpinning) {
-            var oNavigationBarMenuPopover = this.byId("NavigationBarMenuPopover");
-            var oModel = oNavigationBarMenuPopover.getModel("spaces");
-            oNavigationBarMenuPopover.focus();
-            oModel.setProperty(sSpacePath + "/pinned", false);
-            oModel.setProperty(sSpacePath + "/pinnedSortOrder", "-1");
+            this.oModel.setProperty(sSpacePath + "/pinned", false);
+            this.oModel.setProperty(sSpacePath + "/pinnedSortOrder", "-1");
             if (bSaveUnpinning) {
                 this._savePinnedSpaces();
             }
@@ -243,17 +385,16 @@ sap.ui.define([
          * @private
          */
         _pinSpace: function (sSpacePath) {
-            var oSpacesModel = this.byId("NavigationBarMenuPopover").getModel("spaces");
             var iNumberOfPinnedSpaces = this.byId("PinnedSpaces").getItems().length;
             // Since the MyHome and separator are part of the model (pinnedSortOrder 0 and 1), the 1st new pinned space starts with 2.
             var iNewPinnedSortOrder = 2;
             if (iNumberOfPinnedSpaces > 0) {
                 var oLastPinnedSpace = this.byId("PinnedSpaces").getItems()[iNumberOfPinnedSpaces - 1];
                 var sLastPinnedSpacePath = oLastPinnedSpace.getBindingContextPath("spaces");
-                iNewPinnedSortOrder = oSpacesModel.getProperty(sLastPinnedSpacePath + "/pinnedSortOrder") + 1;
+                iNewPinnedSortOrder = this.oModel.getProperty(sLastPinnedSpacePath + "/pinnedSortOrder") + 1;
             }
-            oSpacesModel.setProperty(sSpacePath + "/pinnedSortOrder", iNewPinnedSortOrder);
-            oSpacesModel.setProperty(sSpacePath + "/pinned", true);
+            this.oModel.setProperty(sSpacePath + "/pinnedSortOrder", iNewPinnedSortOrder);
+            this.oModel.setProperty(sSpacePath + "/pinned", true);
             this._savePinnedSpaces();
         },
 
@@ -316,7 +457,6 @@ sap.ui.define([
         onMenuItemSelection: function (oEvent) {
 
             // Access menu entry
-            var allSpaces = oEvent.getSource().getParent();
             var oListItem = oEvent.getSource();
             var oItemContextPath = oListItem.getBindingContextPath("spaces");
             var oListItemModelEntry = this.oModel.getProperty(oItemContextPath);
@@ -324,13 +464,7 @@ sap.ui.define([
             if (!bAmIAllSpacesItem) {
                 return;
             }
-            if (!oListItem.isLeaf()) {
-                if (oListItem.getExpanded()) {
-                    allSpaces.collapse(allSpaces.indexOfItem(oListItem));
-                } else {
-                    allSpaces.expand(allSpaces.indexOfItem(oListItem));
-                }
-            } else {
+            if (oListItem.isLeaf()) {
                 // Intent based navigation
                 if (oListItemModelEntry.type === "IBN") {
                     this._performCrossApplicationNavigation(oListItemModelEntry.target)
@@ -344,7 +478,6 @@ sap.ui.define([
                 }
                 return;
             }
-            this._savePinnedSpaces();
         },
 
         /**
@@ -355,7 +488,7 @@ sap.ui.define([
          */
         _savePinnedSpaces: function () {
             this.pMenuServicePromise.then(function (oMenu) {
-                this.byId("NavigationBarMenuPopover").getModel("spaces").refresh(true);
+                this.oModel.refresh(true);
                 return oMenu.savePersonalization();
             }.bind(this));
         }

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.114.0"
+            "version": "1.114.2"
         },
         "i18n": {
             "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/view/CustomTreeItem.fragment.xml

@@ -7,6 +7,7 @@
                 alignItems="Center"
                 width="100%">
                 <Text
+                    id="spaceTitle"
                     text="{spaces>title}"
                     tooltip="{spaces>title}">
                     <layoutData>
@@ -18,10 +19,9 @@
                     class="sapUiTinyMarginEnd"
                     icon="{= ${spaces>pinned} ? 'sap-icon://pushpin-on' : 'sap-icon://pushpin-off' }"
                     press=".handlePinButtonPress"
-                    tooltip="{= ${spaces>pinned} ? ${i18n>NavigationBarMenu.Button.UnpinSpace} :
-                ${i18n>NavigationBarMenu.Button.PinSpace} }"
-                    visible="{= ${spaces>pinned} === undefined ? false : true }">
-                </Button>
+                    tooltip="{= ${spaces>pinned} ? ${i18n>NavigationBarMenu.Button.UnpinSpace} : ${i18n>NavigationBarMenu.Button.PinSpace} }"
+                    visible="{= ${spaces>pinned} === undefined ? false : true }"
+                    ariaDescribedBy="spaceTitle" />
             </HBox>
         </content>
     </CustomTreeItem>

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/view/NavigationBarMenu.view.xml

@@ -7,8 +7,9 @@
     <Button
         id="navigationBarMenuButton"
         icon="sap-icon://menu2"
+        type="Emphasized"
         press=".openNavigationBarMenuPopover"
-        tooltip="{i18n>MenuBar.Personalization.Button}"
+        tooltip="{i18n>NavigationBarMenu.Button.OpenPopover}"
         ariaHasPopup="Dialog">
         <layoutData>
             <OverflowToolbarLayoutData priority="NeverOverflow" />

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/view/NavigationBarMenuPopover.fragment.xml

@@ -33,7 +33,14 @@
                             id="UnpinAllSpaces"
                             text="{i18n>NavigationBarMenu.Button.UnpinAll}"
                             tooltip="{i18n>NavigationBarMenu.Button.UnpinAll.Tooltip}"
-                            press=".unpinAllSpaces"></Button>
+                            press=".unpinAllSpaces">
+                            <customData>
+                                <core:CustomData
+                                    key="help-id"
+                                    value="shell-navigationBarMenu-unpinAllButton"
+                                    writeToDom="true" />
+                            </customData>
+                        </Button>
                     </Toolbar>
                 </headerToolbar>
             </Tree>

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

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

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

@@ -211,9 +211,6 @@ sap.ui.define([
                     };
 
                     var oShellNavigationMenu = new ShellNavigationMenu(sMenuId, {
-                        title: "{/application/title}",
-                        description: "{/title}",
-                        icon: "{/application/icon}",
                         showRelatedApps: oShellConfig.appState !== "lean",
                         items: {
                             path: "/application/hierarchy",
@@ -237,6 +234,7 @@ sap.ui.define([
                     var oShellAppTitle = Core.byId("shellAppTitle");
                     if (oShellAppTitle) {
                         oShellAppTitle.setNavigationMenu(oShellNavigationMenu);
+                        oShellAppTitle.setModel(oShellHeader.getModel());
                     }
                     aCreatedControlIds.push(sMenuId);
 

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

@@ -31,7 +31,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.ProductSwitch.Component", {
 
         metadata: {
-            version: "1.114.0",
+            version: "1.114.2",
             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.114.0"
+            "version": "1.114.2"
         },
         "i18n": {
             "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",

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

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

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.114.0
+ * @version 1.114.2
  */
 sap.ui.define([
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.114.0
+ * @version 1.114.2
  */
 sap.ui.define([
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.114.0
+ * @version 1.114.2
  */
 sap.ui.define([
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",

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.114.0
+ * @version 1.114.2
  */
 sap.ui.define([], function () {
     "use strict";

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

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

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/UserActionsMenu/Component.js

@@ -25,7 +25,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserActionsMenu.Component", {
 
         metadata: {
-            version: "1.114.0",
+            version: "1.114.2",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m"]

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.114.0",
+            version: "1.114.2",
             library: "sap.ushell.components.shell.UserImage",
             dependencies: {
                 libs: {

package/src/main/js/sap/ushell/components/visualizationOrganizer/Component.js

@@ -38,7 +38,7 @@ sap.ui.define([
     // visualizationOrganizer Component
     return UIComponent.extend("sap.ushell.components.visualizationOrganizer.Component", {
         metadata: {
-            version: "1.114.0",
+            version: "1.114.2",
             library: "sap.ushell",
             dependencies: { libs: ["sap.m"] },
             properties: {