Merge pull request #313 from kloudlite/fix/user-management

🐛 Fixed issue with user management
kloudlite · Oct 8, 2024 · 359bfc8 · 359bfc8
2 parents 0d5e47d + f7b94aa
commit 359bfc8
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/gql-queries-generator/doc/queries.graphql b/gql-queries-generator/doc/queries.graphql
@@ -1947,6 +1947,7 @@ query consoleListMembershipsForAccount($accountName: String!) {
       name
       joined
       email
+      id
     }
     role
   }

diff --git a/src/apps/console/routes/_main+/$account+/settings+/user-management/route.tsx b/src/apps/console/routes/_main+/$account+/settings+/user-management/route.tsx
@@ -127,7 +127,7 @@ const Teams = ({ setShowUserInvite, searchText, sortTeamMembers }: ITeams) => {
                 isLoading && searchResp.length === 0
                   ? placeHolderUsers
                   : sorted.map((i) => ({
-                      id: i.user.email,
+                      id: i.user.id,
                       name: i.user.name,
                       role: i.role,
                       email: i.user.email,

diff --git a/src/apps/console/routes/_main+/$account+/settings+/user-management/user-access-resource.tsx b/src/apps/console/routes/_main+/$account+/settings+/user-management/user-access-resource.tsx
@@ -141,7 +141,7 @@ const UserAccessResources = ({
   isPendingInvitation: boolean;
 }) => {
   const [showDeleteDialog, setShowDeleteDialog] = useState<BaseType | null>(
-    null,
+    null
   );
   const [showUserInvite, setShowUserInvite] = useState<BaseType | null>(null);
 
@@ -220,7 +220,7 @@ const UserAccessResources = ({
               }
             }
             reloadPage();
-            toast.success(`${titleCase(RESOURCE_NAME)} deleted successfully`);
+            toast.success(`${titleCase(RESOURCE_NAME)} removed successfully`);
             setShowDeleteDialog(null);
           } catch (err) {
             handleError(err);

diff --git a/src/apps/console/server/gql/queries/access-queries.ts b/src/apps/console/server/gql/queries/access-queries.ts
@@ -63,6 +63,7 @@ export const accessQueries = (executor: IExecutor) => ({
             name
             joined
             email
+            id
           }
           role
         }

diff --git a/src/apps/console/server/gql/queries/account-queries.ts b/src/apps/console/server/gql/queries/account-queries.ts
@@ -31,7 +31,7 @@ export const accountQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleCreateAccountMutation) =>
         data.accounts_createAccount,
-      vars(_: ConsoleCreateAccountMutationVariables) { },
+      vars(_: ConsoleCreateAccountMutationVariables) {},
     }
   ),
   getAvailableKloudliteRegions: executor(
@@ -46,7 +46,7 @@ export const accountQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleGetAvailableKloudliteRegionsQuery) =>
         data.accounts_availableKloudliteRegions,
-      vars(_: ConsoleGetAvailableKloudliteRegionsQueryVariables) { },
+      vars(_: ConsoleGetAvailableKloudliteRegionsQueryVariables) {},
     }
   ),
 
@@ -68,7 +68,7 @@ export const accountQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleListAccountsQuery) =>
         data.accounts_listAccounts,
-      vars(_: ConsoleListAccountsQueryVariables) { },
+      vars(_: ConsoleListAccountsQueryVariables) {},
     }
   ),
   updateAccount: executor(
@@ -82,7 +82,7 @@ export const accountQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleUpdateAccountMutation) =>
         data.accounts_updateAccount,
-      vars(_: ConsoleUpdateAccountMutationVariables) { },
+      vars(_: ConsoleUpdateAccountMutationVariables) {},
     }
   ),
   getAccount: executor(
@@ -103,7 +103,7 @@ export const accountQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleGetAccountQuery) => data.accounts_getAccount,
-      vars(_: ConsoleGetAccountQueryVariables) { },
+      vars(_: ConsoleGetAccountQueryVariables) {},
     }
   ),
   deleteAccount: executor(
@@ -115,7 +115,7 @@ export const accountQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleDeleteAccountMutation) =>
         data.accounts_deleteAccount,
-      vars(_: ConsoleDeleteAccountMutationVariables) { },
+      vars(_: ConsoleDeleteAccountMutationVariables) {},
     }
   ),
 });
diff --git a/src/generated/gql/server.ts b/src/generated/gql/server.ts
@@ -3592,7 +3592,13 @@ export type ConsoleListMembershipsForAccountQueryVariables = Exact<{
 export type ConsoleListMembershipsForAccountQuery = {
   accounts_listMembershipsForAccount?: Array<{
     role: Github__Com___Kloudlite___Api___Apps___Iam___Types__Role;
-    user: { verified: boolean; name: string; joined: any; email: string };
+    user: {
+      verified: boolean;
+      name: string;
+      joined: any;
+      email: string;
+      id: string;
+    };
   }>;
 };
-Original file line number
+Diff line change
@@ Expand Up @@
           name
           joined
           email
+          id
         }
         role
       }
@@ Expand Down @@