@sapui5/sap.ushell 1.113.0 → 1.114.1

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

@@ -0,0 +1,16 @@
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+sap.ui.define([
+    "sap/ui/core/UIComponent"
+], function (UIComponent) {
+    "use strict";
+
+    return UIComponent.extend("sap.ushell.components.shell.NavigationBarMenu.Component", {
+        metadata: {
+            manifest: "json",
+            library: "sap.ushell"
+        },
+        init: function () {
+            UIComponent.prototype.init.apply(this, arguments);
+        }
+    });
+});

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

@@ -0,0 +1,360 @@
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+
+/**
+ * @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.1
+ * @private
+ */
+sap.ui.define([
+    "sap/ui/core/mvc/Controller",
+    "sap/ui/core/Fragment",
+    "sap/ui/model/Filter",
+    "sap/ui/model/FilterOperator",
+    "sap/ui/model/Sorter",
+    "sap/ushell/utils/WindowUtils"
+], function (
+    Controller,
+    Fragment,
+    Filter,
+    FilterOperator,
+    Sorter,
+    WindowUtils
+) {
+    "use strict";
+
+    /**
+     * 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.
+     *
+     * @param {string} sId Controller id
+     * @param {object} oParams Controller parameter
+     *
+     * @class
+     * @extends sap.ui.core.mvc.Controller
+     *
+     * @private
+     * @since 1.114.0
+     * @alias sap.ushell.components.shell.NavigationBarMenu.controller.NavigationBarMenu
+     */
+    return Controller.extend("sap.ushell.components.shell.NavigationBarMenu.controller.NavigationBarMenu", {
+        /**
+         * Initializes the controller. ResourceBundle and Menu service promise are set.
+         *
+         * @private
+         * @since 1.114.0
+         */
+        onInit: function () {
+            this.oResourceBundle = this.getOwnerComponent().getModel("i18n").getResourceBundle();
+            this.pMenuServicePromise = sap.ushell.Container.getServiceAsync("Menu");
+        },
+
+        /**
+         * Updates the the title of the pinned spaces tree to show the current number of spaces pinned.
+         * @param {sap.ui.base.Event} oEvent Update Event from the Pinned Spaces Tree
+         *
+         * @since 1.114.0
+         * @private
+         */
+        _onPinnedSpacesUpdateFinished: function (oEvent) {
+            this.byId("PinnedSpacesTreeTitle").setText(this.oResourceBundle.getText("NavigationBarMenu.PinnedSpaces.Title", [oEvent.getParameter("total") || 0]));
+        },
+
+        /**
+         * Opens the Navigation Bar Menu Popover. Sets the menu model from the menu bar to the popover.
+         * @param {sap.ui.base.Event} oEvent Press Event of the Button to open the Popover.
+         *
+         * @since 1.114.0
+         * @private
+         */
+        openNavigationBarMenuPopover: function (oEvent) {
+            var oNavigationBarMenuButton = oEvent.getSource();
+            if (!this._pPopoverPromise) {
+                this._pPopoverPromise = Fragment.load({
+                    type: "XML",
+                    id: this.getView().getId(),
+                    controller: this,
+                    name: "sap.ushell.components.shell.NavigationBarMenu.view.NavigationBarMenuPopover"
+                }).then(function (oNavigationBarMenuPopover) {
+                    this.oModel = this.getOwnerComponent().oPropagatedProperties.oModels.menu;
+                    oNavigationBarMenuPopover.setModel(this.oModel, "spaces");
+                    this.getView().addDependent(oNavigationBarMenuPopover);
+                    return oNavigationBarMenuPopover;
+                }.bind(this));
+            }
+            this._pPopoverPromise.then(function (oNavigationBarMenuPopover) {
+                this._bindPinnedSpaces();
+                oNavigationBarMenuPopover.openBy(oNavigationBarMenuButton);
+            }.bind(this));
+        },
+
+        /**
+         * Closes the navigation bar menu popover.
+         *
+         * @since 1.114.0
+         * @private
+         */
+        closeNavigationBarMenuPopover: function () {
+            this._pPopoverPromise.then(function (oPopover) {
+                oPopover.close();
+            });
+        },
+
+        /**
+         * 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
+         *
+         * @since 1.114.0
+         * @private
+         */
+        handlePinButtonPress: function (oEvent) {
+            var sSpacePath = oEvent.getSource().getBindingContext("spaces").getPath();
+            var isPinned = this.oModel.getProperty(sSpacePath + "/pinned");
+            if (!isPinned) {
+                this._pinSpace(sSpacePath);
+            } else {
+                this._unpinSpace(sSpacePath, true);
+            }
+        },
+
+        /**
+         * Unpins all pinned Spaces.
+         *
+         * @since 1.114.0
+         * @private
+         */
+        unpinAllSpaces: function () {
+            var oPinnedSpaces = this.byId("PinnedSpaces");
+            var aSpacesToUnpin = oPinnedSpaces.getItems();
+            oPinnedSpaces.unbindItems();
+            aSpacesToUnpin.forEach(function (oSpaceToUnpin) {
+                this._unpinSpace(oSpaceToUnpin.getBindingContextPath("spaces"), false);
+            }.bind(this));
+            this._savePinnedSpaces();
+            this._bindPinnedSpaces();
+        },
+
+        /**
+         * Rearranges the pinned spaces by using the Menu service.
+         *
+         * @param {sap.ui.base.Event} oEvent Drop Event to rearrange the pinned spaces
+         *
+         * @since 1.115.0
+         * @private
+         */
+        rearrangePinnedSpaces: function (oEvent) {
+            var oDraggedSpaceContext = oEvent.getParameter("draggedControl").getBindingContext("spaces");
+            var iSourcePinnedSortOrder = this.oModel.getProperty(oDraggedSpaceContext.getPath()).pinnedSortOrder;
+            var oDroppedSpaceContext = oEvent.getParameter("droppedControl").getBindingContext("spaces");
+            var iDroppedPinnedSortOrder = this.oModel.getProperty(oDroppedSpaceContext.getPath()).pinnedSortOrder;
+            var sDropPosition = oEvent.getParameter("dropPosition");
+            var iTargetPinnedSortOrder = iDroppedPinnedSortOrder + (sDropPosition === "After" ? 1 : 0);
+
+            this.pMenuServicePromise.then(function (oMenu) {
+                oMenu.moveMenuEntry(iSourcePinnedSortOrder, iTargetPinnedSortOrder);
+                this._savePinnedSpaces();
+            }.bind(this));
+        },
+
+        /**
+         * Binds the pinned spaces to the Tree for pinned spaces.
+         *
+         * @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
+                });
+            });
+        },
+
+        /**
+         * Creates a CustomTreeItem that only shows its expander and is navigateable if the space has more than one pages.
+         * @param {string} sId The id of the instantiating source.
+         * @param {object} oContext of the instantiating source.
+         * @returns {sap.m.CustomTreeItem} A CustomTreeItem that only shows the expander and is navigateable if more than one pages exist inside of the given space,
+         *
+         * @since 1.114.0
+         * @private
+         */
+        allSpacesFactory: function (sId, oContext) {
+            var oMenuEntry = oContext.getModel().getProperty(oContext.getPath());
+            var aSubMenuEntries = oMenuEntry.menuEntries || [];
+
+            var oSpaceItem = this.byId("AllSpaces").getDependents()[0].clone(sId);
+            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 (aSubMenuEntries.length < 1) {
+                oSpaceItem.addStyleClass("sapMTreeItemBaseLeaf");
+            }
+
+            if (oMenuEntry.type === "separator" || oMenuEntry.isHomeEntry) {
+                oSpaceItem.setVisible(false);
+            }
+
+            return oSpaceItem;
+        },
+
+        /**
+         * Unpins a single Space.
+         * @param {string} sSpacePath Path of the space in the model
+         * @param {boolean} bSaveUnpinning Shall the unpinning of a given space be saved to the personalization?
+         *
+         * @since 1.114.0
+         * @private
+         */
+        _unpinSpace: function (sSpacePath, bSaveUnpinning) {
+            var oNavigationBarMenuPopover = this.byId("NavigationBarMenuPopover");
+            oNavigationBarMenuPopover.focus();
+            this.oModel.setProperty(sSpacePath + "/pinned", false);
+            this.oModel.setProperty(sSpacePath + "/pinnedSortOrder", "-1");
+            if (bSaveUnpinning) {
+                this._savePinnedSpaces();
+            }
+        },
+
+        /**
+         * Pins a single Space. The pinnedSortOrder is set by taking the pinnedSortOrder of the last tree item and raising it by 1.
+         * @param {string} sSpacePath Path of the space in the model
+         *
+         * @since 1.114.0
+         * @private
+         */
+        _pinSpace: function (sSpacePath) {
+            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 = this.oModel.getProperty(sLastPinnedSpacePath + "/pinnedSortOrder") + 1;
+            }
+            this.oModel.setProperty(sSpacePath + "/pinnedSortOrder", iNewPinnedSortOrder);
+            this.oModel.setProperty(sSpacePath + "/pinned", true);
+            this._savePinnedSpaces();
+        },
+
+        /**
+         * Performs a Cross Application Navigation to the provided intent using the
+         * CrossApplicationNavigation service.
+         *
+         * @param {object} oDestinationTarget
+         *  The destination target which is used for the Cross Application Navigation
+         *
+         * @returns {Promise}
+         *  A promise which is resolved after the CrossAppNavigation is performed
+         *
+         * @private
+         * @since 1.114.0
+         */
+        _performCrossApplicationNavigation: function (oDestinationTarget) {
+            return sap.ushell.Container.getServiceAsync("CrossApplicationNavigation")
+                .then(function (oCANService) {
+                    var oParams = {};
+                    oDestinationTarget.parameters.forEach(function (oParameter) {
+                        if (oParameter.name && oParameter.value) {
+                            oParams[oParameter.name] = [oParameter.value];
+                        }
+                    });
+
+                    return oCANService.toExternal({
+                        target: {
+                            semanticObject: oDestinationTarget.semanticObject,
+                            action: oDestinationTarget.action
+                        },
+                        params: oParams
+                    });
+                });
+        },
+
+        /**
+          * Opens the provided URL in a new browser tab.
+          *
+          * @param {object} oDestinationTarget
+          *  The destination target which is used to determine the URL which should be
+          *  opened in a new browser tab
+          *
+          * @private
+          * @since 1.114.0
+          */
+        _openURL: function (oDestinationTarget) {
+            WindowUtils.openURL(oDestinationTarget.url, "_blank");
+        },
+
+        /**
+         * Determines the selected menu entry with the required navigation action
+         * according to the navigation type.
+         *
+         * @param {sap.ui.base.Event} oEvent The event containing the selected menu intent
+         *
+         * @private
+         * @since 1.114.0
+         */
+        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);
+            var bAmIAllSpacesItem = oEvent.getParameter("id").includes("AllSpaces");
+            if (!bAmIAllSpacesItem) {
+                return;
+            }
+            if (!oListItem.isLeaf()) {
+                if (oListItem.getExpanded()) {
+                    allSpaces.collapse(allSpaces.indexOfItem(oListItem));
+                } else {
+                    allSpaces.expand(allSpaces.indexOfItem(oListItem));
+                }
+            } else {
+                // Intent based navigation
+                if (oListItemModelEntry.type === "IBN") {
+                    this._performCrossApplicationNavigation(oListItemModelEntry.target)
+                        .then(this.closeNavigationBarMenuPopover.bind(this));
+                }
+
+                // URL
+                if (oListItemModelEntry.type === "URL") {
+                    this._openURL(oListItemModelEntry.target);
+                    this.closeNavigationBarMenuPopover();
+                }
+                return;
+            }
+        },
+
+        /**
+         * Saves the pinning, unpinning and rearranging changes to the personalization by using the Menu Service.
+         *
+         * @since 1.114.0
+         * @private
+         */
+        _savePinnedSpaces: function () {
+            this.pMenuServicePromise.then(function (oMenu) {
+                this.oModel.refresh(true);
+                return oMenu.savePersonalization();
+            }.bind(this));
+        }
+    });
+});

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

