Skip to content

Commit

Permalink
Merge pull request #6496 from alkem-io/develop
Browse files Browse the repository at this point in the history
Release: Translations, Fixes
  • Loading branch information
valentinyanakiev authored Jun 28, 2024
2 parents 411eefe + 98585f7 commit d06bdcb
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 57 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alkemio/client-web",
"version": "0.65.3",
"version": "0.65.4",
"description": "Alkemio client, enabling users to interact with Challenges hosted on the Alkemio platform.",
"author": "Alkemio Foundation",
"repository": {
Expand Down
5 changes: 0 additions & 5 deletions src/core/apollo/generated/apollo-hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23754,11 +23754,6 @@ export const NewMembershipsDocument = gql`
createdDate
}
}
mySpaces(showOnlyMyCreatedSpaces: true) {
space {
...NewMembershipsBasicSpace
}
}
}
}
${NewMembershipsBasicSpaceFragmentDoc}
Expand Down
9 changes: 0 additions & 9 deletions src/core/apollo/generated/graphql-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29898,15 +29898,6 @@ export type NewMembershipsQuery = {
lifecycle: { __typename?: 'Lifecycle'; id: string; state?: string | undefined };
};
}>;
mySpaces: Array<{
__typename?: 'MySpaceResults';
space: {
__typename?: 'Space';
id: string;
level: number;
profile: { __typename?: 'Profile'; id: string; displayName: string; tagline: string; url: string };
};
}>;
};
};

Expand Down
18 changes: 9 additions & 9 deletions src/core/i18n/en/translation.en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2154,7 +2154,7 @@
"suggestionsArray": ["Innovation", "Energy", "Inclusive", "3D", "Community", "Transition", "SSI", "Privacy"]
},
"newMemberships": {
"title": "Spaces & Subspaces",
"title": "My Invitations",
"openInvitations": "Open invitations",
"noOpenInvitations": "No open invitations",
"openApplications": "Open applications",
Expand Down Expand Up @@ -2882,17 +2882,17 @@
},
"name": "Name",
"bodyOfKnowledge": "Body Of Knowledge",
"infoTextBoK": "Select the Subspace that you want to use as a body of knowledge for this Virtual Contributor",
"infoTextBoK": "Select the Subspace you want as a body of knowledge for this Virtual Contributor",
"noSubspacesInfo": "Create a Subspace first, and populate it with the relevant information for your Virtual Contributor.",
"confirmDeletion": {
"description": "Are you certain you want to delete this {{entity}}? Keep in mind that this action is irreversible. All profile information will be removed and people will no longer be able to interact with the {{entity}}. "
"description": "Do you want to delete this {{entity}}? This action is irreversible. All profile information will be removed and people will no longer be able to interact with the {{entity}} "
},
"edit": {
"title": "Edit Virtual Contributor Profile"
}
},
"createVirtualContributorWizard": {
"noSpaces": "Couldn't find any space hosted by you, please contact us for support.",
"noSpaces": "Couldn't find any Space hosted by you, please contact us for support.",
"createdSubspace": {
"vision": "Welcome! Please follow the three steps on the right to learn how to use, upload knowledge to, and update your Virtual Contributor.",
"tagline": "",
Expand All @@ -2910,12 +2910,12 @@
"description": "Your Virtual Contributor is trained on a body of knowledge, using an Alkemio Subspace.",
"createSubspace": "Create a new Subspace",
"useExistingSubspace": "Use an existing Subspace",
"cannotCreateSubspace": "This option is disabled because we couldn't find any Space that is hosted by you. Please contact us for support.",
"cannotUseExisting": "This option cannot be selected because your space does not have a subspace."
"cannotCreateSubspace": "This option is disabled because we couldn't find any Space hosted by you. Please contact us for support.",
"cannotUseExisting": "This option cannot be selected because your Space does not have a Subspace."
},
"step1": {
"title": "1/3 Create a Subspace",
"description": "To create a safe environment to train your Virtual Contributor, we will now create a Subspace in {{spaceName}}.",
"description": "This Subspace in {{spaceName}} is used to train your Virtual Contributor.",
"spaceName": "Space",
"subspaceName": "Name"
},
Expand All @@ -2926,8 +2926,8 @@
"subspaceName": "Subspace"
},
"step2": {
"title": "2/3 Name a Virtual Contributor",
"description": "Choose a name for your Virtual Contributor. This is to other users on the platform.",
"title": "2/3 Name your Virtual Contributor",
"description": "Choose a name for your Virtual Contributor. This is visible to other users on the platform.",
"virtualContributorName": "Name"
},
"step3": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const MyAccountBlock = () => {
)}

{virtualContributor ? (
<HorizontalCardsGroup title={t('pages.home.sections.myAccount.hostedSpaces')}>
<HorizontalCardsGroup title={t('pages.home.sections.myAccount.virtualContributors')}>
{[virtualContributor].map(vc => (
<ApplicationHydrator
key={vc.id}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ query NewMemberships {
createdDate
}
}
mySpaces(showOnlyMyCreatedSpaces: true) {
space {
...NewMembershipsBasicSpace
}
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ const NewMembershipsBlock = ({ hiddenIfEmpty = false, onOpenMemberships }: NewMe
[communityInvitations, communityApplications]
);

const mySpaces = data?.me.mySpaces ?? [];

const [openDialog, setOpenDialog] = useState<PendingMembershipsListDialogDetails | InvitationViewDialogDetails>();

const closeDialog = () => setOpenDialog(undefined);
Expand Down Expand Up @@ -246,29 +244,6 @@ const NewMembershipsBlock = ({ hiddenIfEmpty = false, onOpenMemberships }: NewMe
))}
</HorizontalCardsGroup>

<HorizontalCardsGroup title={t('pages.home.sections.newMemberships.mySpaces')}>
{mySpaces.map(item => (
<ApplicationHydrator
key={item.space.id}
application={
{
id: item.space.id,
space: item.space,
} as unknown as PendingApplication
}
visualType={VisualType.Avatar}
>
{({ application: hydratedApplication }) => (
<NewMembershipCard
space={hydratedApplication?.space}
to={hydratedApplication?.space.profile.url}
membershipType="membership"
/>
)}
</ApplicationHydrator>
))}
</HorizontalCardsGroup>

<HorizontalCardsGroup title={t('pages.home.sections.newMemberships.recentlyJoined')}>
{recentMemberships.map(membership => {
switch (membership.type) {
Expand Down

0 comments on commit d06bdcb

Please sign in to comment.