@sapui5/sap.ushell 1.116.0 → 1.117.0

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

@@ -11,7 +11,6 @@ sap.ui.define([
     "sap/ushell/utils/WindowUtils",
     "sap/ui/thirdparty/jquery",
     "sap/ushell/resources",
-    "sap/ushell/utils/UrlParsing",
     "sap/ui/Device",
     "sap/ui/core/Configuration",
     "sap/base/util/UriParameters",
@@ -28,7 +27,6 @@ sap.ui.define([
     WindowUtils,
     jQuery,
     resources,
-    UrlParsing,
     Device,
     Configuration,
     UriParameters,
@@ -68,20 +66,6 @@ sap.ui.define([
                 return;
             }
 
-            var sUrl = sap.ushell.Container.getFLPUrl(true),
-                sHash = UrlParsing.getHash(sUrl),
-                sIntent = sHash.split("&/")[0];
-
-            if (this.bOnNavigationToResultPage === true &&
-                (sIntent === "Action-search" || sIntent === "WorkZoneSearchResult-display")
-            ) {
-                if (this._oPopover.isOpen()) {
-                    this._oPopover.close();
-                }
-                return;
-            }
-
-            this.bOnNavigationToResultPage = false;
             this.oSF.focus();
 
             if (this.bOpeningPopOver === true && this._oPopover.isOpen() === true) {
@@ -192,7 +176,6 @@ sap.ui.define([
             document.getElementById("CEPSearchField").style.height = nPlaceHolderSFHeight + "px";
             // add tooltip to CEP Search icon
             jQuery(this.oSF.getDomRef()).find("#CEPSearchField-search").attr("title", resources.i18n.getText("search"));
-            this._removeBottomDivider();
         },
 
         onAfterClose: function (oEvent) {
@@ -222,7 +205,7 @@ sap.ui.define([
                 var oListConfig = oList._getProviderConfig(),
                     sGroupName = this._getDefaultProviderGroupName(oListConfig.id);
                 // notify external search providers
-                if (oList.getVisible() && !sGroupName) {
+                if (!sGroupName) {
                     if (typeof oListConfig.popoverClosed === "function") {
                         var fnPopoverClosedHandler = oListConfig.popoverClosed;
                         fnPopoverClosedHandler(oEvent);
@@ -231,6 +214,14 @@ sap.ui.define([
             }.bind(this));
         },
 
+        getHomePageApps: function () {
+
+            var sGroupName = "homePageApplications",
+                oProductsProvider = SearchProvider.defaultProviders[sGroupName];
+
+            oProductsProvider.execSearch("", sGroupName);
+        },
+
         _listenToServiceEvents: function (oSearchCEPService) {
 
             EventHub.on("updateExtProviderLists").do(this._updateExtProviderLists.bind(this, oSearchCEPService));
@@ -275,7 +266,6 @@ sap.ui.define([
                         if (aExtProviders.length) {
                             this._testProviders(this.oSF.getValue());
                         }
-                        this._removeBottomDivider();
                     }
                 }.bind(this));
             }
@@ -411,15 +401,20 @@ sap.ui.define([
             return oListGroupMap[sProviderId];
         },
 
-        _removeBottomDivider: function () {
+        _removeTopListDivider: function () {
 
-            // remove divider under bottom list
+            // remove divider above top list
             setTimeout(function () {
-                var oBottomList = jQuery(this._oPopover.getDomRef()).find(".searchCEPList.sapUshellCEPListDivider").not(":hidden").last();
-                if (oBottomList.length) {
-                    oBottomList.addClass("bottomCEPlist");
+                var aLists = jQuery(this._oPopover.getDomRef()).find(".searchCEPList.sapUshellCEPListDivider").not(":hidden");
+                if (aLists.length) {
+                    jQuery.each(aLists, function (index) {
+                        if (jQuery(aLists[index]).hasClass("topCEPlist")) {
+                            jQuery(aLists[index]).removeClass("topCEPlist");
+                        }
+                    });
+                    jQuery(aLists[0]).addClass("topCEPlist");
                 }
-            }.bind(this), 100);
+            }.bind(this), 300);
         },
 
         _createList: function (oConfiguration, oModel) {
@@ -529,7 +524,6 @@ sap.ui.define([
                     // deprecated growingStart
                     oList.setGrowingThreshold(iThreshold);
                 }
-                this._removeBottomDivider();
             }
         },
 
@@ -602,6 +596,17 @@ sap.ui.define([
 
                         if (aResult && Array.isArray(aResult) && aResult.length > 0) {
 
+                            // if Promise resolves with a delay and a new loop has already started - recheck priority
+                            var sCurrentQuery = this._oResultModel.getProperty("/query");
+                            if (sCurrentQuery && (sCurrentQuery.length < oProviderRef.minQueryLength
+                                || sCurrentQuery.length > oProviderRef.maxQueryLength)) {
+                                return;
+                            }
+
+                            if (!this._oPopover.isOpen()) {
+                                this._toggleSearchPopover(true);
+                            }
+
                             // trigger list update after popover is reopened (native events are not firing)
                             if (oModel.getProperty("/" + oProviderRef.name)) {
                                 this.bGrowingReset = false;
@@ -609,9 +614,6 @@ sap.ui.define([
                             }
 
                             oListRef.setVisible(true);
-                            if (!this._oPopover.isOpen()) {
-                                this._toggleSearchPopover(true);
-                            }
 
                             var aResultItems = aResult.slice(0, oProviderRef.maxItemCount);
                             oModel.setProperty("/" + oProviderRef.name, aResultItems);
@@ -638,7 +640,7 @@ sap.ui.define([
                     }.bind(this, oList, oProvider));
                 }
             }
-            this._removeBottomDivider();
+            this._removeTopListDivider();
         },
 
         _applyResultsAcc: function (iNumOfItems) {
@@ -867,6 +869,7 @@ sap.ui.define([
         },
 
         _navigateToResultPage: function (sTerm, bAll) {
+
             if (sTerm === "") {
                 return;
             }
@@ -875,7 +878,7 @@ sap.ui.define([
                 sHash = "#Action-search&/top=20&filter={\"dataSource\":{\"type\":\"Category\",\"id\":\"All\",\"label\":\"All\",\"labelPlural\":\"All\"},\"searchTerm\":\"" +
                     sTerm + "\",\"rootCondition\":{\"type\":\"Complex\",\"operator\":\"And\",\"conditions\":[]}}";
             }
-            this.bOnNavigationToResultPage = true;
+
             var pNavServicePromise = sap.ushell.Container.getServiceAsync("CrossApplicationNavigation");
             pNavServicePromise.then(function (oCrossAppNavService) {
                 oCrossAppNavService.toExternal({
@@ -884,15 +887,6 @@ sap.ui.define([
                     }
                 });
             });
-            setTimeout(function () {
-                if (this._oPopover.isOpen()) {
-                    this._oPopover.close();
-                }
-            }.bind(this), 500);
-
-            setTimeout(function () {
-                this.bOnNavigationToResultPage = false;
-            }.bind(this), 3000);
         }
     });
 });

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.116.0
+ * @version 1.117.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.116.0
+ * @version 1.117.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.116.0
+ * @version 1.117.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.116.0
+ * @version 1.117.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -69,18 +69,15 @@ sap.ui.define([
                 case "applications":
                     oParams.searchTerm = sQuery;
                     oParams.filter = {
-                        filters: [
-                            {
+                        filters: [{
                                 path: "technicalAttributes",
                                 operator: "NotContains",
                                 value1: "APPTYPE_SEARCHAPP"
-                            },
-                            {
+                            }, {
                                 path: "technicalAttributes",
                             operator: "NotContains",
                             value1: "APPTYPE_HOMEPAGE"
-                        }
-                    ],
+                        }],
                     and: true
                 };
                 break;

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.116.0",
+            version: "1.117.0",
             library: "sap.ushell",
             dependencies: {
                 libs: {

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

@@ -1,9 +1,11 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
-sap.ui.define([], function () {
+sap.ui.define([
+    "sap/ui/core/Core"
+], function (Core) {
     "use strict";
     var sUserSettingsErrorDialogTarget = "sapUshellSettingsDialog/";
-    var oMessageManager = sap.ui.getCore().getMessageManager();
+    var oMessageManager = Core.getMessageManager();
 
     return {
         addMessage: addMessage,

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

@@ -35,8 +35,6 @@ sap.ui.define([
 ) {
     "use strict";
 
-    /* global Map */
-
     // shortcut for sap.ui.core.MessageType
     var MessageType = coreLibrary.MessageType;
 
@@ -51,11 +49,9 @@ sap.ui.define([
             // If it was a grouped entry, it contains all the ids of the entry inside of the group.
             this._aPreviouslySelectedItems = [];
 
-            if (!Device.system.phone) {
-                this.getView().byId("userSettingEntryList").addEventDelegate({
-                    onAfterRendering: this._listAfterRendering.bind(this)
-                });
-            }
+            this.getView().byId("userSettingEntryList").addEventDelegate({
+                onAfterRendering: this._listAfterRendering.bind(this)
+            });
 
             // stores all promises, containing just the content of an entry
             this._mLoadedEntryContent = new Map();
@@ -222,29 +218,31 @@ sap.ui.define([
                 this._setEntryValueResult(sEntryId);
             }.bind(this));
 
-            // If an entry was selected before the list was rerendered,
-            // this code will try to find either the main entry or any of its tabs,
-            // so that the user stays on the same entry, even if a tab was removed.
-            if (this._aPreviouslySelectedItems) {
-                for (var i = 0; i < this._aPreviouslySelectedItems.length; i++) {
-                    for (var j = 0; j < aItems.length; j++) {
-                        var oItem = aItems[j];
-                        if (oModel.getProperty(oItem.getBindingContextPath() + "/id") === this._aPreviouslySelectedItems[i]) {
-                            oMasterEntryList.setSelectedItem(oItem);
-                            this._toDetail(oItem);
-                            oItem.focus();
-                            return;
+            if (!Device.system.phone) {
+                // If an entry was selected before the list was rerendered,
+                // this code will try to find either the main entry or any of its tabs,
+                // so that the user stays on the same entry, even if a tab was removed.
+                if (this._aPreviouslySelectedItems) {
+                    for (var i = 0; i < this._aPreviouslySelectedItems.length; i++) {
+                        for (var j = 0; j < aItems.length; j++) {
+                            var oItem = aItems[j];
+                            if (oModel.getProperty(oItem.getBindingContextPath() + "/id") === this._aPreviouslySelectedItems[i]) {
+                                oMasterEntryList.setSelectedItem(oItem);
+                                this._toDetail(oItem);
+                                oItem.focus();
+                                return;
+                            }
                         }
                     }
                 }
-            }
 
-            var oFirstItem = aItems[0];
-            if (oFirstItem) {
-                oMasterEntryList.setSelectedItem(oFirstItem);
-                this._toDetail(oFirstItem);
-                // keep focus on the first item when reopen the dialog
-                oFirstItem.focus();
+                var oFirstItem = aItems[0];
+                if (oFirstItem) {
+                    oMasterEntryList.setSelectedItem(oFirstItem);
+                    this._toDetail(oFirstItem);
+                    // keep focus on the first item when reopen the dialog
+                    oFirstItem.focus();
+                }
             }
         },
 

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

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

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

@@ -61,11 +61,13 @@ sap.ui.define([
             oModel.setData({
                 icon: sIcon,
                 name: oUser.getFullName(),
+                id: oUser.getId(),
                 mail: oUser.getEmail(),
                 server: window.location.host,
                 imgConsentEnabled: this.imgConsentEnabled, //to show second tab
                 isImageConsentForUser: oUser.getImageConsent(), //CheckBox state
-                isResetPersonalizationVisible: this.isResetPersonalizationVisible || true
+                isResetPersonalizationVisible: this.isResetPersonalizationVisible || true,
+                displayUserId: Config.last("/core/userSettings/displayUserId")
             });
             return oModel;
         },

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

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

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

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

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

@@ -728,8 +728,26 @@ sap.ui.define([
                     var sParameterName = aDisplayedParameters[i].parameterName;
                     if (this.aChangedParamsNames.indexOf(sParameterName) > -1) {
                         var oOriginalParameter = this.oOriginalParameters[sParameterName];
-                        var oBoundModel = aDisplayedParameters[i].modelBind;
-                        oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, oOriginalParameter.valueObject.value || "");
+                        var oParameter = aDisplayedParameters[i];
+                        var oBoundModel = oParameter.modelBind;
+                        var oODataMetadataModel = oBoundModel.model ? oBoundModel.model.getMetaModel() : undefined;
+
+                        if (oODataMetadataModel) {
+                            var sNS = oODataMetadataModel.getObject("/dataServices/schema/0/namespace");
+                            var oType = oODataMetadataModel.getODataEntityType(sNS + "." + oParameter.editorMetadata.editorInfo.entityName);
+                            var oODataProp = oType.property.find(function (obj) { if (obj.name === oParameter.editorMetadata.editorInfo.propertyName) { return true; } });
+                            switch (oODataProp.type) {
+                                case "Edm.DateTime":
+                                        oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, new Date(oOriginalParameter.valueObject.value) || null);
+                                    break;
+                                default:
+                                    oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, oOriginalParameter.valueObject.value || "");
+                                    break;
+                            }
+                        } else {
+                            oBoundModel.model.setProperty(oBoundModel.sFullPropertyPath, oOriginalParameter.valueObject.value || "");
+                        }
+
                         if (oOriginalParameter.editorMetadata && oOriginalParameter.editorMetadata.extendedUsage) {
                             oBoundModel.extendedModel.setProperty("/" + sParameterName + "/valueObject/extendedValue",
                                 oOriginalParameter.valueObject.extendedValue || {});

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

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

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

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