Merge branch 'main' into feat/simplify-iframe-integrations

enrico-kaack-comp · web-flow · commit b844be723d65 · 2025-08-29T09:31:38.000+02:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # BUILD STAGE
-FROM node:24-slim@sha256:ac365b72b69807f4b0f73bcddccffbed7307cc6e296fddf778f3c6ffd6be2381 AS build-stage
+FROM node:24-slim@sha256:9b741b28148b0195d62fa456ed84dd6c953c1f17a3761f3e6e6797a754d9edff AS build-stage
 WORKDIR /usr/src/app
 
 # Copy package.json and package-lock.json
@@ -18,7 +18,7 @@ RUN npm prune --omit=dev
 
 
 # PRODUCTION STAGE
-FROM gcr.io/distroless/nodejs24-debian12@sha256:767b6dcea4bbc0ad1f1893c7444e44e7d8a3bc64d53fcd0cddc35b4264c4834a AS production
+FROM gcr.io/distroless/nodejs24-debian12@sha256:98fd27d54e32d0d281a4c41db1bbe87a61259b2cad12c61bb1b8c0e32166162d AS production
 WORKDIR /usr/src/app
 
 # Copy built files
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Dialogs/CreateProjectDialogContainer.tsx b/src/components/Dialogs/CreateProjectDialogContainer.tsx
@@ -53,7 +53,7 @@ export function CreateProjectDialogContainer({
 
   useEffect(() => {
     if (username) {
-      setValue('members', [{ name: username, role: MemberRoles.admin, kind: 'User' }]);
+      setValue('members', [{ name: username, roles: [MemberRoles.admin], kind: 'User' }]);
     }
     if (!isOpen) {
       clearForm();
diff --git a/src/components/Dialogs/CreateWorkspaceDialogContainer.tsx b/src/components/Dialogs/CreateWorkspaceDialogContainer.tsx
@@ -68,7 +68,7 @@ export function CreateWorkspaceDialogContainer({
 
   useEffect(() => {
     if (username) {
-      setValue('members', [{ name: username, role: MemberRoles.admin, kind: 'User' }]);
+      setValue('members', [{ name: username, roles: [MemberRoles.admin], kind: 'User' }]);
     }
     if (!isOpen) {
       clearForm();
diff --git a/src/components/Graphs/Graph.module.css b/src/components/Graphs/Graph.module.css
@@ -2,7 +2,7 @@
   display: flex;
   height: 600px;
   border: 1px solid var(--sapList_BorderColor, #ddd);
-  border-radius: 8px;
+  border-radius: 16px;
   overflow: hidden;
   background-color: var(--sapBackgroundColor, #fafafa);
   font-family: var(--sapFontFamily);
@@ -20,6 +20,7 @@
   gap: 1rem;
   align-items: center;
   color: var(--sapTextColor, #222);
+  font-size: var(--sapFontSize);
 }
 
 .graphToolbar {
diff --git a/src/components/Graphs/Legend.module.css b/src/components/Graphs/Legend.module.css
@@ -1,6 +1,6 @@
 .legendContainer {
   padding: 1rem;
-  min-width: 240px;
+  min-width: 220px;
   max-width: 300px;
   max-height: 280px;
   border: 1px solid var(--sapList_BorderColor, #ccc);
@@ -11,6 +11,7 @@
   overflow: auto;
   align-self: flex-start;
   color: var(--sapTextColor, #222);
+  font-size: var(--sapFontSize);
 }
 
 .legendTitle {
@@ -21,10 +22,13 @@
 .legendRow {
   display: flex;
   align-items: center;
-  margin-bottom: 8px;
   color: var(--sapTextColor, #222);
 }
 
+.legendRow:not(:last-child) {
+  margin-bottom: 8px;
+}
+
 .legendColorBox {
   width: 16px;
   height: 16px;
diff --git a/src/components/Members/AddEditMemberDialog.tsx b/src/components/Members/AddEditMemberDialog.tsx
@@ -91,7 +91,7 @@ export const AddEditMemberDialog: FC<AddEditMemberDialogProps> = ({
       if (memberToEdit) {
         reset({
           name: memberToEdit.name,
-          role: memberToEdit.role || MemberRoles.view,
+          role: memberToEdit.roles?.[0] || MemberRoles.view,
           accountType: memberToEdit.kind === 'User' ? 'User' : 'ServiceAccount',
           namespace: memberToEdit?.namespace || '',
         });
@@ -111,7 +111,7 @@ export const AddEditMemberDialog: FC<AddEditMemberDialogProps> = ({
 
     const newMember: Member = {
       name: trimmedName,
-      role: data.role,
+      roles: [data.role],
       kind: data.accountType,
       ...(data.accountType === 'ServiceAccount' && data.namespace && { namespace: data.namespace }),
     };
diff --git a/src/components/Members/MemberTable.tsx b/src/components/Members/MemberTable.tsx
@@ -111,11 +111,10 @@ export const MemberTable: FC<MemberTableProps> = ({
       </Infobox>
     );
   }
-
   const data: MemberTableRow[] = members.map((m) => {
     return {
       email: m.name,
-      role: MemberRolesDetailed[m.role as MemberRoles]?.displayValue,
+      role: MemberRolesDetailed[m.roles?.[0] as MemberRoles]?.displayValue ?? m.roles?.toString(),
       kind: m.kind,
       namespace: m.namespace ?? '',
       _member: m,
diff --git a/src/components/Wizards/CreateManagedControlPlane/CreateManagedControlPlaneWizardContainer.tsx b/src/components/Wizards/CreateManagedControlPlane/CreateManagedControlPlaneWizardContainer.tsx
@@ -111,7 +111,7 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
 
   useEffect(() => {
     if (user?.email && isOpen) {
-      setValue('members', [{ name: user.email, role: MemberRoles.admin, kind: 'User' }]);
+      setValue('members', [{ name: user.email, roles: [MemberRoles.admin], kind: 'User' }]);
     }
     if (!isOpen) {
       clearFormFields();
diff --git a/src/components/Wizards/CreateManagedControlPlane/SummarizeStep.tsx b/src/components/Wizards/CreateManagedControlPlane/SummarizeStep.tsx
@@ -37,7 +37,7 @@ export const SummarizeStep: React.FC<SummarizeStepProps> = ({ watch, projectName
           <br />
           <List headerText={t('common.members')}>
             {watch('members').map((member) => (
-              <ListItemStandard key={member.name} text={member.name} additionalText={member.role} />
+              <ListItemStandard key={member.name} text={member.name} additionalText={member.roles?.[0]} />
             ))}
           </List>
           <br />
diff --git a/src/lib/api/types/crate/createManagedControlPlane.ts b/src/lib/api/types/crate/createManagedControlPlane.ts
@@ -135,7 +135,7 @@ export const CreateManagedControlPlane = (
       authorization: {
         roleBindings:
           optional?.members?.map((member) => ({
-            role: member.role,
+            role: member.roles?.[0],
             subjects: [
               {
                 kind: member.kind as AccountType,
diff --git a/src/lib/api/types/crate/createProject.ts b/src/lib/api/types/crate/createProject.ts
@@ -45,10 +45,10 @@ export const CreateProject = (
     },
     spec: {
       members:
-        optional?.members?.map(({ kind, namespace, role, name }) => ({
+        optional?.members?.map(({ kind, namespace, roles, name }) => ({
           kind,
           name,
-          roles: [role],
+          roles,
           namespace: kind === 'ServiceAccount' ? (namespace ?? 'default') : undefined,
         })) ?? [],
     },
diff --git a/src/lib/api/types/crate/createWorkspace.ts b/src/lib/api/types/crate/createWorkspace.ts
@@ -48,10 +48,10 @@ export const CreateWorkspace = (
     },
     spec: {
       members:
-        optional?.members?.map(({ kind, namespace, role, name }) => ({
+        optional?.members?.map(({ kind, namespace, roles, name }) => ({
           kind,
           name,
-          roles: [role],
+          roles,
           namespace: kind === 'ServiceAccount' ? (namespace ?? 'default') : undefined,
         })) ?? [],
     },
diff --git a/src/lib/api/types/crate/listWorkspaces.ts b/src/lib/api/types/crate/listWorkspaces.ts
@@ -22,6 +22,6 @@ export function isWorkspaceReady(workspace: ListWorkspacesType): boolean {
 export const ListWorkspaces = (projectName?: string): Resource<ListWorkspacesType[]> => {
   return {
     path: `/apis/core.openmcp.cloud/v1alpha1/namespaces/project-${projectName}/workspaces`,
-    jq: '[.items[] | {metadata: .metadata | {name, namespace, annotations, deletionTimestamp}, status: .status, spec: .spec | {members: [.members[] | {name, roles}]}}]',
+    jq: '[.items[] | {metadata: .metadata | {name, namespace, annotations, deletionTimestamp}, status: .status, spec: .spec | {members: [.members[] | {name, roles, kind, namespace}]}}]',
   };
 };
diff --git a/src/lib/api/types/shared/members.ts b/src/lib/api/types/shared/members.ts
@@ -25,7 +25,7 @@ export enum MemberKind {
 export interface Member {
   kind: string;
   name: string;
-  role: string;
+  roles: string[];
   namespace?: string;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ export function CreateProjectDialogContainer({`
`53`	`53`
`54`	`54`	`useEffect(() => {`
`55`	`55`	`if (username) {`
`56`		`- setValue('members', [{ name: username, role: MemberRoles.admin, kind: 'User' }]);`
	`56`	`+ setValue('members', [{ name: username, roles: [MemberRoles.admin], kind: 'User' }]);`
`57`	`57`	`}`
`58`	`58`	`if (!isOpen) {`
`59`	`59`	`clearForm();`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ export function CreateWorkspaceDialogContainer({`
`68`	`68`
`69`	`69`	`useEffect(() => {`
`70`	`70`	`if (username) {`
`71`		`- setValue('members', [{ name: username, role: MemberRoles.admin, kind: 'User' }]);`
	`71`	`+ setValue('members', [{ name: username, roles: [MemberRoles.admin], kind: 'User' }]);`
`72`	`72`	`}`
`73`	`73`	`if (!isOpen) {`
`74`	`74`	`clearForm();`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl`
`111`	`111`
`112`	`112`	`useEffect(() => {`
`113`	`113`	`if (user?.email && isOpen) {`
`114`		`- setValue('members', [{ name: user.email, role: MemberRoles.admin, kind: 'User' }]);`
	`114`	`+ setValue('members', [{ name: user.email, roles: [MemberRoles.admin], kind: 'User' }]);`
`115`	`115`	`}`
`116`	`116`	`if (!isOpen) {`
`117`	`117`	`clearFormFields();`