@sapui5/sap.ushell 1.115.1 → 1.117.0

package/src/main/js/sap/ushell/components/contentFinder/view/AppSearchBox.fragment.xml

@@ -3,7 +3,7 @@
     xmlns:core="sap.ui.core"
     xmlns:launchpad="sap.ushell.ui.launchpad">
 
-    <CustomListItem class="sapUshellCepAppBox" highlight="{= ${added} ? 'Information' : 'None'}" selected="{selected}" accDescription="{:= ${parts: ['title', 'subtitle', 'added'], formatter: '.formatAppBoxAccDescription'}}">
+    <CustomListItem class="sapUshellCepAppBox" highlight="{= ${added} ? 'Information' : 'None'}" selected="{selected}" accDescription="{= ${parts: ['title', 'subtitle', 'added'], formatter: '.formatAppBoxAccDescription'}}">
         <customData>
             <launchpad:AccessibilityCustomData writeToDom="true" key="help-id" value="{:= ${dataHelpId}}"/>
         </customData>

package/src/main/js/sap/ushell/components/contentFinder/view/AppSearchPaginated.view.xml

@@ -7,8 +7,7 @@
     xmlns:grid="sap.ui.layout.cssgrid"
     controllerName="sap.ushell.components.contentFinder.controller.AppSearch"
     id="sapContentFinderAppSearch"
-    height="100%"
-    class="sapUiSizeCompact">
+    height="100%">
     <!-- The container needs any fixed height (e.g. minFlexSize="1px") to calculate the content heights. -->
     <l:FixFlex minFlexSize="1px">
         <l:fixContent>
@@ -16,7 +15,7 @@
                 id="appSearchOverflowToolbar"
                 asyncMode="false"
                 style="Clear"
