diff --git a/client/src/pages/automation/project/components/project-header/components/settings-menu/hooks/useSettingsMenu.ts b/client/src/pages/automation/project/components/project-header/components/settings-menu/hooks/useSettingsMenu.ts index 87be4deff9..f25cf0f153 100644 --- a/client/src/pages/automation/project/components/project-header/components/settings-menu/hooks/useSettingsMenu.ts +++ b/client/src/pages/automation/project/components/project-header/components/settings-menu/hooks/useSettingsMenu.ts @@ -7,7 +7,6 @@ import { useGetProjectGitConfigurationQuery, } from '@/ee/shared/mutations/automation/projectGit.queries'; import {useToast} from '@/hooks/use-toast'; -import {useProject} from '@/pages/automation/project/hooks/useProject'; import {Project, Workflow} from '@/shared/middleware/automation/configuration'; import {useDeleteProjectMutation, useDuplicateProjectMutation} from '@/shared/mutations/automation/projects.mutations'; import { @@ -26,7 +25,7 @@ import {useNavigate, useSearchParams} from 'react-router-dom'; export const useSettingsMenu = ({project, workflow}: {project: Project; workflow: Workflow}) => { const {data: projectGitConfiguration} = useGetProjectGitConfigurationQuery(project.id!); - const {projectId} = useProject(); + const projectId = project.id; const navigate = useNavigate(); const [searchParams] = useSearchParams(); @@ -103,7 +102,7 @@ export const useSettingsMenu = ({project, workflow}: {project: Project; workflow (projectWorkflowId) => projectWorkflowId !== deletedWorkflowId ); - if (!projectId || !firstRemainingWorkflowId || !deletedWorkflowId) { + if (!projectId || !deletedWorkflowId) { return; } @@ -117,7 +116,19 @@ export const useSettingsMenu = ({project, workflow}: {project: Project; workflow queryKey: ProjectWorkflowKeys.projectWorkflows(projectId), }); - navigate(`/automation/projects/${projectId}/project-workflows/${firstRemainingWorkflowId}?${searchParams}`); + queryClient.invalidateQueries({ + exact: true, + queryKey: ProjectKeys.project(projectId), + }); + + const baseUrl = '/automation/projects'; + let firstRemainingWorkflowUrlSuffix = ''; + + if (firstRemainingWorkflowId) { + firstRemainingWorkflowUrlSuffix = `/${projectId}/project-workflows/${firstRemainingWorkflowId}?${searchParams}`; + } + + navigate(baseUrl + firstRemainingWorkflowUrlSuffix); }, });