diff --git a/frontend/src/component/project/Project/Project.tsx b/frontend/src/component/project/Project/Project.tsx index 72658d1860..db0abf5668 100644 --- a/frontend/src/component/project/Project/Project.tsx +++ b/frontend/src/component/project/Project/Project.tsx @@ -126,20 +126,21 @@ const ProjectStatus = () => { const [projectStatusOpen, setProjectStatusOpen] = useState( searchParams.has('project-status'), ); - const toggleStatusModal = (open: boolean) => () => { + const toggleStatusModal = (open: boolean, clickedLink?: boolean) => { if (open) { searchParams.set('project-status', ''); - } else { + setSearchParams(searchParams); + } else if (!clickedLink) { searchParams.delete('project-status'); + setSearchParams(searchParams); } - setSearchParams(searchParams); setProjectStatusOpen(open); }; return ( <> toggleStatusModal(true)} startIcon={} data-loading-project > @@ -147,7 +148,7 @@ const ProjectStatus = () => { toggleStatusModal(false, clickedLink)} /> ); diff --git a/frontend/src/component/project/Project/ProjectStatus/ProjectStatusModal.tsx b/frontend/src/component/project/Project/ProjectStatus/ProjectStatusModal.tsx index 018636264f..3b510d1e5b 100644 --- a/frontend/src/component/project/Project/ProjectStatus/ProjectStatusModal.tsx +++ b/frontend/src/component/project/Project/ProjectStatus/ProjectStatusModal.tsx @@ -124,7 +124,7 @@ const FeedbackButton = styled(Button)(({ theme }) => ({ type Props = { open: boolean; - close: () => void; + close: (clickedLink?: boolean) => void; }; export const ProjectStatusModal = ({ open, close }: Props) => { @@ -143,11 +143,11 @@ export const ProjectStatusModal = ({ open, close }: Props) => { return ( close(false)} label='Project status' onClick={(e: React.SyntheticEvent) => { if (e.target instanceof HTMLAnchorElement) { - close(); + close(true); } }} > @@ -188,7 +188,7 @@ export const ProjectStatusModal = ({ open, close }: Props) => { variant='text' onClick={() => { createFeedbackContext(); - close(); + close(false); }} size='small' > @@ -197,7 +197,7 @@ export const ProjectStatusModal = ({ open, close }: Props) => {

-