@sapui5/sap.ushell 1.141.3 → 1.142.1

package/src/main/js/sap/ushell/services/Ui5ComponentLoader.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's UI5 component loader service.
  * This is a shell-internal service and no public or application facing API!
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/base/Log",
@@ -12,7 +12,6 @@ sap.ui.define([
     "sap/ui/core/Component",
     "sap/ui/core/Lib",
     "sap/ui/core/util/AsyncHintsHelper",
-    "sap/ui/thirdparty/jquery",
     "sap/ui/thirdparty/URI",
     "sap/ushell/Config",
     "sap/ushell/EventHub",
@@ -25,7 +24,6 @@ sap.ui.define([
     Component,
     Lib,
     AsyncHintsHelper,
-    jQuery,
     URI,
     Config,
     EventHub,
@@ -237,8 +235,6 @@ sap.ui.define([
      * @param {sap.ushell.services.Ui5ComponentLoader.AppProperties} oAppProperties Application properties as typically produced by resolveHashFragment,
      *   note that some members of componentData are propagated, this is used in the myinbox scenario,
      *   see (CrossApplicationNavigation.createComponentInstance)
-     * @param {sap.ushell.services.URLParsing.DecomposedHash} [oParsedShellHash] The shell hash of the application that is to be opened already parsed via
-     *   <code>sap.ushell.services.URLParsing#parseShellHash</code><code>sap.ushell.services.URLParsing#parseShellHash</code>.
      * @param {Promise[]} aWaitForBeforeInstantiation An array of promises which delays the instantiation of
      *   the Component class until those Promises are resolved.
      * @param {sap.ushell.UI5ComponentType} sUI5ComponentType Type used to define the type of loading a ui5component by FLP
@@ -251,10 +247,10 @@ sap.ui.define([
      *
      * @private
      */
-    Ui5ComponentLoader.prototype.createComponent = async function (oAppProperties, oParsedShellHash = {}, aWaitForBeforeInstantiation, sUI5ComponentType) {
+    Ui5ComponentLoader.prototype.createComponent = async function (oAppProperties, aWaitForBeforeInstantiation, sUI5ComponentType) {
         let oInstantiationData;
         try {
-            oInstantiationData = await this.createComponentData(oAppProperties, oParsedShellHash, aWaitForBeforeInstantiation);
+            oInstantiationData = await this.createComponentData(oAppProperties, aWaitForBeforeInstantiation);
             oInstantiationData = await this.modifyComponentProperties(oInstantiationData, sUI5ComponentType);
         } catch (oError) {
             Log.error("Ui5ComponentLoader: Error while creating component data", oError, "sap.ushell.services.Ui5ComponentLoader");
@@ -272,15 +268,13 @@ sap.ui.define([
      * @param {sap.ushell.services.Ui5ComponentLoader.AppProperties} oAppProperties Application properties as typically produced by resolveHashFragment,
      *   note that some members of componentData are propagated, this is used in the myinbox scenario,
      *   see (CrossApplicationNavigation.createComponentInstance)
-     * @param {sap.ushell.services.URLParsing.DecomposedHash} oParsedShellHash The shell hash of the application that is to be opened already parsed via
-     *   <code>sap.ushell.services.URLParsing#parseShellHash</code><code>sap.ushell.services.URLParsing#parseShellHash</code>.
      * @param {Promise[]} aWaitForBeforeInstantiation An array of promises which delays the instantiation of
      *   the Component class until those Promises are resolved.
      * @returns {Promise<sap.ushell.services.Ui5ComponentLoader.InstantiationData>} Resolves component data.
      *
      * @private
      */
-    Ui5ComponentLoader.prototype.createComponentData = async function (oAppProperties = {}, oParsedShellHash = {}, aWaitForBeforeInstantiation) {
+    Ui5ComponentLoader.prototype.createComponentData = async function (oAppProperties = {}, aWaitForBeforeInstantiation) {
         const oInstantiationData = {};
         const oApplicationDependencies = oAppProperties.applicationDependencies || {};
 
@@ -301,7 +295,7 @@ sap.ui.define([
         const bCustomPreloadEnabled = Config.last("/core/customPreload/enabled");
         const bAddCoreExtPreloadBundle = oInstantiationData.loadCoreExt && bCustomPreloadEnabled;
         const bLoadDefaultDependencies = this._shouldLoadDefaultDependencies(oAppProperties);
-        const sComponentId = oAppProperties.ui5ComponentId || this._constructAppComponentId(oParsedShellHash);
+        const sComponentId = oAppProperties.ui5ComponentId;
 
         oInstantiationData.componentProperties = await this._createComponentProperties(
             sComponentId,
@@ -311,11 +305,6 @@ sap.ui.define([
             bLoadDefaultDependencies
         );
 
-        // Avoid warnings in ApplicationContainer.
-        // TODO [FLPCOREANDUX-10024]: can be removed when ApplicationContainer construction is changed.
-        delete oInstantiationData.appPropertiesSafe.loadCoreExt;
-        delete oInstantiationData.appPropertiesSafe.loadDefaultDependencies;
-
         return oInstantiationData;
     };
 
@@ -481,25 +470,6 @@ sap.ui.define([
         return bLoadDefaultDependencies;
     };
 
-    /**
-     * Constructs the app id based on the parsed shell hash.
-     * @param {sap.ushell.services.URLParsing.DecomposedHash} [oParsedShellHash] The parsed shell hash.
-     * @returns {string} The constructed app component ID.
-     *
-     * @private
-     */
-    Ui5ComponentLoader.prototype._constructAppComponentId = function (oParsedShellHash = {}) {
-        const sSemanticObject = oParsedShellHash.semanticObject || null;
-        const sAction = oParsedShellHash.action || null;
-
-        if (!sSemanticObject || !sAction) {
-            return null;
-        }
-
-        // todo: [FLPCOREANDUX-10024] Get rid of this calculation
-        return `application-${sSemanticObject}-${sAction}-component`;
-    };
-
     /**
      * Removes the cachebuster token from the given URL if any is present.
      *

package/src/main/js/sap/ushell/services/UserDefaultParameterPersistence.js

@@ -14,7 +14,7 @@
  *
  * This is *not* an application facing service, but for Shell Internal usage.
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/UserDefaultParameters.js

@@ -7,7 +7,7 @@
  *               This service should be accessed by the application
  *               via the CrossApplicationNavigation service.
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/UserInfo.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's user information service. Allows retrieving information about the logged-in user.
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/UserRecents.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's user activity service.
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/services/VisualizationDataProvider.js

@@ -7,7 +7,7 @@
  *
  * Configured with the LaunchPageAdapter.
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/ushell/resources",

package/src/main/js/sap/ushell/services/VisualizationInstantiation.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module deals with the instantiation of visualizations in a platform independent way.
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/ushell/ui/launchpad/VizInstance",

package/src/main/js/sap/ushell/services/_ContentExtensionAdapterFactory/ContentExtensionAdapterConfig.js

@@ -7,7 +7,7 @@
  *  config handler which is called by the factory to generate an explicit
  *  Adapter configuration
  *
- * @version 1.141.3
+ * @version 1.142.1
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/services/_ContentExtensionAdapterFactory/FeaturedGroupConfig.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Provide mock feature group data
  *
- * @version 1.141.3
+ * @version 1.142.1
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/services/_CrossApplicationNavigation/utils.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Cross Application Navigation utility functions
  *
- * @version 1.141.3
+ * @version 1.142.1
  * @deprecated since 1.120
  */
 sap.ui.define([

package/src/main/js/sap/ushell/services/_PageReferencing/PageReferencer.js

@@ -4,7 +4,7 @@
  * @file This module is responsible to create reference pages,
  * which are shareable JSON representations of layout and navigation targets in the specific format.
  *
- * @version 1.141.3
+ * @version 1.142.1
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/state/StateManager.js

@@ -109,7 +109,11 @@ sap.ui.define([
                 secondTitle: "",
                 headItems: [],
                 centralAreaElement: null,
-                headEndItems: []
+                headEndItems: [],
+                notifications: {
+                    visible: false,
+                    count: 0
+                }
             },
             subHeader: {
                 items: []

package/src/main/js/sap/ushell/state/StateRules.js

@@ -2,12 +2,14 @@
 
 sap.ui.define([
     "sap/base/Log",
+    "sap/ushell/Config",
     "sap/ushell/state/StateManager/LaunchpadState",
     "sap/ushell/state/StateManager/Operation",
     "sap/ushell/state/StateManager/ShellMode",
     "sap/ushell/state/StrategyFactory"
 ], (
     Log,
+    Config,
     LaunchpadState,
     Operation,
     ShellMode,
@@ -165,8 +167,15 @@ sap.ui.define([
             } else { // app
                 bShowNotificationsButton = [Default, Minimal].includes(sShellMode);
             }
-            if (!bShowNotificationsButton) {
+            if (!bShowNotificationsButton || !oStateData.header.notifications.visible) {
                 StrategyFactory.perform(oStateData, "header.headEndItems", Operation.Remove, "NotificationsCountButton");
+                StrategyFactory.perform(oStateData, "header.notifications.visible", Operation.Set, false);
+            }
+
+            // finally transform button if available and necessary
+            if (Config.last("/core/shellBar/enabled") && oStateData.header.headEndItems.includes("NotificationsCountButton")) {
+                StrategyFactory.perform(oStateData, "header.headEndItems", Operation.Remove, "NotificationsCountButton");
+                StrategyFactory.perform(oStateData, "header.notifications.visible", Operation.Set, true);
             }
         }
 

package/src/main/js/sap/ushell/state/modules/BackNavigation.js

@@ -2,14 +2,16 @@
 
 /**
  * @fileOverview handle all the current back navigation.
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/ui/core/library",
-    "sap/ui/core/routing/History"
+    "sap/ui/core/routing/History",
+    "sap/ui/performance/trace/Interaction"
 ], (
     coreLibrary,
-    Ui5History
+    Ui5History,
+    Interaction
 ) => {
     "use strict";
 
@@ -25,6 +27,9 @@ sap.ui.define([
         };
 
         this.navigateBack = async function () {
+            // unlike other usages of notifyAsyncStep, in this case the returned function is not called by the FLP,
+            // when the interaction is finished. In this case UI5 can detect the end of the interaction without the help of FLP or the application.
+            Interaction.notifyAsyncStep();
             if (fnCustomBackNavigation) {
                 fnCustomBackNavigation();
                 return;

package/src/main/js/sap/ushell/state/modules/ContentDensity.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handles content density.
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/ui/Device",

package/src/main/js/sap/ushell/state/modules/Favicon.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handles favicon.
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/ui/core/Theming",

package/src/main/js/sap/ushell/state/modules/HeaderLogo.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handles the logo within the header.
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/base/i18n/Localization",

package/src/main/js/sap/ushell/support/plugins/flpConfig/FlpConfigurationPlugin.js

@@ -9,7 +9,7 @@
  * Fiori launchpad in a tree table separated by IconTabFilters for the first level properties of the configuration object.
  * Also it provides a search for last level properties.
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/ui/core/Element",

package/src/main/js/sap/ushell/themes/sap_horizon/ShellHeader.less

@@ -113,30 +113,31 @@
 }
 
 /** UserActionsMenu Button (Avatar) **/
-
-#userActionsMenuHeaderButton {
-  border: 1px @sapDefault_BorderStyle @sapUiButtonLiteBorderColor;
-  box-shadow: none;
-}
-
-#userActionsMenuHeaderButton:hover {
-  box-shadow: @sapUiContentInteractionShadow;
-}
-
-#userActionsMenuHeaderButton:focus:not(:focus-visible) {
-  border-color: @sapUiButtonLiteBorderColor;
-  outline: none;
-}
-
-#userActionsMenuHeaderButton:focus-visible {
-  outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
-}
-
-#userActionsMenuHeaderButton:active,
-#userActionsMenuHeaderButton:focus:active,
-#userActionsMenuHeaderButton:focus-visible:active {
-  color: @sapUiShellActiveTextColor;
-  border-color: @sapUiButtonLiteActiveBorderColor;
-  box-shadow: none;
-  outline: none;
+.sapUshellShellHeader {
+  #userActionsMenuHeaderButton {
+    border: 1px @sapDefault_BorderStyle @sapUiButtonLiteBorderColor;
+    box-shadow: none;
+  }
+
+  #userActionsMenuHeaderButton:hover {
+    box-shadow: @sapUiContentInteractionShadow;
+  }
+
+  #userActionsMenuHeaderButton:focus:not(:focus-visible) {
+    border-color: @sapUiButtonLiteBorderColor;
+    outline: none;
+  }
+
+  #userActionsMenuHeaderButton:focus-visible {
+    outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+  }
+
+  #userActionsMenuHeaderButton:active,
+  #userActionsMenuHeaderButton:focus:active,
+  #userActionsMenuHeaderButton:focus-visible:active {
+    color: @sapUiShellActiveTextColor;
+    border-color: @sapUiButtonLiteActiveBorderColor;
+    box-shadow: none;
+    outline: none;
+  }
 }

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

@@ -113,30 +113,31 @@
 }
 
 /** UserActionsMenu Button (Avatar) **/
-
-#userActionsMenuHeaderButton {
-  border: 1px @sapDefault_BorderStyle @sapUiButtonLiteBorderColor;
-  box-shadow: none;
-}
-
-#userActionsMenuHeaderButton:hover {
-  box-shadow: @sapUiContentInteractionShadow;
-}
-
-#userActionsMenuHeaderButton:focus:not(:focus-visible) {
-  border-color: @sapUiButtonLiteBorderColor;
-  outline: none;
-}
-
-#userActionsMenuHeaderButton:focus-visible {
-  outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
-}
-
-#userActionsMenuHeaderButton:active,
-#userActionsMenuHeaderButton:focus:active,
-#userActionsMenuHeaderButton:focus-visible:active {
-  color: @sapUiShellActiveTextColor;
-  border-color: @sapUiButtonLiteActiveBorderColor;
-  box-shadow: none;
-  outline: none;
+.sapUshellShellHeader {
+  #userActionsMenuHeaderButton {
+    border: 1px @sapDefault_BorderStyle @sapUiButtonLiteBorderColor;
+    box-shadow: none;
+  }
+
+  #userActionsMenuHeaderButton:hover {
+    box-shadow: @sapUiContentInteractionShadow;
+  }
+
+  #userActionsMenuHeaderButton:focus:not(:focus-visible) {
+    border-color: @sapUiButtonLiteBorderColor;
+    outline: none;
+  }
+
+  #userActionsMenuHeaderButton:focus-visible {
+    outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+  }
+
+  #userActionsMenuHeaderButton:active,
+  #userActionsMenuHeaderButton:focus:active,
+  #userActionsMenuHeaderButton:focus-visible:active {
+    color: @sapUiShellActiveTextColor;
+    border-color: @sapUiButtonLiteActiveBorderColor;
+    box-shadow: none;
+    outline: none;
+  }
 }

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

@@ -86,25 +86,26 @@
 }
 
 /** UserActionsMenu Button (Avatar) **/
-
-#userActionsMenuHeaderButton {
-  border: 1px @sapDefault_BorderStyle @sapUiShellInteractiveBorderColor;
-}
-
-#userActionsMenuHeaderButton:hover {
-  box-shadow: @sapUiContentInteractionShadow;
-  background-color: @sapUiShellActiveBackground;
-}
-
-#userActionsMenuHeaderButton:focus:not(:focus-visible) {
-  outline: none;
-}
-
-#userActionsMenuHeaderButton:focus-visible {
-  outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
-  box-shadow: none;
-}
-
-#userActionsMenuHeaderButton:active {
-  background-color: @sapUiShellActiveBackground;
+.sapUshellShellHeader {
+  #userActionsMenuHeaderButton {
+    border: 1px @sapDefault_BorderStyle @sapUiShellInteractiveBorderColor;
+  }
+
+  #userActionsMenuHeaderButton:hover {
+    box-shadow: @sapUiContentInteractionShadow;
+    background-color: @sapUiShellActiveBackground;
+  }
+
+  #userActionsMenuHeaderButton:focus:not(:focus-visible) {
+    outline: none;
+  }
+
+  #userActionsMenuHeaderButton:focus-visible {
+    outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+    box-shadow: none;
+  }
+
+  #userActionsMenuHeaderButton:active {
+    background-color: @sapUiShellActiveBackground;
+  }
 }

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

