Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch release 11 #7745

Merged
merged 6 commits into from
Feb 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.83.1",
"version": "0.83.4",
"description": "Alkemio client, enabling users to interact with Challenges hosted on the Alkemio platform.",
"repository": {
"type": "git",
Expand Down
4 changes: 4 additions & 0 deletions src/core/apollo/generated/apollo-hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17280,6 +17280,10 @@ export const SpaceDashboardNavigationChallengesDocument = gql`
lookup {
space(ID: $spaceId) {
id
authorization {
id
myPrivileges
}
profile {
...SpaceDashboardNavigationProfile
}
Expand Down
3 changes: 3 additions & 0 deletions src/core/apollo/generated/graphql-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21530,6 +21530,9 @@ export type SpaceDashboardNavigationChallengesQuery = {
| {
__typename?: 'Space';
id: string;
authorization?:
| { __typename?: 'Authorization'; id: string; myPrivileges?: Array<AuthorizationPrivilege> | undefined }
| undefined;
profile: {
__typename?: 'Profile';
id: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const useInnovationFlowStates = ({
const innovationFlow = data?.lookup.collaboration?.innovationFlow;

const currentInnovationFlowState = innovationFlow?.currentState.displayName;
const myPrivilleges = innovationFlow?.authorization?.myPrivileges;
const canEditInnovationFlow = myPrivilleges?.includes(AuthorizationPrivilege.Update);
const myPrivileges = innovationFlow?.authorization?.myPrivileges;
const canEditInnovationFlow = myPrivileges?.includes(AuthorizationPrivilege.Update);

return {
innovationFlowStates: innovationFlow?.states,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ const useInnovationHub = () => {

const subdomain = import.meta.env.MODE === 'development' ? params.get('subdomain') ?? undefined : undefined;

// Subdomain can come from a query url param or from the current domain (server will handle, so we can send subdomain=undefined)
const { data: innovationHubData, loading: innovationHubLoading } = useInnovationHubQuery({
variables: {
subdomain,
},
skip: !subdomain,
});

const innovationHub = useInnovationHubAttrs(innovationHubData?.platform.innovationHub);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ query SpaceDashboardNavigationChallenges($spaceId: UUID!) {
lookup {
space(ID: $spaceId) {
id
authorization {
id
myPrivileges
}
profile {
...SpaceDashboardNavigationProfile
}
Expand Down
10 changes: 9 additions & 1 deletion src/domain/journey/subspace/routing/SubspaceRoute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,17 @@ import useUrlResolver from '@/main/routing/urlResolver/useUrlResolver';
import SubspaceCalloutPage from '../subspaceCalloutPage/SubspaceCalloutPage';
import { SubspaceDialog } from '../layout/SubspaceDialog';
import SubspaceSettingsRoute from './settings/SubspaceSettingsRoute';
import { SpaceLevel } from '@/core/apollo/generated/graphql-schema';
import Loading from '@/core/ui/loading/Loading';

const SubspaceRoute = () => {
const { spaceId } = useUrlResolver();
const { spaceId, spaceLevel, loading } = useUrlResolver();

// This avoids race conditions when the url has just changed from space to a subspace,
// react router gets to execute this but the urlResolver is not yet done resolving
if (spaceLevel === SpaceLevel.L0 || loading) {
return <Loading />;
}

return (
<StorageConfigContextProvider locationType="journey" spaceId={spaceId}>
Expand Down
Loading