fix: members table fix (#259)

Author: lucasgoral

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();

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();

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 }),
     };

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,

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();

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 />

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,

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,
         })) ?? [],
     },

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,
         })) ?? [],
     },

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}]}}]',
   };
 };