Resolves conflicts

.github/workflows/checkmarx.yml

@@ -0,0 +1,21 @@
+name: Checkmarx One Scan
+on: 
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *"
+jobs:
+  trigger_scan:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkmarx One CLI Action
+        uses: checkmarx/ast-github-action@main #Github Action version
+        with:
+          project_name: Luigi
+          cx_tenant: sap
+          base_uri: https://checkmarx.tools.sap
+          #base_auth_uri: https://checkmarx.tools.sap
+          cx_client_id: ${{ secrets.CXONE_CLIENT_ID }}
+          cx_client_secret: ${{ secrets.CXONE_CLIENT_SECRET }}
+          branch: ${{ github.ref_name }}
+          additional_params: "--async --scan-types sast -s https://github.com/SAP/luigi.git"
+

CHANGELOG.md

@@ -25,6 +25,33 @@ The lerna-changelog tool detects changes based on PR labels and maps them to sec
 -->
 
 
+## [v2.17.0] (2024-10-02)
+
+#### :rocket: Added
+* [#3946](https://github.com/SAP/luigi/pull/3946) Adds option to disable luigiCookie ([@walmazacn](https://github.com/walmazacn))
+* [#3922](https://github.com/SAP/luigi/pull/3922) Adds node property for hiding global search ([@walmazacn](https://github.com/walmazacn))
+
+#### :bug: Fixed
+* [#3968](https://github.com/SAP/luigi/pull/3968) Fix fdToolLayout background-color ([@JohannesDoberer](https://github.com/JohannesDoberer))
+* [#3964](https://github.com/SAP/luigi/pull/3964) Clean Luigi store ([@JohannesDoberer](https://github.com/JohannesDoberer))
+
+
+
+
+
+
+## [v2.16.0] (2024-09-27)
+
+#### :rocket: Added
+* [#3938](https://github.com/SAP/luigi/pull/3938) LeftNav in btpLayout: make 'expanded' the default state for nav item groups ([@amilewskaa](https://github.com/amilewskaa))
+* [#3915](https://github.com/SAP/luigi/pull/3915) Adds optional renderer for navHeader ([@walmazacn](https://github.com/walmazacn))
+
+#### :bug: Fixed
+* [#3902](https://github.com/SAP/luigi/pull/3902) Fixes wrong drawer position ([@walmazacn](https://github.com/walmazacn))
+
+
+
+
 ## [v2.15.0] (2024-08-28)
 
 #### :rocket: Added
@@ -1853,4 +1880,6 @@ The lerna-changelog tool detects changes based on PR labels and maps them to sec
 [v2.14.1]: https://github.com/SAP/luigi/compare/v2.14.0...v2.14.1
 [v2.14.2]: https://github.com/SAP/luigi/compare/v2.14.1...v2.14.2
 [v2.14.3]: https://github.com/SAP/luigi/compare/v2.14.2...v2.14.3
-[v2.15.0]: https://github.com/SAP/luigi/compare/v2.14.3...v2.15.0
+[v2.15.0]: https://github.com/SAP/luigi/compare/v2.14.3...v2.15.0
+[v2.16.0]: https://github.com/SAP/luigi/compare/v2.15.0...v2.16.0
+[v2.17.0]: https://github.com/SAP/luigi/compare/v2.16.0...v2.17.0

blog/2024-07-10-release-notes.md

@@ -0,0 +1,33 @@
+---
+title: Luigi v2.14  
+seoMetaDescription: Release notes for Luigi v2.14
+author:
+  - Mahati Shankar
+layout: blog
+---
+
+You can read about the new features in Luigi v2.14 in the release notes below.
+
+<!-- Excerpt -->
+
+
+#### E2E Tests With Nightwatch, WebdriverIO and Puppeteer
+
+The testing-utilities library now additionally supports Nightwatch, WebdriverIO and Puppeteer. You can now use these testing frameworks for your e2e tests.
+
+#### getCurrentRoute Has Been Added
+
+[getCurrentRoute](https://docs.luigi-project.io/docs/luigi-core-api?section=getcurrentroute) has been added to the Luigi core API which as the name suggests returns the current Luigi route.
+
+#### getCurrentTheme in WC Client
+
+The method [getCurrentTheme](https://docs.luigi-project.io/docs/luigi-core-api?section=getcurrenttheme) is now part of the core API so you can now use it in the WebComponent client too.
+
+
+#### Fix Top Nav Children Not Rendered
+
+Fixed issue where nodes weren't rendered in the top navigation under certain conditions.
+
+#### Bugfixes
+
+For a full list of bugfixes in this release, see our [changelog](https://github.com/SAP/luigi/blob/main/CHANGELOG.md).

client-frameworks-support/client-support-angular/projects/client-support-angular/package.json

@@ -22,5 +22,5 @@
     "@luigi-project/client": "^2.0.0",
     "@luigi-project/testing-utilities": "^2.0.0"
   },
-  "version": "2.15.0"
+  "version": "2.17.0"
 }

client-frameworks-support/testing-utilities/dist/package.json

@@ -19,7 +19,7 @@
     "microfrontends",
     "testing"
   ],
-  "version": "2.15.0",
+  "version": "2.17.0",
   "engines": {
     "node": ">=18.19.1"
   }

client-frameworks-support/testing-utilities/package.json

@@ -29,7 +29,7 @@
     "microfrontends",
     "testing"
   ],
-  "version": "2.15.0",
+  "version": "2.17.0",
   "engines": {
     "node": ">=18.19.1"
   }

client/public/package.json

@@ -17,5 +17,5 @@
     "micro-frontends",
     "microfrontends"
   ],
-  "version": "2.15.0"
+  "version": "2.17.0"
 }

client/src/lifecycleManager.ts

@@ -114,6 +114,7 @@ class LifecycleManager extends LuigiClientBase {
       helpers.setLuigiCoreDomain(event.origin);
       this.luigiInitialized = true;
       this._notifyInit(event.origin);
+      this._tpcCheck();
       helpers.sendPostMessageToLuigiCore({ msg: 'luigi.init.ok' });
     });
 
@@ -166,10 +167,13 @@ class LifecycleManager extends LuigiClientBase {
       },
       '*'
     );
-    this._tpcCheck();
   }
 
   _tpcCheck(): void {
+    if ((this.currentContext.internal as Record<string, any>)['thirdPartyCookieCheck']?.disabled) {
+      return;
+    }
+
     let tpc: 'disabled' | 'enabled' = 'enabled';
     let cookies: string = document.cookie;
     let luigiCookie: string | undefined;
@@ -444,7 +448,6 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
-   * <!-- label-success: Web Component API  -->
    * Returns a list of active feature toggles
    * @returns {Array} a list of feature toggle names
    * @memberof lifecycleManager
@@ -457,7 +460,6 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
-   * <!-- label-success: Web Component API  -->
    * Sets node parameters in Luigi Core. The parameters will be added to the URL.
    * @param {Object} params
    * @param {boolean} keepBrowserHistory
@@ -476,7 +478,6 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
-   * <!-- label-success: Web Component API  -->
    * Returns the node parameters of the active URL.
    * Node parameters are defined like URL query parameters but with a specific prefix allowing Luigi to pass them to the micro frontend view. The default prefix is **~** and you can use it in the following way: `https://my.luigi.app/home/products?~sort=asc&~page=3`.
    * <!-- add-attribute:class:warning -->
@@ -495,7 +496,6 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
-   * <!-- label-success: Web Component API  -->
    * Returns the dynamic path parameters of the active URL.
    * Path parameters are defined by navigation nodes with a dynamic **pathSegment** value starting with **:**, such as **productId**.
    * All path parameters in the current navigation path (as defined by the active URL) are returned.
@@ -522,7 +522,7 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
-   * <!-- label-success: Web Component API  -->
+   * <!-- label-success: Web App API only  -->
    * Sends search query parameters to Luigi Core. The search parameters will be added to the URL if they are first allowed on a node level using {@link navigation-parameters-reference.md#clientpermissionsurlparameters clientPermissions.urlParameters}.
    * @param {Object} searchParams
    * @param {boolean} keepBrowserHistory
@@ -541,7 +541,6 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
-   * <!-- label-success: Web Component API  -->
    * Returns the current client permissions as specified in the navigation node or an empty object. For details, see [Node parameters](navigation-parameters-reference.md).
    * @returns {Object} client permissions as specified in the navigation node
    * @memberof lifecycleManager
@@ -553,6 +552,7 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
+   * <!-- label-success: Web App API only  -->
    * When the micro frontend is not embedded in the Luigi Core application and there is no init handshake you can set the target origin that is used in postMessage function calls by Luigi Client. Typically used only in custom micro-frontend frameworks that are compatible with LuigiClient API.
    * @param {string} origin target origin
    * @memberof lifecycleManager
@@ -565,6 +565,7 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
+   * <!-- label-success: Web App API only  -->
    * Sends a custom message to the Luigi Core application.
    * @param {Object} message an object containing data to be sent to the Luigi Core to process it further. This object is set as an input parameter of the custom message listener on the Luigi Core side
    * @param {string} message.id a string containing the message id
@@ -582,7 +583,6 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
-   * <!-- label-success: Web Component API  -->
    * Returns the current user settings based on the selected node.
    * @returns {Object} current user settings
    * @since 1.7.1
@@ -595,7 +595,6 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
-   * <!-- label-success: Web Component API  -->
    * Returns the current anchor based on active URL.
    * @memberof lifecycleManager
    * @since 1.21.0
@@ -608,7 +607,6 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
-   * <!-- label-success: Web Component API  -->
    * Sends anchor to Luigi Core. The anchor will be added to the URL.
    * @param {string} anchor
    * @since 1.21.0
@@ -624,7 +622,6 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   /**
-   * <!-- label-success: Web Component API  -->
    * This function allows you to change node labels within the same {@link navigation-advanced.md#view-groups view group}, e.g. in your node config: `label: 'my Node {viewGroupData.vg1}'`.
    * @since 2.2.0
    * @param {Object} data a data object containing the view group name and desired label