@@ -0,0 +1,52 @@
+{
+    "_version": "1.48.0",
+    "sap.app": {
+        "id": "sap.ushell.components.shell.NavigationBarMenu",
+        "applicationVersion": {
+            "version": "1.114.1"
+        },
+        "i18n": {
+            "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",
+            "fallbackLocale": "en"
+        },
+        "type": "component",
+        "ach": "CA-FLP-FE-COR",
+        "title": "{{Component.NavigationBarMenu.Title}}",
+        "resources": "resources.json"
+    },
+    "sap.ui": {
+        "technology": "UI5",
+        "deviceTypes": {
+            "desktop": true,
+            "phone": true,
+            "tablet": true
+        }
+    },
+    "sap.ui5": {
+        "rootView": {
+            "viewName": "sap.ushell.components.shell.NavigationBarMenu.view.NavigationBarMenu",
+            "type": "XML",
+            "async": true
+        },
+        "dependencies": {
+            "minUI5Version": "1.114",
+            "libs": {
+                "sap.m": {},
+                "sap.tnt": {},
+                "sap.ui.core": {}
+            }
+        },
+        "models": {
+            "i18n": {
+                "type": "sap.ui.model.resource.ResourceModel",
+                "settings": {
+                    "bundleName": "sap.ushell.renderers.fiori2.resources.resources"
+                }
+            }
+        },
+        "contentDensities": {
+            "compact": true,
+            "cozy": true
+        }
+    }
+}

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

