@sapui5/sap.ushell 1.111.0 → 1.112.0

package/src/main/js/sap/ushell/themes/sap_horizon_dark/ShellAppTitle.less

@@ -109,11 +109,11 @@
 }
 
 .sapUshellNavigationMenuListItems:not(:last-child) .sapMLIBContent:after {
-  background-color: @sapUiShellTextColor;
+  background-color: @sapUiContentNonInteractiveIconColor;
 }
 
 .sapUshellNavigationMenuListItems:not(:first-child) .sapMLIBContent:before {
-  background-color: @sapUiShellTextColor;
+  background-color: @sapUiContentNonInteractiveIconColor;
 }
 
 /** Shell Application Title control **/
@@ -134,16 +134,6 @@
   font-size: 1rem;
 }
 
-/** Shell Navigation Menu - override background color*/
-#sapUshellNavMenuTabBar {
-  background-color: @sapUiListBackground;
-}
-
-/** Shell Navigation Menu - override to style of the text-tab-bar head area background color**/
-#sapUshellNavMenuTabBar .sapMITH {
-  background-color: @sapUiListBackground;
-}
-
 /** Shell Navigation Menu - Mini Tiles (of relatedApps)**/
 .sapUshellNavMiniTile {
   background-color: @sapUiTileBackground;

package/src/main/js/sap/ushell/themes/sap_horizon_dark/library.source.less

@@ -36,5 +36,4 @@
 @import "TileState.less";
 @import "ToolAreaItem.less";
 @import "UsageAnalyticsSelector.less";
-@import "UserPreferencesButton.less";
 @import "WorkPageCell.less";

package/src/main/js/sap/ushell/themes/sap_horizon_hcb/ShellAppTitle.less

@@ -99,31 +99,6 @@
   border-bottom: 0;
 }
 
-/** Shell Navigation Menu - related Apps grid (within a flexbox) - override the text-tab-bar content area height **/
-#sapUshellAppTitlePopover .sapMITBContent {
-  background-color: @sapUiButtonBackground;
-}
-
-/** Shell Navigation Menu - Popover Header color override **/
-#sapUshellAppTitlePopover .sapMIBar.sapMHeader-CTX {
-  background-color: @sapUiListBackground;
-}
-
-/** Shell Navigation Menu - override background color*/
-#sapUshellNavMenuTabBar {
-  background-color: @sapUiListBackground;
-}
-
-/** Shell Navigation Menu - override to style of the text-tab-bar head area background color**/
-#sapUshellNavMenuTabBar .sapMITH {
-  background-color: @sapUiListBackground;
-}
-
-#sapUshellNavMenuTabBar .sapMITBContainerContent {
-  border: 0;
-  border-top: 2px @sapDefault_BorderStyle @sapUiHcStandardForeground;
-}
-
 /** Shell Navigation Menu - Mini Tiles (of relatedApps)**/
 .sapUshellNavMiniTile {
   background-color: @sapUiListBackground;

package/src/main/js/sap/ushell/themes/sap_horizon_hcb/library.source.less

@@ -29,6 +29,5 @@
 @import "TileBase.less";
 @import "TileContainer.less";
 @import "TileState.less";
-@import "UserPreferencesButton.less";
 @import "ActionMode.less";
 @import "WorkPageCell.less";

package/src/main/js/sap/ushell/themes/sap_horizon_hcw/ShellAppTitle.less

@@ -99,31 +99,6 @@
   border-bottom: 0;
 }
 
