Merge pull request #6574 from alkem-io/develop

v0.67.1
alkem-io · Jul 11, 2024 · c730981 · c730981
2 parents 66f75a3 + 34722dc
commit c730981
Show file tree

Hide file tree

Showing 37 changed files with 590 additions and 66 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alkemio/client-web",
-  "version": "0.67.0",
+  "version": "0.67.1",
   "description": "Alkemio client, enabling users to interact with Challenges hosted on the Alkemio platform.",
   "author": "Alkemio Foundation",
   "repository": {

diff --git a/src/core/apollo/generated/apollo-hooks.ts b/src/core/apollo/generated/apollo-hooks.ts
@@ -2285,11 +2285,25 @@ export const CommunityPageCommunityFragmentDoc = gql`
     memberOrganizations: organizationsInRole(role: MEMBER) {
       ...DashboardContributingOrganization
     }
+    virtualContributors: virtualContributorsInRole(role: MEMBER) {
+      id
+      searchVisibility
+      profile {
+        id
+        displayName
+        tagline
+        url
+        avatar: visual(type: AVATAR) {
+          ...VisualUri
+        }
+      }
+    }
   }
   ${DashboardLeadUserFragmentDoc}
   ${DashboardContributingUserFragmentDoc}
   ${AssociatedOrganizationDetailsFragmentDoc}
   ${DashboardContributingOrganizationFragmentDoc}
+  ${VisualUriFragmentDoc}
 `;
 export const ContextDetailsFragmentDoc = gql`
   fragment ContextDetails on Context {
@@ -2602,7 +2616,7 @@ export const SubspacePageFragmentDoc = gql`
         myPrivileges
       }
     }
-    community {
+    community @include(if: $authorizedReadAccessCommunity) {
       ...EntityDashboardCommunity
       myMembershipStatus
     }
@@ -2827,7 +2841,7 @@ export const SubspacePageSpaceFragmentDoc = gql`
       id
       vision
     }
-    community {
+    community @include(if: $authorizedReadAccessCommunity) {
       ...EntityDashboardCommunity
       myMembershipStatus
     }
@@ -14672,12 +14686,26 @@ export const SpaceCommunityContributorsDocument = gql`
           memberOrganizations: organizationsInRole(role: MEMBER) {
             ...OrganizationCard
           }
+          virtualContributors: virtualContributorsInRole(role: MEMBER) {
+            id
+            searchVisibility
+            profile {
+              id
+              displayName
+              tagline
+              url
+              avatar: visual(type: AVATAR) {
+                ...VisualUri
+              }
+            }
+          }
         }
       }
     }
   }
   ${OrganizationCardFragmentDoc}
   ${UserCardFragmentDoc}
+  ${VisualUriFragmentDoc}
 `;
 
 /**
@@ -15903,11 +15931,32 @@ export const AboutPageMembersDocument = gql`
             ...ReferenceDetails
           }
         }
+        authorization {
+          id
+          myPrivileges
+        }
+        community {
+          id
+          virtualContributors: virtualContributorsInRole(role: MEMBER) {
+            id
+            searchVisibility
+            profile {
+              id
+              displayName
+              tagline
+              url
+              avatar: visual(type: AVATAR) {
+                ...VisualUri
+              }
+            }
+          }
+        }
       }
     }
   }
   ${EntityDashboardCommunityFragmentDoc}
   ${ReferenceDetailsFragmentDoc}
+  ${VisualUriFragmentDoc}
 `;
 
 /**
@@ -16119,6 +16168,13 @@ export const JourneyPrivilegesDocument = gql`
           id
           myPrivileges
         }
+        community {
+          id
+          authorization {
+            id
+            myPrivileges
+          }
+        }
       }
     }
   }
@@ -16552,6 +16608,10 @@ export const SpaceCommunityPageDocument = gql`
           ...ContributorDetails
         }
       }
+      authorization {
+        id
+        myPrivileges
+      }
       community @include(if: $includeCommunity) {
         ...CommunityPageCommunity
       }
@@ -16988,7 +17048,7 @@ export function refetchSpaceSubspaceCardsQuery(variables: SchemaTypes.SpaceSubsp
 }
 
 export const LegacySubspaceDashboardPageDocument = gql`
