diff --git a/front/src/modules/ui/input/components/DateInput.tsx b/front/src/modules/ui/input/components/DateInput.tsx
index a9f68e8e0..0925d1772 100644
--- a/front/src/modules/ui/input/components/DateInput.tsx
+++ b/front/src/modules/ui/input/components/DateInput.tsx
@@ -84,7 +84,7 @@ export function DateInput({
-
+
diff --git a/front/src/modules/ui/view-bar/components/MultipleFiltersDropdownContent.tsx b/front/src/modules/ui/view-bar/components/MultipleFiltersDropdownContent.tsx
index 5a5252618..a2e9ab7fb 100644
--- a/front/src/modules/ui/view-bar/components/MultipleFiltersDropdownContent.tsx
+++ b/front/src/modules/ui/view-bar/components/MultipleFiltersDropdownContent.tsx
@@ -39,8 +39,6 @@ export function MultipleFiltersDropdownContent({
context,
);
- console.log('filterDefinitionUsedInDropdown', filterDefinitionUsedInDropdown);
-
return (
<>
diff --git a/front/src/modules/ui/view-bar/components/ViewBarDetails.tsx b/front/src/modules/ui/view-bar/components/ViewBarDetails.tsx
index f31bce1f9..59d7cf8af 100644
--- a/front/src/modules/ui/view-bar/components/ViewBarDetails.tsx
+++ b/front/src/modules/ui/view-bar/components/ViewBarDetails.tsx
@@ -14,6 +14,8 @@ import { filtersScopedState } from '../states/filtersScopedState';
import { isViewBarExpandedScopedState } from '../states/isViewBarExpandedScopedState';
import { canPersistFiltersScopedFamilySelector } from '../states/selectors/canPersistFiltersScopedFamilySelector';
import { canPersistSortsScopedFamilySelector } from '../states/selectors/canPersistSortsScopedFamilySelector';
+import { savedFiltersFamilySelector } from '../states/selectors/savedFiltersFamilySelector';
+import { savedSortsFamilySelector } from '../states/selectors/savedSortsFamilySelector';
import { sortsScopedState } from '../states/sortsScopedState';
import { getOperandLabelShort } from '../utils/getOperandLabel';
@@ -111,6 +113,13 @@ function ViewBarDetails({
filtersScopedState,
context,
);
+
+ const savedFilters = useRecoilValue(
+ savedFiltersFamilySelector(currentViewId),
+ );
+
+ const savedSorts = useRecoilValue(savedSortsFamilySelector(currentViewId));
+
const [availableFilters] = useRecoilScopedState(
availableFiltersScopedState,
context,
@@ -145,11 +154,10 @@ function ViewBarDetails({
});
const removeFilter = useRemoveFilter(context);
-
function handleCancelClick() {
onReset?.();
- setFilters([]);
- setSorts([]);
+ setFilters(savedFilters);
+ setSorts(savedSorts);
}
const handleSortRemove = (sortKey: string) =>
@@ -213,7 +221,7 @@ function ViewBarDetails({
)}
- {(filters.length + sorts.length > 0 || canPersistViewFields) && (
+ {canPersistView && (
+ ({ get }) =>
+ get(savedFiltersFamilyState(viewId)),
+});
diff --git a/front/src/modules/ui/view-bar/states/selectors/savedSortsFamilySelector.ts b/front/src/modules/ui/view-bar/states/selectors/savedSortsFamilySelector.ts
new file mode 100644
index 000000000..a84b890b3
--- /dev/null
+++ b/front/src/modules/ui/view-bar/states/selectors/savedSortsFamilySelector.ts
@@ -0,0 +1,11 @@
+import { selectorFamily } from 'recoil';
+
+import { savedSortsFamilyState } from '../savedSortsFamilyState';
+
+export const savedSortsFamilySelector = selectorFamily({
+ key: 'savedSortsFamilySelector',
+ get:
+ (viewId: string | undefined) =>
+ ({ get }) =>
+ get(savedSortsFamilyState(viewId)),
+});