Resolves conflicts

CHANGELOG.md

@@ -25,6 +25,16 @@ The lerna-changelog tool detects changes based on PR labels and maps them to sec
 -->
 
 
+## [v2.18.0] (2024-11-05)
+
+#### :rocket: Added
+* [#4008](https://github.com/SAP/luigi/pull/4008) Adds document attribute for disable tcpcheck ([@walmazacn](https://github.com/walmazacn))
+* [#3983](https://github.com/SAP/luigi/pull/3983) Disable tpc via client ([@JohannesDoberer](https://github.com/JohannesDoberer))
+
+
+
+
+
 ## [v2.17.0] (2024-10-02)
 
 #### :rocket: Added
@@ -1882,4 +1892,5 @@ The lerna-changelog tool detects changes based on PR labels and maps them to sec
 [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.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
+[v2.17.0]: https://github.com/SAP/luigi/compare/v2.16.0...v2.17.0
+[v2.18.0]: https://github.com/SAP/luigi/compare/v2.17.0...v2.18.0

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

@@ -34,7 +34,7 @@
     "@types/jasmine": "~3.6.0",
     "@types/node": "^12.11.1",
     "codelyzer": "^6.0.0",
-    "engine.io": "~6.5.5",
+    "engine.io": "~6.6.2",
     "jasmine-core": "~3.8.0",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "~6.3.16",

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.17.0"
+  "version": "2.18.0"
 }

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

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

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

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

client/public/package.json

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

client/src/lifecycleManager.ts

@@ -19,7 +19,6 @@ class LifecycleManager extends LuigiClientBase {
   currentContext!: Context;
   private authData: AuthData;
   private defaultContextKeys: string[];
-  private disableTpcCheck: boolean;
   private luigiInitialized: boolean;
   private _onContextUpdatedFns: Record<any, any>;
   private _onInactiveFns: Record<any, any>;
@@ -28,8 +27,6 @@ class LifecycleManager extends LuigiClientBase {
   /** @private */
   constructor() {
     super();
-
-    this.disableTpcCheck = false;
     this.luigiInitialized = false;
     this.defaultContextKeys = ['context', 'internal', 'nodeParams', 'pathParams', 'searchParams'];
 
@@ -60,6 +57,18 @@ class LifecycleManager extends LuigiClientBase {
     return window.document.head.hasAttribute('defer-luigi-init');
   }
 
+  /**
+   * Check if the html head element contains the attribute "disable-tpc-check"
+   * @private
+   * @memberof Lifecycle
+   */
+  _isTpcCheckDisabled(): boolean {
+    return !!(
+      window.document.head.hasAttribute('disable-tpc-check') ||
+      (this.currentContext.internal as Record<string, any>)['thirdPartyCookieCheck']?.disabled
+    );
+  }
+
   /**
    * Check if LuigiClient is initialized
    * @returns {boolean} client initialized state
@@ -172,7 +181,7 @@ class LifecycleManager extends LuigiClientBase {
   }
 
   _tpcCheck(): void {
-    if ((this.currentContext.internal as Record<string, any>)['thirdPartyCookieCheck']?.disabled || this.disableTpcCheck) {
+    if (this._isTpcCheckDisabled()) {
       return;
     }
 
@@ -271,9 +280,12 @@ class LifecycleManager extends LuigiClientBase {
   addInitListener(initFn: (context: Context, origin?: string) => void, disableTpcCheck: boolean): number {
     const id: number = helpers.getRandomId();
 
-    this.disableTpcCheck = disableTpcCheck;
     this._onInitFns[`${id}`] = initFn;
 
+    if (disableTpcCheck) {
+      document.head.setAttribute('disable-tpc-check', 'true');
+    }
+
     if (this.luigiInitialized && helpers.isFunction(initFn)) {
       initFn(this.currentContext.context as Record<string, any>, helpers.getLuigiCoreDomain());
     }

client/src/linkManager.ts

@@ -438,8 +438,8 @@ class linkManager extends LuigiClientBase {
     const pathExistsPromises = this.getPromise('pathExistsPromises') || {};
 
     pathExistsPromises[currentId] = {
-      resolveFn: function() {},
-      then: function(resolveFn: () => void) {
+      resolveFn: function () {},
+      then: function (resolveFn: () => void) {
         this.resolveFn = resolveFn;
       }
     };
@@ -562,8 +562,8 @@ class linkManager extends LuigiClientBase {
     const currentRoutePromise = this.getPromise('getCurrentRoute') || {};
 
     currentRoutePromise[currentId] = {
-      resolveFn: function() {},
-      then: function(resolveFn: () => void) {
+      resolveFn: function () {},
+      then: function (resolveFn: () => void) {
         this.resolveFn = resolveFn;
       }
     };

client/src/uxManager.ts

@@ -99,7 +99,7 @@ class UxManager extends LuigiClientBase {
    *  });
    */
   showConfirmationModal(settings: ConfirmationModalSettings): Promise<void> {
-    helpers.addEventListener('luigi.ux.confirmationModal.hide', (event, listenerId) => {
+    helpers.addEventListener('luigi.ux.confirmationModal.hide', (event: any, listenerId: string) => {
       this.hideConfirmationModal(event.data.data);
       helpers.removeEventListener(listenerId);
     });
@@ -174,7 +174,7 @@ class UxManager extends LuigiClientBase {
     // generate random ID
     settings.id = helpers.getRandomId().toString();
 
-    helpers.addEventListener('luigi.ux.alert.hide', (event, listenerId) => {
+    helpers.addEventListener('luigi.ux.alert.hide', (event: any, listenerId: string) => {
       if (event.data.id === settings.id) {
         this.hideAlert(event.data);
         helpers.removeEventListener(listenerId);
@@ -194,7 +194,7 @@ class UxManager extends LuigiClientBase {
     const alertPromises = this.getPromise('alerts') || {};
 
     alertPromises[settings.id] = {};
-    alertPromises[settings.id].promise = new Promise(resolve => {
+    alertPromises[settings.id].promise = new Promise((resolve) => {
       alertPromises[settings.id].resolveFn = resolve;
     });
     this.setPromise('alerts', alertPromises);
@@ -310,7 +310,7 @@ class UxManager extends LuigiClientBase {
    * @example LuigiClient.uxManager().applyCSS();
    */
   applyCSS(): void {
-    document.querySelectorAll('head style[luigi-injected]').forEach(luigiInjectedStyleTag => {
+    document.querySelectorAll('head style[luigi-injected]').forEach((luigiInjectedStyleTag) => {
       luigiInjectedStyleTag.remove();
     });
 
@@ -319,7 +319,7 @@ class UxManager extends LuigiClientBase {
     if (vars) {
       let cssString = ':root {\n';
 
-      Object.keys(vars).forEach(key => {
+      Object.keys(vars).forEach((key) => {
         const val = vars[key];
 
         cssString += (key.startsWith('--') ? '' : '--') + key + ':' + val + ';\n';