@@ -0,0 +1,28 @@
+<core:FragmentDefinition
+    xmlns="sap.m"
+    xmlns:core="sap.ui.core">
+    <CustomTreeItem tooltip="{spaces>title}">
+        <content>
+            <HBox
+                alignItems="Center"
+                width="100%">
+                <Text
+                    text="{spaces>title}"
+                    tooltip="{spaces>title}">
+                    <layoutData>
+                        <FlexItemData growFactor="1" />
+                    </layoutData>
+                </Text>
+                <Button
+                    type="Transparent"
+                    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>
+            </HBox>
+        </content>
+    </CustomTreeItem>
+</core:FragmentDefinition>

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

@@ -0,0 +1,23 @@
+<mvc:View
+    xmlns="sap.m"
+    xmlns:core="sap.ui.core"
+    xmlns:mvc="sap.ui.core.mvc"
+    id="NavigationBarMenu"
+    controllerName="sap.ushell.components.shell.NavigationBarMenu.controller.NavigationBarMenu">
+    <Button
+        id="navigationBarMenuButton"
+        icon="sap-icon://menu2"
+        press=".openNavigationBarMenuPopover"
+        tooltip="{i18n>NavigationBarMenu.Button.OpenPopover}"
+        ariaHasPopup="Dialog">
+        <layoutData>
+            <OverflowToolbarLayoutData priority="NeverOverflow" />
+        </layoutData>
+        <customData>
+            <core:CustomData
+                key="help-id"
+                value="shell-navigationBarPersonalizationButton"
+                writeToDom="true" />
+        </customData>
+    </Button>
+</mvc:View>

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

