@sapui5/sap.ushell_abap 1.97.1 → 1.100.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell_abap",
-    "version": "1.97.1",
+    "version": "1.100.0",
     "description": "SAPUI5 Library sap.ushell_abap",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [

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

@@ -2,8 +2,8 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell_abap</name>
     <vendor>SAP SE</vendor>
-    <version>1.97.1</version>
-    <copyright>Copyright (c) 2009-2022 SAP SE. All rights reserved.</copyright>
+    <version>1.100.0</version>
+    <copyright>Copyright (c) 2009-2022 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell_abap</documentation>
 
     <dependencies>

package/src/main/js/sap/ushell_abap/adapters/abap/AdapterContainer.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell_abap/adapters/abap/AppStateAdapter.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The Unified Shell's AppStateAdapter for the ABAP platform.
- * @version 1.97.1
+ * @version 1.100.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell_abap/adapters/abap/ClientSideTargetResolutionAdapter.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview ClientSideTargetResolutionAdapter for the abap platform.
@@ -9,7 +9,7 @@
  *     <li>provide the resolveHashFragmentFallback function, a fallback method called by ClientSideTargetResolution service.</li>
  *   </ul>
  *
- * @version 1.97.1
+ * @version 1.100.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell_abap/adapters/abap/ConfigurationDefaultsAdapter.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The ConfigurationDefaults adapter for the ABAP platform.
- * @version 1.97.1
+ * @version 1.100.0
  */
 sap.ui.define([
     "sap/ushell_abap/bootstrap/evo/abap.constants",

package/src/main/js/sap/ushell_abap/adapters/abap/ContainerAdapter.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 /**
  * @fileOverview The Unified Shell's container adapter for the ABAP platform.
  *
- * @version 1.97.1
+ * @version 1.100.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
@@ -222,6 +222,20 @@ sap.ui.define([
                                 break;
                         }
                     }
+                    // Dark Mode Auto Detection - whether the user has disabled it
+                    if (oUserProfileParameter.id === "THEME_DARKMODE_AUTO_DETECTION") {
+                        switch (oUserProfileParameter.value) {
+                            case "false":
+                                oStartupResult.detectDarkMode = false;
+                                break;
+                            case "true":
+                                oStartupResult.detectDarkMode = true;
+                                break;
+                            default:
+                                oStartupResult.detectDarkMode = undefined;
+                                break;
+                        }
+                    }
                 });
             }
         };

package/src/main/js/sap/ushell_abap/adapters/abap/LaunchPageAdapter.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
- * @version 1.97.1
+ * @version 1.100.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI",
@@ -2594,6 +2594,31 @@ sap.ui.define([
             return sId;
         };
 
+        /**
+         * Returns the stable id of the catalog tile.
+         * Note: If no stable id can be retrieved (For example for technical catalog tiles) or the reference is broken
+         * a fallback to the normal id is in place.
+         *
+         * @param {sap.ui2.ChipInstance} oTile the tile or the catalog tile
+         * @returns {string} the stable id
+         * @private
+         * @since 1.98.0
+         */
+        this.getStableCatalogTileId = function (oTile) {
+            var oChip = oTile.getChip();
+            var sStableId = oChip.getReferenceChipId();
+
+            if (sStableId === "O") {
+                // The reference is broken. We do not want to return the value indicating that
+                sStableId = null;
+            }
+            if (!sStableId) {
+                sStableId = this.getCatalogTileId(oTile);
+            }
+
+            return sStableId;
+        };
+
         /**
          * Returns the catalog tile's title. May be called for a catalog tile or (since 1.32.0) for a group tile.
          *
@@ -3665,8 +3690,16 @@ sap.ui.define([
 
                 oResponse.results.forEach(function (oCatalog) {
                     oCatalog.Chips.results.forEach(function (oChip) {
-                        if (!oCatalogTileIndex[oChip.id]) {
-                            oCatalogTileIndex[oChip.id] = oChip;
+                        var sChipId;
+
+                        if (Config.last("/core/stableIDs/enabled") && oChip.referenceChipId) {
+                            sChipId = oChip.referenceChipId;
+                        } else {
+                            sChipId = oChip.id;
+                        }
+
+                        if (!oCatalogTileIndex[sChipId]) {
+                            oCatalogTileIndex[sChipId] = oChip;
                         }
                     });
                 });

package/src/main/js/sap/ushell_abap/adapters/abap/MenuAdapter.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview MenuAdapter for the ABAP platform.
@@ -37,17 +37,77 @@ sap.ui.define([
 
     /**
      * Gets the menu entries for the spaces assigned to the user.
-     *
+     * Handles the MyHomeSpace visibility.
      * @returns {Promise<MenuEntry[]>} The menu entries, @see sap.ushell.services.menu#MenuEntry
      *
      * @since 1.72.0
      * @private
      */
-    MenuAdapter.prototype.getMenuEntries = function () {
+     MenuAdapter.prototype.getMenuEntries = function () {
+        var bHomeAppEnabled = Config.last("/core/homeApp/enabled");
+        var bMyHomeSpaceEnabled = Config.last("/core/spaces/myHome/enabled");
+        var bMyHomeUserEnabled = Config.last("/core/spaces/myHome/userEnabled");
+        var sMyHomeSpaceId = Config.last("/core/spaces/myHome/myHomeSpaceId");
+
+        var aMetatagMenu = this._getAssignedSpaces();
 
+        // only remove myHomeSpace when myHome is enabled and user has disabled it
+        // remove myHomeSpace when homeApp is enabled
+        if ((bHomeAppEnabled && bMyHomeSpaceEnabled) || (bMyHomeSpaceEnabled && !bMyHomeUserEnabled)) {
+            for (var i = 0; i < aMetatagMenu.length; i++) {
+                if (aMetatagMenu[i].id === sMyHomeSpaceId) {
+                    aMetatagMenu = aMetatagMenu.slice(1);
+                    break;
+                }
+            }
+        }
+        var aMenuEntries = this._buildMenuEntries(aMetatagMenu);
+        return Promise.resolve(aMenuEntries);
+    };
+
+    /**
+     * Gets the menu entries for the spaces assigned to the user.
+     * Handles the MyHomeSpace visibility.
+     * Those menu items and their structure is used for the selection in bookmarking.
+     * @returns {Promise<MenuEntry[]>} The menu entries, @see sap.ushell.services.menu#MenuEntry
+     *
+     * @since 1.100.0
+     * @private
+     */
+     MenuAdapter.prototype.getContentNodes = function () {
+        var bHomeAppEnabled = Config.last("/core/homeApp/enabled");
+        var bMyHomeSpaceEnabled = Config.last("/core/spaces/myHome/enabled");
+        var bMyHomeUserEnabled = Config.last("/core/spaces/myHome/userEnabled");
+        var sMyHomeSpaceId = Config.last("/core/spaces/myHome/myHomeSpaceId");
+
+        var aMetatagMenu = this._getAssignedSpaces();
+        // only remove myHomeSpace when myHome is enabled and user has disabled it
+        // but always keep myHomeSpace when homeApp is enabled
+        if (!bHomeAppEnabled && bMyHomeSpaceEnabled && !bMyHomeUserEnabled) {
+            for (var i = 0; i < aMetatagMenu.length; i++) {
+                if (aMetatagMenu[i].id === sMyHomeSpaceId) {
+                    aMetatagMenu = aMetatagMenu.slice(1);
+                    break;
+                }
+            }
+        }
+        var aMenuEntries = this._buildMenuEntries(aMetatagMenu);
+        return Promise.resolve(aMenuEntries);
+    };
+
+    /**
+     * Builds based on the metatags a menu which is accepted by the menu service
+     * @param {object[]} aMetatagMenu The menu content from the metatags
+     * @returns {MenuEntry[]} The menu structure required by the menu service, @see sap.ushell.services.menu#MenuEntry
+     *
+     * @private
+     * @since 1.100.0
+     */
+     MenuAdapter.prototype._buildMenuEntries = function (aMetatagMenu) {
         // Create a 1st level menu entry for each user-assigned space
         // having 2nd level sub menu entries for its pages inside if needed
-        var aMenuEntries = this._getAssignedSpaces()
+
+        var aMenuEntries = aMetatagMenu
             .filter(function (oSpace) {
 
                 // No menu entry for a space, if no page assigned
@@ -115,13 +175,12 @@ sap.ui.define([
                 return oTopMenuEntry;
             });
 
-        return Promise.resolve(aMenuEntries);
+        return aMenuEntries;
     };
 
     /**
      * Gets the menu entries for the pages assigned to the user by querying the
      * content of the meta tag with the name' sap.ushell.assignedSpaces'.
-     * Spaces without pages are not included in the result.
      *
      * @returns {object[]} The assigned spaces from the 'sap.ushell.assignedSpaces' meta tag
      *
@@ -134,15 +193,6 @@ sap.ui.define([
             return [];
         }
         var aMetatagMenu = JSON.parse(oMetatag.getAttribute("content"));
-        var sMyHomeSpaceId = Config.last("/core/spaces/myHome/myHomeSpaceId");
-        if (Config.last("/core/spaces/myHome/enabled") && !Config.last("/core/spaces/myHome/userEnabled")) {
-            for (var i = 0; i < aMetatagMenu.length; i++) {
-                if (aMetatagMenu[i].id === sMyHomeSpaceId) {
-                    aMetatagMenu = aMetatagMenu.slice(1);
-                    break;
-                }
-            }
-        }
         return aMetatagMenu;
     };
 

package/src/main/js/sap/ushell_abap/adapters/abap/NavTargetResolutionAdapter.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The NavTargetResolution adapter for the ABAP platform.
@@ -8,7 +8,7 @@
  * service now calls the ClientSideTargetResolution service in the abap
  * platform.
  *
- * @version 1.97.1
+ * @version 1.100.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell_abap/adapters/abap/PageBuildingAdapter.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE. All rights reserved.
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
- * @version 1.97.1
+ * @version 1.100.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",