@sapui5/sap.ushell 1.126.1 → 1.127.0

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPage.js

@@ -32,7 +32,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.126.1
+     * @version 1.127.0
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageButton.js

@@ -20,7 +20,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.126.1
+     * @version 1.127.0
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageCell.js

@@ -45,7 +45,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.126.1
+     * @version 1.127.0
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageColumn.js

@@ -32,7 +32,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.126.1
+     * @version 1.127.0
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageColumnResizer.js

@@ -17,7 +17,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.126.1
+     * @version 1.127.0
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageRow.js

@@ -25,7 +25,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.126.1
+     * @version 1.127.0
      *
      * @private
      * @experimental

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.workPageBuilder",
         "applicationVersion": {
-            "version": "1.126.1"
+            "version": "1.127.0"
         },
         "i18n": "../../utils/workpage/resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

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

@@ -3,7 +3,7 @@
  * @fileOverview WorkPages Runtime Component
  * This UIComponent gets initialized by the FLP renderer if work pages are enabled (/core/workPages/enabled).
  *
- * @version 1.126.1
+ * @version 1.127.0
  */
 
 sap.ui.define([
@@ -27,7 +27,8 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.workPageRuntime.Component", /** @lends sap.ushell.components.workPageRuntime.Component.prototype */{
         metadata: {
             manifest: "json",
-            library: "sap.ushell"
+            library: "sap.ushell",
+            interfaces: ["sap.ui.core.IAsyncContentCreation"]
         },
 
         /**

package/src/main/js/sap/ushell/components/workPageRuntime/controller/WorkPageRuntime.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file WorkPageRuntime controller for WorkPageRuntime view
- * @version 1.126.1
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.workPageRuntime",
         "applicationVersion": {
-            "version": "1.126.1"
+            "version": "1.127.0"
         },
         "ach": "CA-FLP-FE-UI",
         "type": "component",

package/src/main/js/sap/ushell/designtime/ApplicationContainer.designtime.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Provides the Design Time Metadata for the sap.ushell.components.container.ApplicationContainer control
- * @version 1.126.1
+ * @version 1.127.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/library.js

@@ -35,7 +35,7 @@ sap.ui.define([
      */
     var oUshellLibrary = Library.init({
         name: "sap.ushell",
-        version: "1.126.1",
+        version: "1.127.0",
         dependencies: [
             "sap.ui.core",
             "sap.m"

package/src/main/js/sap/ushell/navigationMode.js

@@ -11,7 +11,7 @@
  * Method Compute is used by ClientSide TargetResolution and takes not only the
  * next application but also the current application into account.
  *
- * @version 1.126.1
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/performance/ShellAnalytics.js

@@ -3,7 +3,7 @@
  * @fileOverview Provides analytical data like duration for navigation steps in the shell, in FLP,
  *               in particular an array of all statistical records
  *
- * @version 1.126.1
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -147,20 +147,26 @@ sap.ui.define([
 
     /**
      * Removes the parameters of a technical name that comes
-     * with a transaction name and parameters.
-     * Removes star at the beginning if it exists.
+     * with a transaction name and parameters and does some more
+     * amendments in addition to it.
+     *
+     * Removes a star at the beginning if it exists.
+     * Removes all commas.
+     * Trims down to 15 chararcters.
      * Replaces the string (TCODE) by the string (TR) at the end.
+     *
      * @param {string} [sTechnicalName] Technical name of a transaction with parameters or WD application
      * @returns {string} The transaction name or an empty string if input is not a transaction
      */
     function _removeParametersIfTransaction (sTechnicalName) {
        const sTechnicalNameWithDefault = sTechnicalName || "";
        if (sTechnicalNameWithDefault.slice(-7) === "(TCODE)") {
-           return sTechnicalNameWithDefault
-           .replace(/ .*/, "") // remove all starting with a space
-           .replace(/^\*/, "") // remove star at the beginning
-           .substring(0, 15) // trim 15 char
-           .concat(" (TR)"); // add type
+            return sTechnicalNameWithDefault
+            .replace(/ .*/, "") // Remove all after the first space, therefore removing " (TCODE)" as well.
+            .replace(/^\*/, "") // Remove star at the beginning.
+            .replace(/,/g, "") // Remove all commas, because fesr has the csv format with comma separation.
+            .substring(0, 15) // Trim down to 15 char.
+            .concat(" (TR)"); // Add type.
        }
        return sTechnicalNameWithDefault;
    }
@@ -242,10 +248,7 @@ sap.ui.define([
         // application Type WDA / TR / WCF
         // get technicalName from application configuration
         const sTechnicalNameFromAppConfiguration = AppConfiguration.getMetadata().technicalName || AppConfiguration.getCurrentApplication().text || oCurrentApp.applicationType;
-        const sTechnicalNameForFESR = _removeParametersIfTransaction(
-            //need to remove all comma, because fesr has the csv format with comma separation
-                sTechnicalNameFromAppConfiguration.replace(/,/g, "")
-            );
+        const sTechnicalNameForFESR = _removeParametersIfTransaction(sTechnicalNameFromAppConfiguration);
 
         return {
             type: oCurrentApp.applicationType,

package/src/main/js/sap/ushell/performance/StatisticalRecord.js

@@ -3,7 +3,7 @@
  * @fileOverview Class for statistical record
  *               It should contain data like step, duration after a navigation in the shell, can have status open.
  *               The closing of a record is logged in debug mode
- * @version 1.126.1
+ * @version 1.127.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/plugins/appwarmup/Component.js

@@ -87,7 +87,7 @@ sap.ui.define(
         var sComponentName = "sap.ushell.plugins.appwarmup.Component";
         return Component.extend(sComponentName, {
             metadata: {
-                version: "1.126.1",
+                version: "1.127.0",
                 library: "sap.ushell"
             },
 

package/src/main/js/sap/ushell/renderer/AccessKeysHandler.js

@@ -8,7 +8,9 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/EventHub",
     "sap/ushell/resources",
-    "sap/ushell/Container"
+    "sap/ushell/state/StateManager",
+    "sap/ushell/Container",
+    "sap/ushell/state/ShellModel"
 ], function (
     EventProvider,
     Device,
@@ -17,10 +19,23 @@ sap.ui.define([
     Config,
     EventHub,
     resources,
-    Container
+    StateManager,
+    Container,
+    ShellModel
 ) {
     "use strict";
 
+    // shortcut for sap.ushell.state.StateManager.LaunchpadState
+    const LaunchpadState = StateManager.LaunchpadState;
+
+    // shortcut for sap.ushell.state.StateManager.ShellMode
+    const ShellMode = StateManager.ShellMode;
+    const {
+        Default,
+        Headerless,
+        Minimal
+    } = ShellMode;
+
     var AccessKeysHandler = EventProvider.extend("sap.ushell.renderer.AccessKeysHandler", {
         constructor: function () {
             EventProvider.apply(this, arguments);
@@ -38,8 +53,8 @@ sap.ui.define([
         }
     });
 
-    AccessKeysHandler.prototype.init = function (oModel) {
-        this.oModel = oModel;
+    AccessKeysHandler.prototype.init = function () {
+        this.oConfigModel = ShellModel.getConfigModel();
         // prevent browser event ctrl+up/down from scrolling page
         // created by user `keydown` native event needs to be cancelled so browser will not make default action, which is scroll.
         // Instead we clone same event and dispatch it programmatic, so all handlers expecting to this event will still work
@@ -63,9 +78,16 @@ sap.ui.define([
                 this._handleEventUsingExternalKeysHandler(oEvent);
             }
 
-            var sCurrentState = Config.last("/core/shell/model/currentState/stateName");
-            if (sCurrentState !== "headerless" && sCurrentState !== "headerless-home") {
-                var bAdvancedShellActions = (sCurrentState === "home" || sCurrentState === "app" || sCurrentState === "minimal");
+            const sCurrentShellMode = StateManager.getShellMode();
+            const sCurrentLaunchpadState = StateManager.getLaunchpadState();
+            if (sCurrentShellMode !== Headerless) {
+                let bAdvancedShellActions = false;
+                if (sCurrentLaunchpadState === LaunchpadState.Home) {
+                    bAdvancedShellActions = StateManager.isLegacyHome();
+                } else { // app
+                    bAdvancedShellActions = [Default, Minimal].includes(sCurrentShellMode);
+                }
+
                 this.handleShortcuts(oEvent, bAdvancedShellActions);
             }
 
@@ -134,8 +156,8 @@ sap.ui.define([
     };
 
     AccessKeysHandler.prototype._handleAccessOverviewKey = function (bAdvancedShellActions) {
-        var bSearchAvailable = this.oModel.getProperty("/searchAvailable"),
-            bPersonalization = this.oModel.getProperty("/personalization"),
+        var bSearchAvailable = this.oConfigModel.getProperty("/searchAvailable"),
+            bPersonalization = this.oConfigModel.getProperty("/personalization"),
             bEnableAppFinder = Config.last("/core/catalog/enabled"),
             bEnableNotifications = Config.last("/core/shell/model/enableNotifications");