After leaving an Organization the list is refreshed (#6577)

alkem-io · Jul 12, 2024 · 0368d0c · 0368d0c
1 parent d605e1e
commit 0368d0c
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 8 deletions.
diff --git a/src/core/apollo/generated/apollo-hooks.ts b/src/core/apollo/generated/apollo-hooks.ts
@@ -14765,6 +14765,7 @@ export function refetchSpaceCommunityContributorsQuery(
 export const UserContributionDisplayNamesDocument = gql`
   query UserContributionDisplayNames($userId: UUID_NAMEID_EMAIL!) {
     rolesUser(rolesData: { userID: $userId, filter: { visibilities: [ACTIVE, DEMO] } }) {
+      id
       spaces {
         id
         displayName
@@ -14840,6 +14841,7 @@ export function refetchUserContributionDisplayNamesQuery(
 export const UserContributionsDocument = gql`
   query UserContributions($userId: UUID_NAMEID_EMAIL!) {
     rolesUser(rolesData: { userID: $userId, filter: { visibilities: [ACTIVE, DEMO] } }) {
+      id
       spaces {
         id
         nameID
@@ -14905,6 +14907,7 @@ export function refetchUserContributionsQuery(variables: SchemaTypes.UserContrib
 export const UserOrganizationIdsDocument = gql`
   query UserOrganizationIds($userId: UUID_NAMEID_EMAIL!) {
     rolesUser(rolesData: { userID: $userId }) {
+      id
       organizations {
         id
       }
@@ -22868,6 +22871,7 @@ export function refetchSearchQuery(variables: SchemaTypes.SearchQueryVariables)
 export const UserRolesSearchCardsDocument = gql`
   query userRolesSearchCards($userId: UUID_NAMEID_EMAIL!) {
     rolesUser(rolesData: { userID: $userId, filter: { visibilities: [ACTIVE, DEMO] } }) {
+      id
       spaces {
         id
         roles

diff --git a/src/core/apollo/generated/graphql-schema.ts b/src/core/apollo/generated/graphql-schema.ts
@@ -18656,6 +18656,7 @@ export type UserContributionDisplayNamesQuery = {
   __typename?: 'Query';
   rolesUser: {
     __typename?: 'ContributorRoles';
+    id: string;
     spaces: Array<{
       __typename?: 'RolesResultSpace';
       id: string;
@@ -18674,6 +18675,7 @@ export type UserContributionsQuery = {
   __typename?: 'Query';
   rolesUser: {
     __typename?: 'ContributorRoles';
+    id: string;
     spaces: Array<{
       __typename?: 'RolesResultSpace';
       id: string;
@@ -18691,6 +18693,7 @@ export type UserOrganizationIdsQuery = {
   __typename?: 'Query';
   rolesUser: {
     __typename?: 'ContributorRoles';
+    id: string;
     organizations: Array<{ __typename?: 'RolesResultOrganization'; id: string }>;
   };
 };
@@ -27958,6 +27961,7 @@ export type UserRolesSearchCardsQuery = {
   __typename?: 'Query';
   rolesUser: {
     __typename?: 'ContributorRoles';
+    id: string;
     spaces: Array<{
       __typename?: 'RolesResultSpace';
       id: string;

diff --git a/src/domain/community/user/pages/UserOrganizationsPage.tsx b/src/domain/community/user/pages/UserOrganizationsPage.tsx
@@ -13,7 +13,7 @@ const UserOrganizationsPage = () => {
   const { t } = useTranslation();
   const { userNameId = '' } = useUrlParams();
   const { user: userMetadata, loading } = useUserMetadata(userNameId);
-  const organizationIds = useUserOrganizationIds(userNameId);
+  const organizationIds = useUserOrganizationIds(userMetadata?.user.id);
 
   return (
     <UserSettingsLayout currentTab={SettingsSection.Organizations}>

diff --git a/src/domain/community/user/userContributions/UserContributionDisplayNames.graphql b/src/domain/community/user/userContributions/UserContributionDisplayNames.graphql
@@ -1,12 +1,12 @@
 query UserContributionDisplayNames($userId: UUID_NAMEID_EMAIL!) {
   rolesUser(rolesData: { userID: $userId, filter: { visibilities: [ACTIVE, DEMO] } }) {
+    id
     spaces {
       id
       displayName
       subspaces {
         id
         displayName
-
       }
     }
     organizations {

diff --git a/src/domain/community/user/userContributions/UserContributions.graphql b/src/domain/community/user/userContributions/UserContributions.graphql
@@ -1,5 +1,6 @@
 query UserContributions($userId: UUID_NAMEID_EMAIL!) {
   rolesUser(rolesData: { userID: $userId, filter: { visibilities: [ACTIVE, DEMO] } }) {
+    id
     spaces {
       id
       nameID

diff --git a/src/domain/community/user/userContributions/UserOrganizationIds.graphql b/src/domain/community/user/userContributions/UserOrganizationIds.graphql
@@ -1,5 +1,6 @@
 query UserOrganizationIds($userId: UUID_NAMEID_EMAIL!) {
   rolesUser(rolesData: { userID: $userId }) {
+    id
     organizations {
       id
     }

diff --git a/src/domain/community/user/userContributions/useUserOrganizationIds.ts b/src/domain/community/user/userContributions/useUserOrganizationIds.ts
@@ -1,14 +1,13 @@
 import { useUserOrganizationIdsQuery } from '../../../../core/apollo/generated/apollo-hooks';
 import { useMemo } from 'react';
 
-const useUserOrganizationIds = (userNameId: string) => {
-  const skip = !userNameId;
-
+// Providing a nameID also works but breaks refetching with UUID after mutations, so please stick to the UUID here
+const useUserOrganizationIds = (userId: string | undefined) => {
   const { data } = useUserOrganizationIdsQuery({
     variables: {
-      userId: userNameId,
+      userId: userId!,
     },
-    skip,
+    skip: !userId,
   });
 
   return useMemo(() => {

diff --git a/src/domain/community/user/userProfilePage/UserProfilePage.tsx b/src/domain/community/user/userProfilePage/UserProfilePage.tsx
@@ -22,7 +22,7 @@ export const UserProfilePage: FC<UserProfileProps> = () => {
 
   const contributions = useUserContributions(userMetadata?.user.id);
 
-  const organizationIds = useUserOrganizationIds(userNameId);
+  const organizationIds = useUserOrganizationIds(userMetadata?.user.id);
 
   if (loading) return <Loading text={'Loading User Profile ...'} />;
 

diff --git a/src/main/search/SearchQueries.graphql b/src/main/search/SearchQueries.graphql
@@ -262,6 +262,7 @@ fragment SearchResultSpace on SearchResultSpace {
 
 query userRolesSearchCards($userId: UUID_NAMEID_EMAIL!) {
   rolesUser(rolesData: { userID: $userId, filter: { visibilities: [ACTIVE, DEMO] } }) {
+    id
     spaces {
       id
       roles