diff --git a/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx b/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx index 6ae7ec02d..de06205f2 100644 --- a/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx +++ b/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx @@ -2,16 +2,28 @@ import { useEffect } from 'react'; import { useViewFromQueryParams } from '@/views/hooks/internal/useViewFromQueryParams'; import { useApplyViewFiltersToCurrentRecordFilters } from '@/views/hooks/useApplyViewFiltersToCurrentRecordFilters'; +import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly'; export const QueryParamsFiltersEffect = () => { - const { hasFiltersQueryParams, getFiltersFromQueryParams } = - useViewFromQueryParams(); + const { + hasFiltersQueryParams, + getFiltersFromQueryParams, + objectMetadataItem, + } = useViewFromQueryParams(); + + const { currentView } = useGetCurrentViewOnly(); const { applyViewFiltersToCurrentRecordFilters } = useApplyViewFiltersToCurrentRecordFilters(); + const currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem = + currentView?.objectMetadataId !== objectMetadataItem.id; + useEffect(() => { - if (!hasFiltersQueryParams) { + if ( + !hasFiltersQueryParams || + currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem + ) { return; } @@ -21,6 +33,7 @@ export const QueryParamsFiltersEffect = () => { } }); }, [ + currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem, applyViewFiltersToCurrentRecordFilters, getFiltersFromQueryParams, hasFiltersQueryParams, diff --git a/packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts b/packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts index 187dba269..a6313ec7f 100644 --- a/packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts +++ b/packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts @@ -189,5 +189,6 @@ export const useViewFromQueryParams = () => { viewIdQueryParam, hasFiltersQueryParams, getFiltersFromQueryParams, + objectMetadataItem, }; };