diff --git a/.changeset/sour-worms-sort.md b/.changeset/sour-worms-sort.md new file mode 100644 index 00000000..8241527c --- /dev/null +++ b/.changeset/sour-worms-sort.md @@ -0,0 +1,5 @@ +--- +"@fleek-platform/dashboard": patch +--- + +fix project management issues diff --git a/.tests/hash b/.tests/hash index 293d4efa..2bfec647 100644 --- a/.tests/hash +++ b/.tests/hash @@ -1 +1 @@ -[TEST_RUN] 33a3cdcce970230d9043cbd7018981736982dc60 +[TEST_RUN] 9f201278ea7a0c528aedf957a6814680603b7edf diff --git a/src/components/CreateProject/CreateProject.tsx b/src/components/CreateProject/CreateProject.tsx index c89cebd3..ea32bc41 100644 --- a/src/components/CreateProject/CreateProject.tsx +++ b/src/components/CreateProject/CreateProject.tsx @@ -7,12 +7,14 @@ import { useToast } from '@/hooks/useToast'; import { useCookies } from '@/providers/CookiesProvider'; import { useProjectContext } from '@/providers/ProjectProvider'; import { Button, Dialog, Text } from '@/ui'; +import { useRouter } from '@/hooks/useRouter'; import { Form } from '../Form/Form'; import { LearnMoreMessage } from '../LearnMoreMessage/LearnMoreMessage'; import { Modal } from '../Modal/Modal'; import { ProjectField } from '../ProjectField/ProjectField'; import { useAuthProviders } from '@/hooks/useAuthProviders'; +import { routes } from '@fleek-platform/utils-routes'; export const CreateProject: React.FC = () => { const { isCreateProjectModalOpen: isModalOpen, setIsCreateProjectModalOpen } = @@ -24,6 +26,7 @@ export const CreateProject: React.FC = () => { const [, createProject] = useCreateProjectMutation(); const providers = useAuthProviders(); + const router = useRouter(); const createProjectForm = Form.useForm({ values: { @@ -53,7 +56,9 @@ export const CreateProject: React.FC = () => { cookies.set('accessToken', accessToken); cookies.set('projectId', data.createProject.id); - handleModalChange(false); + await router.replace( + routes.project.home({ projectId: data.createProject.id }), + ); } catch (error) { toast.error({ error, diff --git a/src/hooks/useCancelSubscription.ts b/src/hooks/useCancelSubscription.ts index 755a93e9..25d96eb8 100644 --- a/src/hooks/useCancelSubscription.ts +++ b/src/hooks/useCancelSubscription.ts @@ -3,7 +3,6 @@ import { useCallback } from 'react'; import { BackendApiClient } from '@/integrations/new-be/BackendApi'; import { useCookies } from '@/providers/CookiesProvider'; -import { SubscriptionResponse } from '@/types/Billing'; import { Log } from '@/utils/log'; type UseCancelMockedMutationArgs = { @@ -32,10 +31,6 @@ export const useCancelMockedMutation = ({ if (!response.ok) { throw response.statusText; } - - const result: SubscriptionResponse = await response.json(); - - return result; } catch (error) { Log.error('Failed to fetch subscription data', error); diff --git a/src/hooks/useMainNavigationItems.ts b/src/hooks/useMainNavigationItems.ts index f54783b7..e40f51f3 100644 --- a/src/hooks/useMainNavigationItems.ts +++ b/src/hooks/useMainNavigationItems.ts @@ -50,6 +50,10 @@ export const useMainNavigationItems = () => { const projectId = session.project?.id; + if (!projectId) { + return; + } + const getProjectSettingsURL = () => { if (hasGeneralSettingsPermission) { return routes.project.settings.general({ projectId }); diff --git a/src/providers/PermissionsProvider.tsx b/src/providers/PermissionsProvider.tsx index 2ba11675..17d08c24 100644 --- a/src/providers/PermissionsProvider.tsx +++ b/src/providers/PermissionsProvider.tsx @@ -22,7 +22,7 @@ export const PermissionsProvider: React.FC = ({ children }) => { value={{ loading, permissions: - data.currentUserMembership.permissionGroup.permissions.slice() ?? [], + data?.currentUserMembership.permissionGroup.permissions.slice() ?? [], }} > {children}