-/** Shell Navigation Menu - related Apps grid (within a flexbox) - override the text-tab-bar content area height **/
-#sapUshellAppTitlePopover .sapMITBContent {
-  background-color: @sapUiButtonBackground;
-}
-
-/** Shell Navigation Menu - Popover Header color override **/
-#sapUshellAppTitlePopover .sapMIBar.sapMHeader-CTX {
-  background-color: @sapUiListBackground;
-}
-
-/** Shell Navigation Menu - override background color*/
-#sapUshellNavMenuTabBar {
-  background-color: @sapUiListBackground;
-}
-
-/** Shell Navigation Menu - override to style of the text-tab-bar head area background color**/
-#sapUshellNavMenuTabBar .sapMITH {
-  background-color: @sapUiListBackground;
-}
-
-#sapUshellNavMenuTabBar .sapMITBContainerContent {
-  border: 0;
-  border-top: 2px @sapDefault_BorderStyle @sapUiHcStandardForeground;
-}
-
 /** Shell Navigation Menu - Mini Tiles (of relatedApps)**/
 .sapUshellNavMiniTile {
   background-color: @sapUiListBackground;

package/src/main/js/sap/ushell/themes/sap_horizon_hcw/library.source.less

@@ -29,6 +29,5 @@
 @import "TileBase.less";
 @import "TileContainer.less";
 @import "TileState.less";
-@import "UserPreferencesButton.less";
 @import "ActionMode.less";
 @import "WorkPageCell.less";

package/src/main/js/sap/ushell/ui/appfinder/AppBoxRenderer.js

@@ -24,23 +24,8 @@ sap.ui.define([
      *            the AppBox to be rendered
      */
     AppBoxRenderer.render = function (rm, oAppBox) {
-        var oCatalogContainer = oAppBox.getParent(),
-            oAppBoxes = [];
-
-        if (oCatalogContainer && oCatalogContainer.getAppBoxesContainer && oCatalogContainer.getCustomTilesContainer) {
-            // AppFinder: CatalogEntryContainer
-            oAppBoxes = oCatalogContainer.getAppBoxesContainer().concat(oCatalogContainer.getCustomTilesContainer());
-        }
-
-        var oVisibleAppBoxes = oAppBoxes.filter(function (appBox) {
-                return appBox.getVisible();
-            }),
-            iCurrentItemIndex = oVisibleAppBoxes.indexOf(oAppBox) > -1 ? oVisibleAppBoxes.indexOf(oAppBox) + 1 : "";
-
         rm.openStart("li", oAppBox);
         rm.class("sapUshellAppBox");
-        rm.attr("aria-posinset", iCurrentItemIndex);
-        rm.attr("aria-setsize", oVisibleAppBoxes.length);
         rm.attr("aria-label", oAppBox._getAriaLabel());
         rm.attr("aria-roledescription", resources.i18n.getText("tile"));
         rm.attr("aria-describedby", oAppBox.getId());

package/src/main/js/sap/ushell/ui/cards/FrequentActivitiesExtension.js

@@ -0,0 +1,199 @@
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+sap.ui.define([
+    "sap/ui/integration/Extension",
+    "sap/ushell/utils/UrlParsing",
+    "sap/ushell/utils/AppType",
+    "sap/ushell/library",
+    "sap/ushell/Config",
+    "sap/ushell/EventHub",
+    "sap/ushell/resources"
+], function (Extension, UrlParsing, AppTypeUtils, ushellLibrary, Config, EventHub, resources) {
+    "use strict";
+
+    var AppType = ushellLibrary.AppType;
+
+    /**
+     * Formats a title string based on the app type.
+     *
+     * @param {string} sTitle Title to be formatted.
+     * @param {string} sAppType The app type.
+     * @returns {string} The formatted title.
+     *
+     * @private
+     */
+    function _titleFormatter (sTitle, sAppType) {
+        if (sAppType === AppType.SEARCH) {
+            return "\"" + sTitle + "\"";
+        }
+        return sTitle;
+    }
+
+    /**
+     * Formats the description based on the app type.
+     *
+     * @param {string} sAppType The app type.
+     * @returns {string} The formatted description.
+     *
+     * @private
+     */
+    function _descriptionFormatter (sAppType) {
+        if (sAppType === AppType.SEARCH) {
+            return resources.i18n.getText("recentActivitiesSearchDescription");
+        }
+        return AppTypeUtils.getDisplayName(sAppType);
+    }
+
+    return Extension.extend("sap.ushell.ui.cards.FrequentActivitiesExtension", {
+
+        /**
+         * Initializes the card extension.
+         */
+        init: function () {
+            Extension.prototype.init.apply(this, arguments);
+            this.oUserRecentsPromise = sap.ushell.Container.getServiceAsync("UserRecents");
+            this.oCrossAppNavPromise = sap.ushell.Container.getServiceAsync("CrossApplicationNavigation");
+        },
+
+        /**
+         * Exit callback. Cleans up the objects and turns of the event listening for EventHub events.
+         */
+        exit: function () {
+            Extension.prototype.exit.apply(this, arguments);
+            EventHub.on("newUserRecentsItem").off();
+            EventHub.on("userRecentsCleared").off();
+        },
+
+        /**
+         * When the card is loaded and ready () we will listen to the EventHub events newUserRecentsItem and userRecentsCleared to refresh the card data.
+         */
+        onCardReady: function () {
+            EventHub.on("newUserRecentsItem").do(function () {
+                // It will call getData() again, and show loading placeholders while loading.
+                // Data sorting has to be implemented in the getData() method.
+                this.getCard().refreshData();
+            }.bind(this));
+
+            EventHub.on("userRecentsCleared").do(function () {
+                this.getCard().refreshData();
+            }.bind(this));
+        },
+
+        /**
+         * Gets the Data to be used for binding the card items.
+         * @returns {Promise} A Promise with the frequently used card items.
+         */
+        getData: function () {
+            if (!Config.last("/core/shell/model/enableTrackingActivity")) {
+                return Promise.resolve([]);
+            }
+
+            if (this._sortedData) {
+                return Promise.resolve(this._resolvedData);
+            }
+
+            return this.oUserRecentsPromise
+                .then(function (oUserRecents) { // 1: get the data
+                    return new Promise(function (resolve, reject) {
+                        oUserRecents.getFrequentActivity()
+                            .done(resolve)
+                            .fail(reject);
+                    });
+                })
+                .then(this._getActivitiesAsCardItems.bind(this)) // 2: prepare the data for the card
+                .then(this._checkEnabled.bind(this)); // 3: determine which items are enabled - set their "Enabled" property
+        },
+
+        /**
+         * Generates the card item objects for the given activities.
+         * @param {Object []} aActivities Array of activities that need to be used to generate card items.
+         * @returns {Promise []} Array of card item objects that can be bound to the list items of the card.
+         *
+         * @private
+         */
+        _getActivitiesAsCardItems: function (aActivities) {
+            var aCardItems = [],
+                oCardItem;
+            for (var i = 0; i < aActivities.length; i++) {
+                if (aActivities[i].url && aActivities[i].url !== "") {
+                    var oShellHash = UrlParsing.parseShellHash(aActivities[i].url);
+                    oCardItem = {
+                        Name: _titleFormatter(aActivities[i].title, aActivities[i].appType),
+                        Description: _descriptionFormatter(aActivities[i].appType),
+                        Icon: aActivities[i].icon || "sap-icon://product",
+                        Url: aActivities[i].url
+                    };
+                    if (oShellHash) {
+                        oCardItem.Intent = {
+                            SemanticObject: oShellHash.semanticObject,
+                            Action: oShellHash.action,
+                            Parameters: oShellHash.params,
+                            AppSpecificRoute: oShellHash.appSpecificRoute
+                        };
+                    } else {
+                        oCardItem.Url = aActivities[i].url;
+                    }
+                    aCardItems.push(oCardItem);
+                }
+            }
+            return aCardItems;
+        },
+
+        /**
+         * Checks for a given array of card activities if each of them is enabled for user interaction.
+         * It adds the Enabled property to each object with the boolean representation of enablement.
+         * @param {Object []} aActivities Array of activities (frequently used apps) to check if each of them is enabled for user action.
+         * @returns {Promise []} Array of resolved Promises of activities with the additional information about the interaction enablement for each entry.
+         *
+         * @private
+         */
+        _checkEnabled: function (aActivities) {
+            var aPromises = aActivities.map(function (oActivity) {
+                return this._isActionEnabled(oActivity)
+                    .then(function (bEnabled) {
+                        oActivity.Enabled = bEnabled;
+                        return oActivity;
+                    });
+            }.bind(this));
+
+            return Promise.all(aPromises);
+        },
+
+        /**
+         * Checks if the navigation for a given context is supported. This is the case if eigther the activity
+         * Url property is a Url or a parseable ShellHash.
+         * @param {Object} oActivity activity for which the navigation support is checked
+         * @returns {Promise} Resolves to true if the navigation is supported or an Url is given, false else.
+         *
+         * @private
+         */
+        _isActionEnabled: function (oActivity) {
+            var oShellHash = UrlParsing.parseShellHash(oActivity.Url);
+
+            if (!oShellHash) {
+                return Promise.resolve(true);
+            }
+
+            var oParameters = oShellHash.params;
+
+            var oNavigation = {
+                target: {
+                    semanticObject: oShellHash.semanticObject,
+                    action: oShellHash.action
+                },
+                params: oParameters
+            };
+
+            return this.oCrossAppNavPromise.then(function (oCrossAppNav) {
+                return new Promise(function (resolve) {
+                    oCrossAppNav.isNavigationSupported([oNavigation])
+                        .done(function (aResponses) {
+                            resolve(aResponses[0].supported);
+                        })
+                        .fail(function () {
+                            resolve(false);
+                        });
+                });
+            });
+        }
+    });
+});

package/src/main/js/sap/ushell/ui/cards/RecentActivitiesExtension.js

@@ -0,0 +1,202 @@
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+/**
+ * @fileOverview Extension for recent activities card
+ *
+ * @version 1.112.0
+ */
+sap.ui.define([
+    "sap/ui/integration/Extension",
+    "sap/ushell/utils/UrlParsing",
+    "sap/ushell/utils/AppType",
+    "sap/ushell/library",
+    "sap/ushell/Config",
+    "sap/ushell/EventHub",
+    "sap/ushell/resources"
+], function (Extension, UrlParsing, AppTypeUtils, ushellLibrary, Config, EventHub, resources) {
+    "use strict";
+
+    var AppType = ushellLibrary.AppType;
+
+    /**
+     * Formats a title string based on the app type.
+     *
+     * @param {string} sTitle Title to be formatted.
+     * @param {string} sAppType The app type.
+     * @returns {string} The formatted title.
+     *
+     * @private
+     */
+    function _titleFormatter (sTitle, sAppType) {
+        if (sAppType === AppType.SEARCH) {
+            return "\"" + sTitle + "\"";
+        }
+        return sTitle;
+    }
+
+    /**
+     * Formats the description based on the app type.
+     *
+     * @param {string} sAppType The app type.
+     * @returns {string} The formatted description.
+     *
+     * @private
+     */
+    function _descriptionFormatter (sAppType) {
+        if (sAppType === AppType.SEARCH) {
+            return resources.i18n.getText("recentActivitiesSearchDescription");
+        }
+        return AppTypeUtils.getDisplayName(sAppType);
+    }
+
+    return Extension.extend("sap.ushell.ui.cards.RecentActivitiesExtension", {
+
+        /**
+         * Initializes the card extension.
+         */
+        init: function () {
+            Extension.prototype.init.apply(this, arguments);
+            this.oUserRecentsPromise = sap.ushell.Container.getServiceAsync("UserRecents");
+            this.oCrossAppNavPromise = sap.ushell.Container.getServiceAsync("CrossApplicationNavigation");
+        },
+
+        /**
+         * Exit callback. Cleans up the objects and turns of the event listening for EventHub events.
+         */
+        exit: function () {
+            Extension.prototype.exit.apply(this, arguments);
+            EventHub.on("newUserRecentsItem").off();
+            EventHub.on("userRecentsCleared").off();
+        },
+
+        /**
+         * When the card is loaded and ready () we will listen to the EventHub events newUserRecentsItem and userRecentsCleared to refresh the card data.
+         */
+        onCardReady: function () {
+            EventHub.on("newUserRecentsItem").do(function () {
+                // refreshData calls getData again
+                this.getCard().refreshData();
+            }.bind(this));
+
+            EventHub.on("userRecentsCleared").do(function () {
+                this.getCard().refreshData();
+            }.bind(this));
+        },
+
+        /**
+         * Gets the Data to be used for binding the card items.
+         * @returns {Promise} A Promise with the recently used card items.
+         */
+        getData: function () {
+            if (!Config.last("/core/shell/model/enableTrackingActivity")) {
+                return Promise.resolve([]);
+            }
+
+            return this.oUserRecentsPromise
+                .then(function (oUserRecents) {
+                    return new Promise(function (resolve, reject) {
+                        oUserRecents.getRecentActivity()
+                            .done(resolve)
+                            .fail(reject);
+                    });
+                })
+                .then(this._getActivitiesAsCardItems.bind(this))
+                .then(this._checkEnabled.bind(this));
+        },
+
+        /**
+         * Generates the card item objects for the given activities.
+         * @param {Object []} aActivities Array of activities that need to be used to generate card items.
+         * @returns {Promise []} Array of card item objects that can be bound to the list items of the card.
+         *
+         * @private
+         */
+        _getActivitiesAsCardItems: function (aActivities) {
+            var aCardItems = [],
+                oCardItem;
+            for (var i = 0; i < aActivities.length; i++) {
+                if (aActivities[i].url && aActivities[i].url !== "") {
+                    var oShellHash = UrlParsing.parseShellHash(aActivities[i].url);
+
+                    oCardItem = {
+                        Name: _titleFormatter(aActivities[i].title, aActivities[i].appType),
+                        Description: _descriptionFormatter(aActivities[i].appType),
+                        Icon: aActivities[i].icon || "sap-icon://product",
+                        Url: aActivities[i].url
+                    };
+
+                    if (oShellHash) {
+                        oCardItem.Intent = {
+                            SemanticObject: oShellHash.semanticObject,
+                            Action: oShellHash.action,
+                            Parameters: oShellHash.params,
+                            AppSpecificRoute: oShellHash.appSpecificRoute
+                        };
+                    } else {
+                        oCardItem.Url = aActivities[i].url;
+                    }
+                    aCardItems.push(oCardItem);
+                }
+            }
+            return aCardItems;
+        },
+
+        /**
+         * Checks for a given array of card activities if each of them is enabled for user interaction.
+         * It adds the Enabled property to each object with the boolean representation of enablement.
+         * @param {Object []} aActivities Array of activities (recently used apps) to check if each of them is enabled for user action.
+         * @returns {Promise []} Array of resolved Promises of activities with the additional information about the interaction enablement for each entry.
+         *
+         * @private
+         */
+        _checkEnabled: function (aActivities) {
+            var aPromises = aActivities.map(function (oActivity) {
+                return this._isActionEnabled(oActivity)
+                    .then(function (bEnabled) {
+                        oActivity.Enabled = bEnabled;
+                        return oActivity;
+                    });
+            }.bind(this));
+
+            return Promise.all(aPromises);
+        },
+
+        /**
+         * Checks if the navigation for a given context is supported. This is the case if eigther the activity
+         * Url property is a Url or a parseable ShellHash.
+         * @param {Object} oActivity activity for which the navigation support is checked.
+         * @returns {Promise} Resolves to true if the navigation is supported or an Url is given, false else.
+         *
+         * @private
+         */
+        _isActionEnabled: function (oActivity) {
+            var oShellHash = UrlParsing.parseShellHash(oActivity.Url);
+
+            if (!oShellHash) {
+                return Promise.resolve(true);
+            }
+
+            var oParameters = oShellHash.params;
+
+            var oNavigation = {
+                target: {
+                    semanticObject: oShellHash.semanticObject,
+                    action: oShellHash.action
+                },
+                params: oParameters
+            };
+
+            return this.oCrossAppNavPromise.then(function (oCrossAppNav) {
+                return new Promise(function (resolve) {
+                    oCrossAppNav.isNavigationSupported([oNavigation])
+                        .done(function (aResponses) {
+                            resolve(aResponses[0].supported);
+                        })
+                        .fail(function () {
+                            resolve(false);
+                        });
+                });
+            });
+        }
+
+    });
+});

package/src/main/js/sap/ushell/ui/contentFinder/AppBox.js

@@ -41,7 +41,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      * @author SAP SE
-     * @version 1.111.0
+     * @version 1.112.0
      *
      * @constructor
      * @private
@@ -350,8 +350,20 @@ sap.ui.define([
      * @param {jQuery.Event} oEvent The <code>tap</code> event object
      */
     AppBox.prototype.ontap = function (oEvent) {
+        // If something is selected, prevent the event
+        var oSelection = window.getSelection();
+        var sTextSelection = oSelection.toString().replace("\n", "");
+        if (sTextSelection && jQuery.contains(this.getDomRef(), oSelection.focusNode)) {
+            return;
+        }
+
+        // The user tap can occur on different controls (GridContainer, AppBox, Checkbox within the AppBox).
         var oSource = oEvent.srcControl;
-        if (!this.getDisabled() && (oSource === this || oSource === this.getAggregation("_selectCheckBox"))) {
+        if (!this.getDisabled() && (
+            oSource === this
+            || oSource === this.getAggregation("_selectCheckBox")
+            || (oEvent.target && oEvent.target.firstChild === this.getDomRef())
+        )) {
             if (this.getSelectable()) {
                 var bOldValue = this.getSelected();
                 this.setSelected(!bOldValue);
@@ -360,6 +372,9 @@ sap.ui.define([
                 this.firePress();
             }
         }
+
+        // Set the focus to the source again
+        oSource.focus();
     };
 
     /**

package/src/main/js/sap/ushell/ui/launchpad/ExtendedChangeDetection.js

@@ -7,7 +7,7 @@
  * of recreating them. Items which get removed from the aggregation get destroyed and items which get added to the
  * aggregation get created.
  *
- * @version 1.111.0
+ * @version 1.112.0
  */
 sap.ui.define([
     "sap/ui/base/ManagedObject",

package/src/main/js/sap/ushell/ui/launchpad/LoadingDialogRenderer.js

@@ -1,8 +1,6 @@
 // Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
-sap.ui.define([
-    "sap/ui/thirdparty/jquery"
-], function (jQuery) {
+sap.ui.define([], function () {
     "use strict";
 
     /**
@@ -29,13 +27,7 @@ sap.ui.define([
             }
             rm.openEnd(); // div - tag
 
-            if (jQuery.os.ios || !loadingDialog._isPlatformDependent) {
-                this.renderAppInfo(rm, loadingDialog);
-                this.renderFioriFlower(rm);
-            } else {
-                this.renderFioriFlower(rm);
-                this.renderAppInfo(rm, loadingDialog);
-            }
+            this.renderAppInfo(rm, loadingDialog);
 
             rm.close("div");
         },
@@ -55,41 +47,6 @@ sap.ui.define([
             rm.close("span");
             rm.renderControl(loadingDialog._oLabel);
             rm.close("div");
-        },
-
-        renderFioriFlower: function (rm) {
-            var oUserAgentRegex = /Android\s4\.2.+GT-I9505.+Chrome\/18/, // Chrome 18 on Android 4.2.x / Samsung Galaxy S4
-                bReplaceFlower = navigator.userAgent && oUserAgentRegex.test(navigator.userAgent); // some browsers do not get the flower but the replacement
-
-            // create either flowery code or busy indicator
-            if (jQuery.support.cssAnimations && !bReplaceFlower) {
-                rm.openStart("div", "fiori2-loader");
-                rm.openEnd(); // div - tag
-
-                rm.openStart("div");
-                rm.class("fiori2-blossom");
-                rm.openEnd(); // div - tag
-
-                for (var i = 1; i < 6; ++i) {
-                    rm.openStart("div");
-                    rm.class("fiori2-leafContainer");
-                    rm.class("fiori2-leafContainer" + i);
-                    rm.openEnd(); // div - tag
-
-                    rm.openStart("div");
-                    rm.class("fiori2-leaf");
-                    rm.class("fiori2-leaf" + i);
-                    rm.openEnd(); // div - tag
-                    rm.close("div");
-                    // end leafContainer
-                    rm.close("div");
-                }
-
-                // end blossom
-                rm.close("div");
-                // end fiori2-loader
-                rm.close("div");
-            }
         }
     };
 

package/src/main/js/sap/ushell/ui/launchpad/Page.js

@@ -51,7 +51,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      * @author SAP SE
-     * @version 1.111.0
+     * @version 1.112.0
      *
      * @private
      * @alias sap.ushell.ui.launchpad.Page