Merge pull request #7299 from alkem-io/release/async-vc

Release / VC fixes
alkem-io · Dec 10, 2024 · bc098ab · bc098ab
1 parent 3fef4da
commit bc098ab
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 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.78.0",
+  "version": "0.78.1",
   "description": "Alkemio client, enabling users to interact with Challenges hosted on the Alkemio platform.",
   "repository": {
     "type": "git",

diff --git a/src/domain/community/community/CommunityAdmin/useCommunityAdmin.ts b/src/domain/community/community/CommunityAdmin/useCommunityAdmin.ts
@@ -20,7 +20,6 @@ import {
 import {
   AuthorizationPrivilege,
   CommunityRoleType,
-  LicenseEntitlementType,
   SearchVisibility,
   SpaceLevel,
 } from '@/core/apollo/generated/graphql-schema';
@@ -29,7 +28,6 @@ import { CommunityMemberUserFragmentWithRoles } from '@/domain/community/communi
 import useInviteUsers from '@/domain/community/invitations/useInviteUsers';
 import { getJourneyTypeName } from '@/domain/journey/JourneyTypeName';
 import { Identifiable } from '@/core/utils/Identifiable';
-import { useUserContext } from '@/domain/community/user';
 
 const MAX_AVAILABLE_MEMBERS = 100;
 const buildUserFilterObject = (filter: string | undefined) =>
@@ -89,13 +87,6 @@ const useRoleSetAdmin = ({ roleSetId, spaceId, challengeId, opportunityId, space
   const leadRoleDefinition = roleSet?.leadRoleDefinition;
   const roleSetMyPrivileges = roleSet?.authorization?.myPrivileges ?? [];
 
-  const { accountEntitlements } = useUserContext();
-
-  const entitlements = {
-    virtualContributorsEnabled: accountEntitlements.some(
-      priv => priv === LicenseEntitlementType.AccountVirtualContributor
-    ),
-  };
   const permissions = {
     canAddMembers: roleSetMyPrivileges.some(priv => priv === AuthorizationPrivilege.CommunityAddMember),
     // the following privilege allows Admins of a space without CommunityAddMember privilege, to
@@ -512,7 +503,6 @@ const useRoleSetAdmin = ({ roleSetId, spaceId, challengeId, opportunityId, space
     memberRoleDefinition,
     leadRoleDefinition,
     permissions,
-    entitlements,
     applications: roleSetPending?.applications,
     invitations: roleSetPending?.invitations,
     platformInvitations: roleSetPending?.platformInvitations,

diff --git a/src/domain/journey/opportunity/pages/AdminOpportunityCommunityPage.tsx b/src/domain/journey/opportunity/pages/AdminOpportunityCommunityPage.tsx
@@ -25,7 +25,6 @@ const AdminOpportunityCommunityPage: FC<SettingsPageProps> = ({ routePrefix = '.
     memberRoleDefinition,
     leadRoleDefinition,
     permissions,
-    entitlements,
     onUserLeadChange,
     onUserAuthorizationChange,
     onOrganizationLeadChange,
@@ -81,7 +80,7 @@ const AdminOpportunityCommunityPage: FC<SettingsPageProps> = ({ routePrefix = '.
             />
           </PageContentBlock>
         </PageContentColumn>
-        {entitlements.virtualContributorsEnabled && (
+        {
           <PageContentColumn columns={6}>
             <PageContentBlock>
               <CommunityVirtualContributors
@@ -98,7 +97,7 @@ const AdminOpportunityCommunityPage: FC<SettingsPageProps> = ({ routePrefix = '.
               />
             </PageContentBlock>
           </PageContentColumn>
-        )}
+        }
       </PageContent>
     </SubspaceSettingsLayout>
   );

diff --git a/src/domain/journey/space/pages/AdminSpaceCommunityPage.tsx b/src/domain/journey/space/pages/AdminSpaceCommunityPage.tsx
@@ -49,7 +49,6 @@ const AdminSpaceCommunityPage = ({ routePrefix = '../' }: SettingsPageProps) =>
     memberRoleDefinition,
     leadRoleDefinition,
     permissions,
-    entitlements,
     onApplicationStateChange,
     onInvitationStateChange,
     onDeleteInvitation,
@@ -263,7 +262,7 @@ const AdminSpaceCommunityPage = ({ routePrefix = '../' }: SettingsPageProps) =>
             />
           </PageContentBlock>
         </PageContentColumn>
-        {entitlements.virtualContributorsEnabled && (
+        {
           <PageContentColumn columns={6}>
             <PageContentBlock>
               <CommunityVirtualContributors
@@ -281,7 +280,7 @@ const AdminSpaceCommunityPage = ({ routePrefix = '../' }: SettingsPageProps) =>
               />
             </PageContentBlock>
           </PageContentColumn>
-        )}
+        }
       </PageContent>
     </SpaceSettingsLayout>
   );

diff --git a/src/domain/journey/subspace/pages/AdminSubspaceCommunityPage.tsx b/src/domain/journey/subspace/pages/AdminSubspaceCommunityPage.tsx
@@ -52,7 +52,6 @@ const AdminSubspaceCommunityPage: FC<SettingsPageProps> = ({ routePrefix = '../'
     memberRoleDefinition,
     leadRoleDefinition,
     permissions,
-    entitlements,
     onApplicationStateChange,
     onInvitationStateChange,
     onDeleteInvitation,
@@ -203,7 +202,7 @@ const AdminSubspaceCommunityPage: FC<SettingsPageProps> = ({ routePrefix = '../'
             />
           </PageContentBlock>
         </PageContentColumn>
-        {entitlements.virtualContributorsEnabled && (
+        {
           <PageContentColumn columns={6}>
             <PageContentBlock>
               <CommunityVirtualContributors
@@ -220,7 +219,7 @@ const AdminSubspaceCommunityPage: FC<SettingsPageProps> = ({ routePrefix = '../'
               />
             </PageContentBlock>
           </PageContentColumn>
-        )}
+        }
       </PageContent>
     </SubspaceSettingsLayout>
   );