-                class="sapCepContentFinderToolbar sapUiSmallMarginTop sapUiTinyMarginBottom sapCepContentFinderBeginEndPadding">
+                class="sapCepContentFinderToolbar sapUiMediumMargin">
                 <Title id="appBoxContainerTitle" titleStyle="H5" text="{
                     parts: [
                         '/activeNavigationTarget',

package/src/main/js/sap/ushell/components/contentFinder/view/WidgetGallery.view.xml

@@ -8,14 +8,8 @@
     controllerName="sap.ushell.components.contentFinder.controller.WidgetGallery"
     id="sapContentFinderWidgetGallery"
     height="100%">
-    <VBox class="sapCepContentFinderBeginEndPadding sapUiSmallMarginTop sapUiTinyMarginBottom">
-        <Title id="widgetGalleryTitle" titleStyle="H5" text="{i18n>ContentFinder.WidgetGallery.AllWidgets.Title}">
-            <layoutData>
-                <OverflowToolbarLayoutData minWidth="6rem" shrinkable="true" priority="High"/>
-            </layoutData>
-        </Title>
-    </VBox>
-    <VBox items="{path: '/widgetGallery/widgetGroups'}" class="sapCepContentFinderBeginEndPadding">
+
+    <VBox items="{path: '/widgetGallery/widgetGroups'}" class="sapUiMediumMargin">
         <items>
             <VBox class="sapUiTinyMarginBottom">
                 <OverflowToolbar asyncMode="true" style="Clear" class="sapCepContentFinderToolbar" visible="{= !!${title}}">

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

@@ -17,7 +17,7 @@ sap.ui.define([
 
         // use inline declaration instead of component.json to save 1 round trip
         metadata: {
-            version: "1.115.1",
+            version: "1.117.0",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m", "sap.ui.vbm", "sap.suite.ui.commons", "sap.ui.layout", "sap.viz"],

package/src/main/js/sap/ushell/components/homepage/ActionMode.js

@@ -20,7 +20,7 @@
  *  - Deactivation handler
  *  - Rendering tile action menu
  *
- * @version 1.115.1
+ * @version 1.117.0
  *
  * @deprecated since 1.112
  */
@@ -39,7 +39,8 @@ sap.ui.define([
     "sap/ui/core/Core",
     "sap/ushell/components/HomepageManager",
     "sap/ushell/resources",
-    "sap/ushell/utils/WindowUtils"
+    "sap/ushell/utils/WindowUtils",
+    "sap/ushell/EventHub"
 ], function (
     Log,
     Button,
@@ -49,7 +50,8 @@ sap.ui.define([
     Core,
     HomepageManager,
     resources,
-    WindowUtils
+    WindowUtils,
+    EventHub
 ) {
     "use strict";
 
@@ -330,6 +332,13 @@ sap.ui.define([
         if (oAction.press) {
             oAction.press(oTileControl);
         } else if (oAction.targetURL) {
+            EventHub.emit("UITracer.trace", {
+                reason: "LaunchApp",
+                source: "Tile",
+                data: {
+                    targetUrl: oAction.targetURL
+                }
+            });
             if (oAction.targetURL.indexOf("#") === 0) {
                 hasher.setHash(oAction.targetURL);
             } else {

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

@@ -6,6 +6,7 @@
  * @deprecated since 1.112
  */
 sap.ui.define([
+    "sap/ui/core/Core",
     "sap/ui/core/mvc/View",
     "sap/ui/core/UIComponent",
     "sap/ushell/bootstrap/common/common.load.model",
@@ -14,6 +15,7 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/resources"
 ], function (
+    Core,
     View,
     UIComponent,
     oModelWrapper,
@@ -51,7 +53,7 @@ sap.ui.define([
 
                 this.setModel(resources.i18nModel, "i18n");
 
-                sap.ui.getCore().getEventBus().subscribe("sap.ushell.services.UsageAnalytics", "usageAnalyticsStarted", function () {
+                Core.getEventBus().subscribe("sap.ushell.services.UsageAnalytics", "usageAnalyticsStarted", function () {
                     sap.ui.require(["sap/ushell/components/homepage/FLPAnalytics"]);
                 });
 

package/src/main/js/sap/ushell/components/homepage/DashboardContent.controller.js

@@ -127,10 +127,35 @@ sap.ui.define([
 
         dashboardTilePress: function (oEvent) {
             var oTileControl = oEvent.getSource();
+
             if (!oTileControl) {
                 return;
             }
+
             Core.getEventBus().publish("launchpad", "dashboardTileClick", { uuid: oTileControl.getUuid() });
+
+            if (Device.system.desktop) {
+                var oRenderer = sap.ushell.Container.getRenderer();
+                var oHomeRoute = oRenderer.getRouter().getRoute("home");
+
+                if (this._fnSetFocusOnLastVisitedTile) {
+                    // On tiles with with buttons, the tile press can be triggered without navigating
+                    oHomeRoute.detachBeforeMatched(this._fnSetFocusOnLastVisitedTile);
+                }
+
+                this._fnSetFocusOnLastVisitedTile = this._setFocusOnLastVisitedTile.bind(this, oTileControl, oHomeRoute);
+                oHomeRoute.attachBeforeMatched(this._fnSetFocusOnLastVisitedTile);
+            }
+        },
+
+        _setFocusOnLastVisitedTile: function (tileControl, homeRoute) {
+            sap.ui.require(["sap/ushell/components/ComponentKeysHandler"], function (ComponentKeysHandler) {
+                ComponentKeysHandler.getInstance().then(function (ComponentKeysHandlerInstance) {
+                    ComponentKeysHandlerInstance.moveScrollDashboard(tileControl.$());
+                    homeRoute.detachBeforeMatched(this._fnSetFocusOnLastVisitedTile);
+                    delete this._fnSetFocusOnLastVisitedTile;
+                }.bind(this));
+            }.bind(this));
         },
 
         _updateTopGroupInModel: function () {

package/src/main/js/sap/ushell/components/homepage/DashboardContent.view.js

@@ -5,7 +5,7 @@
  * with a header of type <code>sap.ushell.ui.launchpad.AnchorNavigationBar</code>
  * and content of type <code>sap.ushell.ui.launchpad.DashboardGroupsContainer</code>.
  *
- * @version 1.115.1
+ * @version 1.117.0
  * @name sap.ushell.components.homepage.DashboardContent.view
  *
  * @deprecated since 1.112
@@ -16,6 +16,7 @@ sap.ui.define([
     "sap/ui/core/library",
     "sap/m/Page",
     "sap/ui/core/Component",
+    "sap/ui/core/Core",
     "sap/ui/core/mvc/View",
     "sap/ui/Device",
     "sap/ui/model/Filter",
@@ -35,6 +36,7 @@ sap.ui.define([
     coreLibrary,
     Page,
     Component,
+    Core,
     View,
     Device,
     Filter,
@@ -76,10 +78,10 @@ sap.ui.define([
             this.oRenderer = sap.ushell.Container.getRenderer("fiori2");
             this.bIsHomeIntentRootIntent = utils.isFlpHomeIntent(this.oRenderer.getShellConfig().rootIntent);
 
-            sap.ui.getCore().getEventBus().subscribe("launchpad", "actionModeInactive", this._handleEditModeChange, this);
-            sap.ui.getCore().getEventBus().subscribe("launchpad", "actionModeActive", this._handleEditModeChange, this);
-            sap.ui.getCore().getEventBus().subscribe("launchpad", "contentRefresh", this._onDashboardShown, this);
-            sap.ui.getCore().getEventBus().subscribe("launchpad", "dashboardModelContentLoaded", this._onDashboardShown, this);
+            Core.getEventBus().subscribe("launchpad", "actionModeInactive", this._handleEditModeChange, this);
+            Core.getEventBus().subscribe("launchpad", "actionModeActive", this._handleEditModeChange, this);
+            Core.getEventBus().subscribe("launchpad", "contentRefresh", this._onDashboardShown, this);
+            Core.getEventBus().subscribe("launchpad", "dashboardModelContentLoaded", this._onDashboardShown, this);
 
             /**
              * In order to save performance we delay the actionmode, the footer creation and the overflow of the anchorBar
@@ -202,7 +204,7 @@ sap.ui.define([
                                 },
                                 onsaptabnext: function () {
                                     // If the OverflowButton is not visible, jump to the last visited Tile
-                                    if (!sap.ui.getCore().byId("sapUshellAnchorBarOverflowButton").getVisible()) {
+                                    if (!Core.byId("sapUshellAnchorBarOverflowButton").getVisible()) {
                                         ComponentKeysHandlerInstance.goToLastVisitedTile();
                                     }
                                 }
@@ -444,10 +446,10 @@ sap.ui.define([
                 this.oPage.destroy();
             }
 
-            sap.ui.getCore().getEventBus().unsubscribe("launchpad", "actionModeInactive", this._handleEditModeChange, this);
-            sap.ui.getCore().getEventBus().unsubscribe("launchpad", "actionModeActive", this._handleEditModeChange, this);
-            sap.ui.getCore().getEventBus().unsubscribe("launchpad", "contentRefresh", this._onDashboardShown, this);
-            sap.ui.getCore().getEventBus().unsubscribe("launchpad", "dashboardModelContentLoaded", this._onDashboardShown, this);
+            Core.getEventBus().unsubscribe("launchpad", "actionModeInactive", this._handleEditModeChange, this);
+            Core.getEventBus().unsubscribe("launchpad", "actionModeActive", this._handleEditModeChange, this);
+            Core.getEventBus().unsubscribe("launchpad", "contentRefresh", this._onDashboardShown, this);
+            Core.getEventBus().unsubscribe("launchpad", "dashboardModelContentLoaded", this._onDashboardShown, this);
         }
     });
 });

package/src/main/js/sap/ushell/components/homepage/DashboardGroupsBox.js

@@ -6,7 +6,7 @@
  * Exposes the public function <code>createGroupsBox</code>
  * @see sap.ushell.components.homepage.DashboardContent.view
  *
- * @version 1.115.1
+ * @version 1.117.0
  * @name sap.ushell.components.homepage.DashboardGroupsBox
  * @since 1.35.0
  *
@@ -29,7 +29,6 @@ sap.ui.define([
     "sap/ui/model/Filter",
     "sap/ui/model/FilterOperator",
     "sap/ui/performance/Measurement",
-    "sap/ui/thirdparty/jquery",
     "sap/ushell/library",
     "sap/ushell/components/homepage/ActionMode",
     "sap/ushell/Config",
@@ -59,7 +58,6 @@ sap.ui.define([
     Filter,
     FilterOperator,
     Measurement,
-    jQuery,
     ushellLibrary,
     ActionMode,
     Config,

package/src/main/js/sap/ushell/components/homepage/DashboardUIActions.js

@@ -5,7 +5,7 @@
  * Extends <code>sap.ui.base.Object</code><br>
  * Exposes the public function <code>initializeUIActions</code>
  *
- * @version 1.115.1
+ * @version 1.117.0
  * @name sap.ushell.components.homepage.DashboardUIActions
  * @since 1.35.0
  *
@@ -18,6 +18,7 @@ sap.ui.define([
     "sap/base/util/deepExtend",
     "sap/ui/base/Object",
     "sap/ui/core/Configuration",
+    "sap/ui/core/Core",
     "sap/ui/Device",
     "sap/ui/thirdparty/jquery",
     "sap/ushell/Layout"
@@ -26,6 +27,7 @@ sap.ui.define([
     deepExtend,
     baseObject,
     Configuration,
+    Core,
     Device,
     jQuery,
     Layout
@@ -57,13 +59,13 @@ sap.ui.define([
             this.UIActionsInitialized = false;
 
             // Enabling and disabling drag and drop of groups (groupsUIAction) depends of activation and activation of ActionMode
-            sap.ui.getCore().getEventBus().subscribe("launchpad", "actionModeActive", this._enableGroupUIActions, this);
-            sap.ui.getCore().getEventBus().subscribe("launchpad", "actionModeInactive", this._disableGroupUIActions, this);
+            Core.getEventBus().subscribe("launchpad", "actionModeActive", this._enableGroupUIActions, this);
+            Core.getEventBus().subscribe("launchpad", "actionModeInactive", this._disableGroupUIActions, this);
         },
 
         destroy: function () {
-            sap.ui.getCore().getEventBus().unsubscribe("launchpad", "actionModeActive", this._enableGroupUIActions, this);
-            sap.ui.getCore().getEventBus().unsubscribe("launchpad", "actionModeInactive", this._disableGroupUIActions, this);
+            Core.getEventBus().unsubscribe("launchpad", "actionModeActive", this._enableGroupUIActions, this);
+            Core.getEventBus().unsubscribe("launchpad", "actionModeInactive", this._disableGroupUIActions, this);
             DashboardUIActions.fnDashboardUIActionsGetter = undefined;
             this.oGroupUIActions = null;
             this.oTileUIActions = null;
@@ -291,7 +293,7 @@ sap.ui.define([
                 aLinkElements[i].removeAttribute("href");
             }
             this.oController._handleDrag.call(this.oController, evt, tileElement);
-            sap.ui.getCore().getEventBus().publish("launchpad", "sortableStart");
+            Core.getEventBus().publish("launchpad", "sortableStart");
         },
 
         _onBeforeCreateLinkClone: function (evt, LinkElement) {
@@ -481,7 +483,7 @@ sap.ui.define([
 
             Log.info("startPos - " + jQuery(ui).index());
             setTimeout(function () {
-                sap.ui.getCore().getEventBus().publish("launchpad", "sortableStart");
+                Core.getEventBus().publish("launchpad", "sortableStart");
             }, 0);
 
             //scroll to group
@@ -497,11 +499,11 @@ sap.ui.define([
         },
 
         _handleGroupDrop: function (evt, ui) {
-            var oBus = sap.ui.getCore().getEventBus(),
+            var oBus = Core.getEventBus(),
                 jQueryObj = jQuery(ui),
                 firstChildId = jQuery(jQueryObj.children()[0]).attr("id"),
-                oGroup = sap.ui.getCore().byId(firstChildId),
-                oDashboardGroups = sap.ui.getCore().byId("dashboardGroups"),
+                oGroup = Core.byId(firstChildId),
+                oDashboardGroups = Core.byId("dashboardGroups"),
                 oData = { group: oGroup, groupChanged: false, focus: false },
                 nNewIndex = jQueryObj.index();
 
@@ -511,7 +513,7 @@ sap.ui.define([
 
             this._handleGroupMoved(evt, { item: jQueryObj });
             jQueryObj.removeAttr("startPos");
-            sap.ui.getCore().getEventBus().publish("launchpad", "sortableStop");
+            Core.getEventBus().publish("launchpad", "sortableStop");
 
             // avoid tile to be clicked after group was dropped
             setTimeout(function () {

package/src/main/js/sap/ushell/components/homepage/FLPAnalytics.js

@@ -6,13 +6,13 @@
  * @deprecated since 1.112
  */
 sap.ui.define([
-    "sap/ushell/services/AppConfiguration", // TODO: pending dependency migration
     "sap/base/Log",
-    "sap/ui/thirdparty/jquery"
+    "sap/ui/core/Core",
+    "sap/ushell/services/AppConfiguration" // TODO: pending dependency migration
 ], function (
-    AppConfiguration,
     Log,
-    jQuery
+    Core,
+    AppConfiguration
 ) {
     "use strict";
 
@@ -23,10 +23,10 @@ sap.ui.define([
      */
 
     // Launchpad action events that trigger logging
-    var aObservedLaunchpadActions = ["deleteTile", "actionModeActive", "catalogTileClick", "dashboardTileClick", "dashboardTileLinkClick"],
-        oEventBus = sap.ui.getCore().getEventBus(),
-        that = this,
-        oLaunchedApplications = {};
+    var aObservedLaunchpadActions = ["deleteTile", "actionModeActive", "catalogTileClick", "dashboardTileClick", "dashboardTileLinkClick"];
+    var oEventBus = Core.getEventBus();
+    var that = this;
+    var oLaunchedApplications = {};
 
     function _logCustomEvent (eventType, customEventValue, aAdditionalValues) {
         sap.ushell.Container.getServiceAsync("UsageAnalytics").then(function (oUsageAnalytics) {
@@ -135,13 +135,13 @@ sap.ui.define([
      *
      * Logs a "Time in App" event
      */
-    jQuery(window).on("unload", function (event) {
-        var currentApp = window.location.hash.substr(1);
+    window.addEventListener("unload", function (event) {
+        var currentApp = window.location.hash.substring(1);
         logTimeInAppEvent(currentApp);
     });
 
     try {
-        sap.ui.getCore().byId("viewPortContainer").attachAfterNavigate(handleAfterNavigate, that);
+        Core.byId("viewPortContainer").attachAfterNavigate(handleAfterNavigate, that);
     } catch (e) {
         Log.warning("Failure when subscribing to viewPortContainer 'AfterNavigate' event", null, "sap.ushell.components.homepage.FLPAnalytics");
     }

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.homepage",
         "applicationVersion": {
-            "version": "1.115.1"
+            "version": "1.117.0"
         },
         "i18n": {
             "bundleUrl": "../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/pages/ActionMode.js

@@ -2,18 +2,18 @@
 /**
  * @fileOverview ActionMode for the PageRuntime view
  *
- * @version 1.115.1
+ * @version 1.117.0
  */
 
 sap.ui.define([
-    "sap/ui/core/library",
+    "sap/ui/core/Core",
     "sap/ui/Device",
     "sap/m/MessageBox",
     "sap/m/MessageToast",
     "sap/ushell/resources",
     "sap/ushell/EventHub",
     "sap/base/Log"
-], function (coreLibrary, Device, MessageBox, MessageToast, resources, EventHub, Log) {
+], function (Core, Device, MessageBox, MessageToast, resources, EventHub, Log) {
     "use strict";
 
     var ActionMode = {};
@@ -39,7 +39,7 @@ sap.ui.define([
 
         EventHub.emit("enableMenuBarNavigation", false);
 
-        var oActionModeButton = sap.ui.getCore().byId("ActionModeBtn");
+        var oActionModeButton = Core.byId("ActionModeBtn");
         this.sActionButtonActivateText = oActionModeButton.getText();
 
         sActionModeButtonText = sActionModeButtonText || resources.i18n.getText("PageRuntime.EditMode.Exit");
@@ -86,7 +86,7 @@ sap.ui.define([
         this.oController.handleMyHomeActionMode(false).catch(this.oController._onError.bind(this.oController));
         EventHub.emit("enableMenuBarNavigation", true);
 
-        var oActionModeButton = sap.ui.getCore().byId("ActionModeBtn");
+        var oActionModeButton = Core.byId("ActionModeBtn");
         oActionModeButton.setTooltip(this.sActionButtonActivateText);
         oActionModeButton.setText(this.sActionButtonActivateText);
 
@@ -155,7 +155,7 @@ sap.ui.define([
             var oDelegate = {
                 onAfterRendering: function () {
                     setTimeout(function () {
-                        oSource.getSections()[iSectionIndex].byId("title-edit").focus();
+                        oSource.getSections()[iSectionIndex].getTitleInput().focus();
                     }, 0);
                     oSource.removeEventDelegate(oDelegate);
                 }

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

@@ -5,7 +5,7 @@
  * #Shell-home or #Launchpad-openFLPPage if spaces are enabled (/core/spaces/enabled).
  * In the future it should completely replace the classical homepage.
  *
- * @version 1.115.1
+ * @version 1.117.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/MyHomeImport.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview MyHome migrate functionality for the PageRuntime view
  *
- * @version 1.115.1
+ * @version 1.117.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/StateManager.js

@@ -3,9 +3,10 @@
  * @fileOverview StateManager for pages runtime
  */
 sap.ui.define([
+    "sap/ui/core/Core",
     "sap/ushell/utils",
     "sap/ushell/EventHub"
-], function (ushellUtils, EventHub) {
+], function (Core, ushellUtils, EventHub) {
     "use strict";
 
     /**
@@ -49,7 +50,7 @@ sap.ui.define([
         this.oPagesNavContainer.attachNavigate(this._onPageNavigated, this);
         this._onTabNavigatedBind = this._onTabNavigated.bind(this);
         document.addEventListener("visibilitychange", this._onTabNavigatedBind);
-        this.oEventBus = sap.ui.getCore().getEventBus();
+        this.oEventBus = Core.getEventBus();
         this.oEventBus.subscribe("launchpad", "setConnectionToServer", this._onEnableRequests, this);
         this.oEventBus.subscribe("sap.ushell", "navigated", this._onShellNavigated, this);