@sapui5/sap.ushell 1.116.0 → 1.117.1

package/src/main/js/sap/ushell/components/container/IframePOSTUtils.js

@@ -0,0 +1,225 @@
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+/**
+ * @file This file contains miscellaneous utility functions for handling openning iframe with POST.
+ */
+sap.ui.define([
+    "sap/ui/core/Core",
+    "sap/base/Log",
+    "sap/base/util/UriParameters",
+    "sap/ui/thirdparty/jquery",
+    "sap/ui/thirdparty/URI",
+    "sap/ushell/utils",
+    "sap/ushell/resources",
+    "sap/ushell/Config"
+], function (
+    Core,
+    Log,
+    UriParameters,
+    jQuery,
+    URI,
+    utils,
+    resources,
+    Config
+) {
+    "use strict";
+
+    var IframePOSTUtils = {};
+    var _that = IframePOSTUtils;
+
+    IframePOSTUtils.renderIframeWithPOST = function (oRenderManager, oContainer, sUrl, iIframeIdx) {
+        oContainer.setProperty("iframeWithPost", true, true);
+        oContainer.oDeferredRenderer = new jQuery.Deferred();
+        sUrl = utils.filterOutParamsFromLegacyAppURL(sUrl);
+        var oAppStatesInfo = utils.getParamKeys(sUrl);
+
+        //generate the <div> element that wraps the <form> and the <iframe>
+        this.generateRootElementForIFrame(oRenderManager, oContainer, true);
+
+        if (oAppStatesInfo.aAppStateNamesArray.length > 0) {
+            sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCAService) {
+                oCAService.getAppStateData(oAppStatesInfo.aAppStateKeysArray).then(function (aDataArray) {
+                    var oNewRenderManager;
+                    var oDomRef = jQuery("#" + oContainer.getId());
+
+                    if (oDomRef.length > 0) {
+                        oNewRenderManager = Core.createRenderManager();
+                        _that.buildHTMLElements(oNewRenderManager, oContainer, aDataArray, oAppStatesInfo.aAppStateNamesArray, sUrl, iIframeIdx);
+                        oNewRenderManager.flush(oDomRef[0]);
+                        oNewRenderManager.destroy();
+                    } else {
+                        _that.buildHTMLElements(oRenderManager, oContainer, aDataArray, oAppStatesInfo.aAppStateNamesArray, sUrl, iIframeIdx);
+                    }
+
+                    setTimeout(oContainer.oDeferredRenderer.resolve, 0);
+                }, function (sError) {
+                    _that.buildHTMLElements(oRenderManager, oContainer, undefined, oAppStatesInfo.aAppStateNamesArray, sUrl, iIframeIdx);
+                    setTimeout(oContainer.oDeferredRenderer.resolve, 0);
+                });
+            });
+        } else {
+            _that.buildHTMLElements(oRenderManager, oContainer, undefined, oAppStatesInfo.aAppStateNamesArray, sUrl, iIframeIdx);
+            setTimeout(oContainer.oDeferredRenderer.resolve, 0);
+        }
+
+        this.generateRootElementForIFrame(oRenderManager, oContainer, false);
+    };
+
+    IframePOSTUtils.generateRootElementForIFrame = function (oRenderManager, oContainer, bStart) {
+        if (bStart) {
+            oRenderManager.openStart("div", oContainer)
+                .attr("sap-iframe-app", "true")
+                .class("sapUShellApplicationContainer")
+                .style("height", oContainer.getHeight())
+                .style("width", oContainer.getWidth())
+                .openEnd();
+
+        } else {
+            oRenderManager.close("div");
+        }
+    };
+
+    IframePOSTUtils.buildHTMLElements = function (oRenderManager, oContainer, aAdditionalDataArray, aInfoArray, sUrl, iIframeIdx) {
+        var sFormId = oContainer.getId() + "-form",
+            sPostAddParams = "",
+            bIsHidden = false;
+
+        if (aAdditionalDataArray === undefined) {
+            aAdditionalDataArray = [];
+        }
+        aAdditionalDataArray.push([sap.ushell.Container.getFLPUrl(true)]);
+        aInfoArray.push("sap-flp-url");
+        aAdditionalDataArray.push([oContainer.getSystemAlias()]);
+        aInfoArray.push("system-alias");
+
+        var valStr = "";
+        var obj = {};
+
+        aInfoArray.forEach(function (item, index) {
+            if (aAdditionalDataArray[index][0]) {
+                obj[item] = aAdditionalDataArray[index][0];
+            }
+        });
+
+        var sapOrigURL = sUrl;
+        valStr = JSON.stringify(obj);
+
+        var oIframeUriParams = {};
+        if (oContainer.getIframePostAllParams() === true) {
+            oIframeUriParams = UriParameters.fromURL(sUrl);
+            sPostAddParams = buildHTMLForAllPostParams(oContainer, oIframeUriParams, false);
+            if (sPostAddParams !== "") {
+                sUrl = trimURL(sUrl, oIframeUriParams);
+            }
+        }
+
+        oContainer.fireEvent("applicationConfiguration");
+        oRenderManager
+            .openStart("form")
+            .attr("id", sFormId)
+            .attr("method", "post")
+            .attr("name", sFormId)
+            .attr("target", oContainer.getId() + "-iframe")
+            .attr("action", sUrl)
+            .style("display", "none")
+            .openEnd();
+
+        oRenderManager
+            .voidStart("input")
+            .attr("name", "sap-flp-params")
+            .attr("value", valStr)
+            .voidEnd();
+
+        if (oContainer.getIframePostAllParams() === true) {
+            buildHTMLForAllPostParams(oContainer, oIframeUriParams, true, oRenderManager);
+        }
+
+        oRenderManager.close("form");
+
+        var sID = oContainer.sId;
+        // we need to remove the sapUShellApplicationContainerIframeHidden style as the style is relevant
+        // only in the parent div of this iframe
+        if (oContainer.hasStyleClass("sapUShellApplicationContainerIframeHidden")) {
+            bIsHidden = true;
+            oContainer.toggleStyleClass("sapUShellApplicationContainerIframeHidden", false);
+        }
+
+        // When sending a POST request, we concatenate the string "-iframe" to the 'id' attribute of the <iframe> node.
+        // The reason is that in POST request the IFRAME element is a child of a new 'div' element, that holds the
+        // original id of the <iframe> node, and in order not to associate them with them with the same id we add this string.
+        oContainer.sId += "-iframe";
+        oRenderManager
+            .openStart("iframe", oContainer)
+            .attr("name", oContainer.getId())
+            .accessibilityState(oContainer)
+            .attr("sap-orig-src", sapOrigURL)
+            .attr("title", resources.i18n.getText("AppilcationContainer.IframeTitle"))
+            .attr("sap-iframe-idx", iIframeIdx)
+            .class("sapUShellApplicationContainer")
+            .style("height", oContainer.getHeight())
+            .style("width", oContainer.getWidth());
+
+        if (Config.last("/core/shell/enableFeaturePolicyInIframes") === true) {
+            oRenderManager.attr("allow", utils.getIframeFeaturePolicies().replaceAll(";", " " + (new URI(sUrl).origin()) + ";"));
+        }
+        oRenderManager
+            .openEnd()
+            .close("iframe");
+
+        // Set the oContainer.sId back to its original value (without the string "-iframe")
+        oContainer.sId = sID;
+
+        if (bIsHidden) {
+            oContainer.toggleStyleClass("sapUShellApplicationContainerIframeHidden", true);
+        }
+
+        // The form submission happens in the onAfterRendering()
+    };
+
+    function buildHTMLForAllPostParams (oContainer, oIframeUriParams, bRender, oRenderManager) {
+        var sapIframeHintVal = "";
+        var sRes = "";
+        if (oIframeUriParams.has("sap-iframe-hint")) {
+            sapIframeHintVal = oIframeUriParams.get("sap-iframe-hint");
+        }
+
+        var oParams = oIframeUriParams.mParams;
+        //Verify that it's a WD app (in local FLP or cFLP)
+        if (oContainer.getApplicationType() === "TR" || (sapIframeHintVal === "GUI")) {
+            var p, valStr;
+            for (p in oParams) {
+                if (p === "sap-iframe-hint" || p === "sap-keep-alive") {
+                    continue;
+                }
+                valStr = oParams[p][0];
+                if (bRender === true) {
+                    oRenderManager
+                        .voidStart("input")
+                        .attr("name", p)
+                        .attr("value", valStr)
+                        .voidEnd();
+                } else {
+                    sRes += "*";
+                }
+            }
+        }
+
+        return sRes;
+    }
+
+    function trimURL (sUrl, oIframeUriParams) {
+        var sHint = oIframeUriParams.get("sap-iframe-hint"),
+            sKeepAlive = oIframeUriParams.get("sap-keep-alive"),
+            oNewURI = new URI(sUrl).query("");
+
+        if (typeof sHint === "string") {
+            oNewURI.addSearch("sap-iframe-hint", sHint);
+        }
+        if (typeof sKeepAlive === "string") {
+            oNewURI.addSearch("sap-keep-alive", sKeepAlive);
+        }
+
+        return oNewURI.toString();
+    }
+
+    return IframePOSTUtils;
+}, /* bExport= */ false);

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.116.0
+ * @version 1.117.1
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/contentFinder/controller/AppSearch.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file AppSearch controller for AppSearch view
- * @version 1.116.0
+ * @version 1.117.1
  */
 sap.ui.define([
     "./ContentFinderDialog.controller",

package/src/main/js/sap/ushell/components/contentFinder/controller/ContentFinderDialog.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog root view
- * @version 1.116.0
+ * @version 1.117.1
  */
 sap.ui.define([
     "../model/formatter",

package/src/main/js/sap/ushell/components/contentFinder/controller/WidgetGallery.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for WidgetGallery view
- * @version 1.116.0
+ * @version 1.117.1
  */
 sap.ui.define([
     "./ContentFinderDialog.controller"

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinder",
         "applicationVersion": {
-            "version": "1.116.0"
+            "version": "1.117.1"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

package/src/main/js/sap/ushell/components/contentFinder/model/GraphQLListBinding.js

@@ -13,7 +13,7 @@ sap.ui.define([
          * The amount of items in the model will not represent the total count because the data may be paginated.
          *
          * @since 1.115.0
-         * @return {int} The count.
+         * @returns {int} The count.
          */
         getLength: function () {
             // Check if filters have been set. this.aFilters might contain an empty aFilters array
@@ -28,7 +28,7 @@ sap.ui.define([
          * The length is final if the amount of items is the same as the totalCount returned by the server.
          *
          * @since 1.115.0
-         * @return {boolean} True if the condition applies.
+         * @returns {boolean} True if the condition applies.
          */
         isLengthFinal: function () {
             return this.oList.length >= this.getLength();

package/src/main/js/sap/ushell/components/contentFinder/model/GraphQLModel.js

@@ -16,7 +16,7 @@ sap.ui.define([
          * @param {string} sPath
          *   The path pointing to the list / array that should be bound
          * @param {sap.ui.model.Context} [oContext]
-         *   The context object for this databinding
+         *   The context object for this data binding
          * @param {sap.ui.model.Sorter|sap.ui.model.Sorter[]} [aSorters]
          *   Initial sort order (can be either a sorter or an array of sorters)
          * @param {sap.ui.model.Filter|sap.ui.model.Filter[]} [aFilters]
@@ -25,7 +25,7 @@ sap.ui.define([
          *   Additional model-specific parameters
          *
          * @since 1.115.0
-         * @return {sap.ui.model.ListBinding}
+         * @returns {sap.ui.model.ListBinding}
          *   The newly created binding
          */
         bindList: function (sPath, oContext, aSorters, aFilters, mParameters) {

package/src/main/js/sap/ushell/components/contentFinder/model/formatter.js

@@ -7,7 +7,7 @@ sap.ui.define([], function () {
          * Formatter for the dialog title.
          *
          * @param {string} sNavigationTarget Current navigation target.
-         * @return {string} The dialog title.
+         * @returns {string} The dialog title.
          * @since 1.113.0
          */
         formatDialogTitle: function (sNavigationTarget) {
@@ -35,7 +35,7 @@ sap.ui.define([], function () {
          * @param {array} aCards Array of cards.
          * @param {array} aRestrictedVisualizations Array of restricted visualizations.
          * @param {int} iFilteredAppCount Amount of filtered Viz.
-         * @return {string} The GridList Title text.
+         * @returns {string} The GridList Title text.
          * @since 1.113.0
          */
         formatAppSearchTitle: function (sActiveNavigationTarget, sSearchTerm, bShowSelectedPressed, iSelectedAppCount, aTiles, aCards, iFilteredAppCount) {

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.116.0",
+            version: "1.117.1",
             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.116.0
+ * @version 1.117.1
  *
  * @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.116.0
+ * @version 1.117.1
  * @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.116.0
+ * @version 1.117.1
  * @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.116.0
+ * @version 1.117.1
  * @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");
     }