@@ -86,25 +86,26 @@
 }
 
 /** UserActionsMenu Button (Avatar) **/
-
-#userActionsMenuHeaderButton {
-  border: 1px @sapDefault_BorderStyle @sapUiShellInteractiveBorderColor;
-}
-
-#userActionsMenuHeaderButton:hover {
-  box-shadow: @sapUiContentInteractionShadow;
-  background-color: @sapUiShellActiveBackground;
-}
-
-#userActionsMenuHeaderButton:focus:not(:focus-visible) {
-  outline: none;
-}
-
-#userActionsMenuHeaderButton:focus-visible {
-  outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
-  box-shadow: none;
-}
-
-#userActionsMenuHeaderButton:active {
-  background-color: @sapUiShellActiveBackground;
+.sapUshellShellHeader {
+  #userActionsMenuHeaderButton {
+    border: 1px @sapDefault_BorderStyle @sapUiShellInteractiveBorderColor;
+  }
+
+  #userActionsMenuHeaderButton:hover {
+    box-shadow: @sapUiContentInteractionShadow;
+    background-color: @sapUiShellActiveBackground;
+  }
+
+  #userActionsMenuHeaderButton:focus:not(:focus-visible) {
+    outline: none;
+  }
+
+  #userActionsMenuHeaderButton:focus-visible {
+    outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+    box-shadow: none;
+  }
+
+  #userActionsMenuHeaderButton:active {
+    background-color: @sapUiShellActiveBackground;
+  }
 }

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Extension for recent activities card
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/ui/integration/Extension",

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.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/ui/base/ManagedObject",

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Provides control sap.ushell.ui.launchpad.Section
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/base/Log",