Skip to content
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
5 changes: 5 additions & 0 deletions .changeset/sour-worms-sort.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@fleek-platform/dashboard": patch
---

fix project management issues
2 changes: 1 addition & 1 deletion .tests/hash
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[TEST_RUN] 33a3cdcce970230d9043cbd7018981736982dc60
[TEST_RUN] 9f201278ea7a0c528aedf957a6814680603b7edf
7 changes: 6 additions & 1 deletion src/components/CreateProject/CreateProject.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 } =
Expand All @@ -24,6 +26,7 @@ export const CreateProject: React.FC = () => {

const [, createProject] = useCreateProjectMutation();
const providers = useAuthProviders();
const router = useRouter();

const createProjectForm = Form.useForm({
values: {
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 0 additions & 5 deletions src/hooks/useCancelSubscription.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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);

Expand Down
4 changes: 4 additions & 0 deletions src/hooks/useMainNavigationItems.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down
2 changes: 1 addition & 1 deletion src/providers/PermissionsProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const PermissionsProvider: React.FC<ChildrenProps> = ({ children }) => {
value={{
loading,
permissions:
data.currentUserMembership.permissionGroup.permissions.slice() ?? [],
data?.currentUserMembership.permissionGroup.permissions.slice() ?? [],
}}
>
{children}
Expand Down
Loading