@@ -0,0 +1,58 @@
+<core:FragmentDefinition
+    xmlns:dnd="sap.ui.core.dnd"
+    xmlns="sap.m"
+    xmlns:core="sap.ui.core">
+    <Popover
+        id="NavigationBarMenuPopover"
+        class="sapUiContentPadding"
+        placement="Bottom"
+        showHeader="false"
+        modal="false"
+        initialFocus="PinnedSpaces"
+        contentWidth="30rem">
+        <content>
+            <Tree
+                id="PinnedSpaces"
+                showSeparators="None"
+                noDataText="{i18n>NavigationBarMenu.PinnedSpaces.NoDataText}"
+                updateFinished="._onPinnedSpacesUpdateFinished">
+                <dragDropConfig>
+                    <dnd:DragDropInfo
+                        sourceAggregation="items"
+                        targetAggregation="items"
+                        dropPosition="Between"
+                        drop=".rearrangePinnedSpaces" />
+                </dragDropConfig>
+                <headerToolbar>
+                    <Toolbar>
+                        <Title
+                            id="PinnedSpacesTreeTitle"
+                            text="{i18n>NavigationBarMenu.PinnedSpaces.Title}" />
+                        <ToolbarSpacer />
+                        <Button
+                            id="UnpinAllSpaces"
+                            text="{i18n>NavigationBarMenu.Button.UnpinAll}"
+                            tooltip="{i18n>NavigationBarMenu.Button.UnpinAll.Tooltip}"
+                            press=".unpinAllSpaces"></Button>
+                    </Toolbar>
+                </headerToolbar>
+            </Tree>
+            <Tree
+                id="AllSpaces"
+                showSeparators="None"
+                noDataText="{i18n>NavigationBarMenu.AllSpaces.NoDataText}"
+                items="{path: 'spaces>/', parameters: {arrayNames: ['menuEntries']}, factory: '.allSpacesFactory'}">
+                <headerToolbar>
+                    <Toolbar>
+                        <Title text="{i18n>NavigationBarMenu.AllSpaces.Title}" />
+                    </Toolbar>
+                </headerToolbar>
+                <dependents>
+                    <core:Fragment
+                        fragmentName="sap.ushell.components.shell.NavigationBarMenu.view.CustomTreeItem"
+                        type="XML" />
+                </dependents>
+            </Tree>
+        </content>
+    </Popover>
+</core:FragmentDefinition>

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.113.0",
+            version: "1.114.1",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]

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.113.0",
+            version: "1.114.1",
             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.113.0"
+            "version": "1.114.1"
         },
         "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.113.0",
+            version: "1.114.1",
             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.113.0
+ * @version 1.114.1
  */
 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.113.0
+ * @version 1.114.1
  */
 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.113.0
+ * @version 1.114.1
  */
 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.113.0
+ * @version 1.114.1
  */
 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.113.0",
+            version: "1.114.1",
             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) {