Backport mui 7 to 1.18 esp (#7267)

* Scale name in components fixed (#7258) Mui data grid version change 6 -> 7 Co-authored-by: Marcel Philipiak <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
TouK · Dec 4, 2024 · 101f056 · 101f056
1 parent f7e631c
commit 101f056
Show file tree

Hide file tree

Showing 21 changed files with 5,893 additions and 40,776 deletions.
diff --git a/...Linux/Components list should allow filtering by name with multiple words #0.png b/...Linux/Components list should allow filtering by name with multiple words #0.png
diff --git a/...electron/Linux/Components list should allow filtering by processing mode #1.png b/...electron/Linux/Components list should allow filtering by processing mode #1.png
diff --git a/...apshots__/electron/Linux/Components list should allow filtering by usage #0.png b/...apshots__/electron/Linux/Components list should allow filtering by usage #0.png
diff --git a/...apshots__/electron/Linux/Components list should allow filtering by usage #1.png b/...apshots__/electron/Linux/Components list should allow filtering by usage #1.png
diff --git a/...apshots__/electron/Linux/Components list should apply filters from query #0.png b/...apshots__/electron/Linux/Components list should apply filters from query #0.png
diff --git a/...mage_snapshots__/electron/Linux/Components list should display component #0.png b/...mage_snapshots__/electron/Linux/Components list should display component #0.png
diff --git a/...__image_snapshots__/electron/Linux/Components list should display usages #0.png b/...__image_snapshots__/electron/Linux/Components list should display usages #0.png
diff --git a/...age_snapshots__/electron/Linux/Components list should filter usage types #0.png b/...age_snapshots__/electron/Linux/Components list should filter usage types #0.png
diff --git a/...age_snapshots__/electron/Linux/Components list should filter usage types #1.png b/...age_snapshots__/electron/Linux/Components list should filter usage types #1.png
diff --git a/...age_snapshots__/electron/Linux/Components list should filter usage types #2.png b/...age_snapshots__/electron/Linux/Components list should filter usage types #2.png
diff --git a/.../__image_snapshots__/electron/Linux/Components list should filter usages #0.png b/.../__image_snapshots__/electron/Linux/Components list should filter usages #0.png
diff --git a/designer/client/cypress/e2e/components.cy.ts b/designer/client/cypress/e2e/components.cy.ts
@@ -247,7 +247,7 @@ describe("Components list", () => {
         });
 
         // Sort by processing mode
-        cy.get("[role='columnheader'][aria-label='Processing modes']").dblclick({ force: true });
+        cy.get("[role='columnheader'][data-field='allowedProcessingModes']").dblclick({ force: true });
 
         cy.get("#app-container>main").matchImage();
     });

diff --git a/designer/client/package-lock.json b/designer/client/package-lock.json
diff --git a/designer/client/package.json b/designer/client/package.json
@@ -11,10 +11,11 @@
         "@hello-pangea/dnd": "16.6.0",
         "@juggle/resize-observer": "3.3.1",
         "@loadable/component": "5.15.2",
-        "@mui/icons-material": "5.15.7",
-        "@mui/lab": "5.0.0-alpha.165",
-        "@mui/material": "5.15.7",
-        "@touk/federated-component": "1.0.0",
+        "@mui/icons-material": "5.16.7",
+        "@mui/lab": "5.0.0-alpha.173",
+        "@mui/material": "5.16.7",
+        "@mui/system": "5.16.7",
+        "@touk/federated-component": "1.1.0",
         "@touk/window-manager": "1.9.0",
         "ace-builds": "1.34.2",
         "axios": "1.7.5",

diff --git a/designer/client/src/containers/Auth/strategies/RemoteAuthStrategy/externalAuthModule.ts b/designer/client/src/containers/Auth/strategies/RemoteAuthStrategy/externalAuthModule.ts
@@ -1,4 +1,4 @@
-import { ComponentType, PropsWithChildren } from "react";
+import { ComponentType, ForwardRefExoticComponent, PropsWithChildren, PropsWithoutRef, RefAttributes } from "react";
 import { Module } from "@touk/federated-component";
 
 interface RedirectState {
@@ -40,7 +40,7 @@ export interface ExternalAuthModule extends Module {
     /**
      * provides auth context for hooks
      */
-    default: ComponentType<PropsWithChildren<Props>>;
+    default: ForwardRefExoticComponent<PropsWithoutRef<PropsWithChildren<Props>> & RefAttributes<unknown>>;
     /**
      * returns auth client from context
      */

diff --git a/designer/client/test/Process/__snapshots__/ProcessStateIcon-test.tsx.snap b/designer/client/test/Process/__snapshots__/ProcessStateIcon-test.tsx.snap
@@ -2,12 +2,7 @@
 
 exports[`ProcessStateIcon tests should show data from loaded process.state 1`] = `
 .emotion-0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
   display: flex;
-  width: 100%;
-  height: 100%;
   width: 20px;
   height: 20px;
 }
@@ -28,12 +23,7 @@ exports[`ProcessStateIcon tests should show data from loaded process.state 1`] =
 
 exports[`ProcessStateIcon tests should show defaults for loaded process.state without data 1`] = `
 .emotion-0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
   display: flex;
-  width: 100%;
-  height: 100%;
   width: 20px;
   height: 20px;
 }
@@ -53,12 +43,7 @@ exports[`ProcessStateIcon tests should show defaults for loaded process.state wi
 
 exports[`ProcessStateIcon tests should show defaults for missing process.state and stateProcess 1`] = `
 .emotion-0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
   display: flex;
-  width: 100%;
-  height: 100%;
   width: 20px;
   height: 20px;
 }
@@ -78,12 +63,7 @@ exports[`ProcessStateIcon tests should show defaults for missing process.state a
 
 exports[`ProcessStateIcon tests should show defaults if loadedProcess is empty 1`] = `
 .emotion-0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
   display: flex;
-  width: 100%;
-  height: 100%;
   width: 20px;
   height: 20px;
 }
@@ -103,12 +83,7 @@ exports[`ProcessStateIcon tests should show defaults if loadedProcess is empty 1
 
 exports[`ProcessStateIcon tests should show loadedProcess data 1`] = `
 .emotion-0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
   display: flex;
-  width: 100%;
-  height: 100%;
   width: 20px;
   height: 20px;
 }