Fix:Hide deleted filter component when reset button is clicked (#8880)

Resolve: #8874 

Problem :
When we are on the deleted records page and use the filter, if no
records are found, we see the no deleted recordName message along with a
button to remove the deleted filter. However, if we reset and filter
again, and still don't find any records, this message and button for the
deleted filter continue to display.
Solution: 
I noticed that the component RecordTableEmptyStateSoftDelete has this
button, and its visibility is controlled by the function
toggleSoftDeleteFilterState. If the state is true, the button appears;
if it's false, it doesn't. Therefore, we just need to call this function
when the reset button is clicked and set the state to false.
![All-Peopleand1morepage-Personal-MicrosoftEdge2024-12-0421-04-12-ezgif
com-video-to-gif-converter](https://github.com/user-attachments/assets/68e524ff-2902-4a25-a361-3bb8e1220ff8)

---------

Co-authored-by: bosiraphael <raphael.bosi@gmail.com>
This commit is contained in:
Naifer 2024-12-11 11:06:23 +01:00 committed by GitHub
parent 8ecf07f112
commit c1fff908fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 0 deletions

View File

@ -82,6 +82,7 @@ export const ViewBar = ({
filterDropdownId={filterDropdownId} filterDropdownId={filterDropdownId}
hasFilterButton hasFilterButton
viewBarId={viewBarId} viewBarId={viewBarId}
objectNamePlural={objectNamePlural}
rightComponent={ rightComponent={
<UpdateViewButtonGroup <UpdateViewButtonGroup
hotkeyScope={{ hotkeyScope={{

View File

@ -1,9 +1,11 @@
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { ReactNode, useMemo } from 'react'; import { ReactNode, useMemo } from 'react';
import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
import { AddObjectFilterFromDetailsButton } from '@/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton'; import { AddObjectFilterFromDetailsButton } from '@/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton';
import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope'; import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
import { Filter } from '@/object-record/object-filter-dropdown/types/Filter'; import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter';
import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope'; import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2';
import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
@ -28,6 +30,7 @@ export type ViewBarDetailsProps = {
rightComponent?: ReactNode; rightComponent?: ReactNode;
filterDropdownId?: string; filterDropdownId?: string;
viewBarId: string; viewBarId: string;
objectNamePlural: string;
}; };
const StyledBar = styled.div` const StyledBar = styled.div`
@ -101,6 +104,7 @@ export const ViewBarDetails = ({
rightComponent, rightComponent,
filterDropdownId, filterDropdownId,
viewBarId, viewBarId,
objectNamePlural,
}: ViewBarDetailsProps) => { }: ViewBarDetailsProps) => {
const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView(); const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView();
@ -125,6 +129,13 @@ export const ViewBarDetails = ({
availableSortDefinitionsComponentState, availableSortDefinitionsComponentState,
); );
const { objectNameSingular } = useObjectNameSingularFromPlural({
objectNamePlural: objectNamePlural,
});
const { toggleSoftDeleteFilterState } = useHandleToggleTrashColumnFilter({
objectNameSingular: objectNameSingular,
viewBarId: viewBarId,
});
const { resetUnsavedViewStates } = useResetUnsavedViewStates(); const { resetUnsavedViewStates } = useResetUnsavedViewStates();
const canResetView = canPersistView && !hasFiltersQueryParams; const canResetView = canPersistView && !hasFiltersQueryParams;
@ -159,6 +170,7 @@ export const ViewBarDetails = ({
const handleCancelClick = () => { const handleCancelClick = () => {
if (isDefined(viewId)) { if (isDefined(viewId)) {
resetUnsavedViewStates(viewId); resetUnsavedViewStates(viewId);
toggleSoftDeleteFilterState(false);
} }
}; };