Fix a few bugs before deploy

front/src/modules/ui/input/components/DateInput.tsx

@@ -84,7 +84,7 @@ export function DateInput({
     <div ref={wrapperRef}>
       <div ref={refs.setReference}>
         <StyledInputContainer>
-          <DateDisplay value={internalValue} />
+          <DateDisplay value={internalValue ?? new Date()} />
         </StyledInputContainer>
       </div>
       <div ref={refs.setFloating} style={floatingStyles}>

front/src/modules/ui/view-bar/components/MultipleFiltersDropdownContent.tsx

@@ -39,8 +39,6 @@ export function MultipleFiltersDropdownContent({
     context,
   );
 
-  console.log('filterDefinitionUsedInDropdown', filterDefinitionUsedInDropdown);
-
   return (
     <StyledDropdownMenu>
       <>

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({
           </StyledAddFilterContainer>
         )}
       </StyledFilterContainer>
-      {(filters.length + sorts.length > 0 || canPersistViewFields) && (
+      {canPersistView && (
         <StyledCancelButton
           data-testid="cancel-button"
           onClick={handleCancelClick}

front/src/modules/ui/view-bar/states/selectors/savedFiltersFamilySelector.ts

@@ -0,0 +1,11 @@
+import { selectorFamily } from 'recoil';
+
+import { savedFiltersFamilyState } from '../savedFiltersFamilyState';
+
+export const savedFiltersFamilySelector = selectorFamily({
+  key: 'savedFiltersFamilySelector',
+  get:
+    (viewId: string | undefined) =>
+    ({ get }) =>
+      get(savedFiltersFamilyState(viewId)),
+});

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)),
+});