-  query LegacySubspaceDashboardPage($subspaceId: UUID!) {
+  query LegacySubspaceDashboardPage($subspaceId: UUID!, $authorizedReadAccessCommunity: Boolean = false) {
     lookup {
       space(ID: $subspaceId) {
         ...SubspacePage
@@ -17011,6 +17071,7 @@ export const LegacySubspaceDashboardPageDocument = gql`
  * const { data, loading, error } = useLegacySubspaceDashboardPageQuery({
  *   variables: {
  *      subspaceId: // value for 'subspaceId'
+ *      authorizedReadAccessCommunity: // value for 'authorizedReadAccessCommunity'
  *   },
  * });
  */
@@ -18922,7 +18983,7 @@ export function refetchSubspaceCommunityIdQuery(variables: SchemaTypes.SubspaceC
 }
 
 export const SubspacePageDocument = gql`
-  query SubspacePage($spaceId: UUID!) {
+  query SubspacePage($spaceId: UUID!, $authorizedReadAccessCommunity: Boolean = false) {
     lookup {
       space(ID: $spaceId) {
         ...SubspacePageSpace
@@ -18945,6 +19006,7 @@ export const SubspacePageDocument = gql`
  * const { data, loading, error } = useSubspacePageQuery({
  *   variables: {
  *      spaceId: // value for 'spaceId'
+ *      authorizedReadAccessCommunity: // value for 'authorizedReadAccessCommunity'
  *   },
  * });
  */

diff --git a/src/core/apollo/generated/graphql-schema.ts b/src/core/apollo/generated/graphql-schema.ts
@@ -18545,6 +18545,19 @@ export type SpaceCommunityContributorsQuery = {
                 status: OrganizationVerificationEnum;
               };
             }>;
+            virtualContributors: Array<{
+              __typename?: 'VirtualContributor';
+              id: string;
+              searchVisibility: SearchVisibility;
+              profile: {
+                __typename?: 'Profile';
+                id: string;
+                displayName: string;
+                tagline: string;
+                url: string;
+                avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
+              };
+            }>;
           };
         }
       | undefined;
@@ -19619,6 +19632,19 @@ export type AboutPageMembersQuery = {
           community: {
             __typename?: 'Community';
             id: string;
+            virtualContributors: Array<{
+              __typename?: 'VirtualContributor';
+              id: string;
+              searchVisibility: SearchVisibility;
+              profile: {
+                __typename?: 'Profile';
+                id: string;
+                displayName: string;
+                tagline: string;
+                url: string;
+                avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
+              };
+            }>;
             leadUsers: Array<{
               __typename?: 'User';
               id: string;
@@ -19746,6 +19772,9 @@ export type AboutPageMembersQuery = {
                 }>
               | undefined;
           };
+          authorization?:
+            | { __typename?: 'Authorization'; id: string; myPrivileges?: Array<AuthorizationPrivilege> | undefined }
+            | undefined;
         }
       | undefined;
   };
@@ -20028,6 +20057,13 @@ export type JourneyPrivilegesQuery = {
           authorization?:
             | { __typename?: 'Authorization'; id: string; myPrivileges?: Array<AuthorizationPrivilege> | undefined }
             | undefined;
+          community: {
+            __typename?: 'Community';
+            id: string;
+            authorization?:
+              | { __typename?: 'Authorization'; id: string; myPrivileges?: Array<AuthorizationPrivilege> | undefined }
+              | undefined;
+          };
         }
       | undefined;
   };
@@ -20503,6 +20539,19 @@ export type SpaceCommunityPageQuery = {
             | undefined;
         };
       }>;
+      virtualContributors: Array<{
+        __typename?: 'VirtualContributor';
+        id: string;
+        searchVisibility: SearchVisibility;
+        profile: {
+          __typename?: 'Profile';
+          id: string;
+          displayName: string;
+          tagline: string;
+          url: string;
+          avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
+        };
+      }>;
     };
     collaboration: { __typename?: 'Collaboration'; id: string };
   };
@@ -20595,6 +20644,19 @@ export type CommunityPageCommunityFragment = {
         | undefined;
     };
   }>;
+  virtualContributors: Array<{
+    __typename?: 'VirtualContributor';
+    id: string;
+    searchVisibility: SearchVisibility;
+    profile: {
+      __typename?: 'Profile';
+      id: string;
+      displayName: string;
+      tagline: string;
+      url: string;
+      avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
+    };
+  }>;
 };
 
 export type SpaceDetailsFragment = {
@@ -21578,6 +21640,7 @@ export type SpaceSubspaceCardsQuery = {
 
 export type LegacySubspaceDashboardPageQueryVariables = Exact<{
   subspaceId: Scalars['UUID'];
+  authorizedReadAccessCommunity?: InputMaybe<Scalars['Boolean']>;
 }>;
 
 export type LegacySubspaceDashboardPageQuery = {
@@ -21672,7 +21735,7 @@ export type LegacySubspaceDashboardPageQuery = {
                 }
               | undefined;
           };
-          community: {
+          community?: {
             __typename?: 'Community';
             myMembershipStatus?: CommunityMembershipStatus | undefined;
             id: string;
@@ -21876,7 +21939,7 @@ export type SubspacePageFragment = {
         }
       | undefined;
   };
-  community: {
+  community?: {
     __typename?: 'Community';
     myMembershipStatus?: CommunityMembershipStatus | undefined;
     id: string;
@@ -23427,6 +23490,7 @@ export type SubspaceCommunityIdQuery = {
 
 export type SubspacePageQueryVariables = Exact<{
   spaceId: Scalars['UUID'];
+  authorizedReadAccessCommunity?: InputMaybe<Scalars['Boolean']>;
 }>;
 
 export type SubspacePageQuery = {
@@ -23443,7 +23507,7 @@ export type SubspacePageQuery = {
           profile: { __typename?: 'Profile'; id: string; url: string };
           metrics?: Array<{ __typename?: 'NVP'; id: string; name: string; value: string }> | undefined;
           context: { __typename?: 'Context'; id: string; vision?: string | undefined };
-          community: {
+          community?: {
             __typename?: 'Community';
             myMembershipStatus?: CommunityMembershipStatus | undefined;
             id: string;
@@ -23576,7 +23640,7 @@ export type SubspacePageSpaceFragment = {
   profile: { __typename?: 'Profile'; id: string; url: string };
   metrics?: Array<{ __typename?: 'NVP'; id: string; name: string; value: string }> | undefined;
   context: { __typename?: 'Context'; id: string; vision?: string | undefined };
-  community: {
+  community?: {
     __typename?: 'Community';
     myMembershipStatus?: CommunityMembershipStatus | undefined;
     id: string;

diff --git a/src/core/i18n/en/translation.en.json b/src/core/i18n/en/translation.en.json
@@ -581,7 +581,8 @@
         "confirm": "Are you sure?"
       },
       "inviteExternalVC": "Invite External VC",
-      "externalVCsInfo": "At the moment, only Alkemio Support can add an external Virtual Contributor to your Space. Please contact Support <click>here</click> if you wish to do so, we are happy to help!"
+      "externalVCsInfo": "At the moment, only Alkemio Support can add an external Virtual Contributor to your Space. Please contact Support <click>here</click> if you wish to do so, we are happy to help!",
+      "searchVC": "Find Virtual Contributor"
     },
     "application-form": {
       "title": "Application Form",
@@ -2037,6 +2038,7 @@
     "contributors": {
       "fullName": "Find contributors",
       "shortName": "$t(common.contributors)",
+      "unauthorized": "Please sign in to see the contributors of this Space.",
       "search": {
         "title": "Find talent and expertise!",
         "subtitle": "Search for other people and organizations that can help you with your Subspace, for example based on skills or interests.",

diff --git a/src/domain/community/application/containers/ApplicationButtonContainer.tsx b/src/domain/community/application/containers/ApplicationButtonContainer.tsx
@@ -15,6 +15,7 @@ import clearCacheForType from '../../../../core/apollo/utils/clearCacheForType';
 import { useAuthenticationContext } from '../../../../core/auth/authentication/hooks/useAuthenticationContext';
 import { useNotification } from '../../../../core/ui/notifications/useNotification';
 import { useTranslation } from 'react-i18next';
+import useCanReadSpace from '../../../journey/common/authorization/useCanReadSpace';
 
 interface ApplicationContainerEntities {
   applicationButtonProps: Omit<ApplicationButtonProps, 'journeyId' | 'journeyLevel'>;
@@ -48,6 +49,7 @@ export const ApplicationButtonContainer: FC<ApplicationButtonContainerProps> = (
   const { t } = useTranslation();
   const notify = useNotification();
   const { isAuthenticated } = useAuthenticationContext();
+  const { canReadCommunity } = useCanReadSpace({ spaceId: journeyId });
   const { user, loadingMe: membershipLoading } = useUserContext();
   const { data: pendingMembershipsData } = useUserPendingMembershipsQuery({
     skip: !isAuthenticated,
@@ -88,6 +90,7 @@ export const ApplicationButtonContainer: FC<ApplicationButtonContainerProps> = (
     refetchSpaceQuery({
       variables: {
         spaceId: journeyId!,
+        authorizedReadAccessCommunity: canReadCommunity,
       },
     });