Fix a few bugs before deploy
This commit is contained in:
@ -84,7 +84,7 @@ export function DateInput({
|
|||||||
<div ref={wrapperRef}>
|
<div ref={wrapperRef}>
|
||||||
<div ref={refs.setReference}>
|
<div ref={refs.setReference}>
|
||||||
<StyledInputContainer>
|
<StyledInputContainer>
|
||||||
<DateDisplay value={internalValue} />
|
<DateDisplay value={internalValue ?? new Date()} />
|
||||||
</StyledInputContainer>
|
</StyledInputContainer>
|
||||||
</div>
|
</div>
|
||||||
<div ref={refs.setFloating} style={floatingStyles}>
|
<div ref={refs.setFloating} style={floatingStyles}>
|
||||||
|
|||||||
@ -39,8 +39,6 @@ export function MultipleFiltersDropdownContent({
|
|||||||
context,
|
context,
|
||||||
);
|
);
|
||||||
|
|
||||||
console.log('filterDefinitionUsedInDropdown', filterDefinitionUsedInDropdown);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledDropdownMenu>
|
<StyledDropdownMenu>
|
||||||
<>
|
<>
|
||||||
|
|||||||
@ -14,6 +14,8 @@ import { filtersScopedState } from '../states/filtersScopedState';
|
|||||||
import { isViewBarExpandedScopedState } from '../states/isViewBarExpandedScopedState';
|
import { isViewBarExpandedScopedState } from '../states/isViewBarExpandedScopedState';
|
||||||
import { canPersistFiltersScopedFamilySelector } from '../states/selectors/canPersistFiltersScopedFamilySelector';
|
import { canPersistFiltersScopedFamilySelector } from '../states/selectors/canPersistFiltersScopedFamilySelector';
|
||||||
import { canPersistSortsScopedFamilySelector } from '../states/selectors/canPersistSortsScopedFamilySelector';
|
import { canPersistSortsScopedFamilySelector } from '../states/selectors/canPersistSortsScopedFamilySelector';
|
||||||
|
import { savedFiltersFamilySelector } from '../states/selectors/savedFiltersFamilySelector';
|
||||||
|
import { savedSortsFamilySelector } from '../states/selectors/savedSortsFamilySelector';
|
||||||
import { sortsScopedState } from '../states/sortsScopedState';
|
import { sortsScopedState } from '../states/sortsScopedState';
|
||||||
import { getOperandLabelShort } from '../utils/getOperandLabel';
|
import { getOperandLabelShort } from '../utils/getOperandLabel';
|
||||||
|
|
||||||
@ -111,6 +113,13 @@ function ViewBarDetails({
|
|||||||
filtersScopedState,
|
filtersScopedState,
|
||||||
context,
|
context,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const savedFilters = useRecoilValue(
|
||||||
|
savedFiltersFamilySelector(currentViewId),
|
||||||
|
);
|
||||||
|
|
||||||
|
const savedSorts = useRecoilValue(savedSortsFamilySelector(currentViewId));
|
||||||
|
|
||||||
const [availableFilters] = useRecoilScopedState(
|
const [availableFilters] = useRecoilScopedState(
|
||||||
availableFiltersScopedState,
|
availableFiltersScopedState,
|
||||||
context,
|
context,
|
||||||
@ -145,11 +154,10 @@ function ViewBarDetails({
|
|||||||
});
|
});
|
||||||
|
|
||||||
const removeFilter = useRemoveFilter(context);
|
const removeFilter = useRemoveFilter(context);
|
||||||
|
|
||||||
function handleCancelClick() {
|
function handleCancelClick() {
|
||||||
onReset?.();
|
onReset?.();
|
||||||
setFilters([]);
|
setFilters(savedFilters);
|
||||||
setSorts([]);
|
setSorts(savedSorts);
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleSortRemove = (sortKey: string) =>
|
const handleSortRemove = (sortKey: string) =>
|
||||||
@ -213,7 +221,7 @@ function ViewBarDetails({
|
|||||||
</StyledAddFilterContainer>
|
</StyledAddFilterContainer>
|
||||||
)}
|
)}
|
||||||
</StyledFilterContainer>
|
</StyledFilterContainer>
|
||||||
{(filters.length + sorts.length > 0 || canPersistViewFields) && (
|
{canPersistView && (
|
||||||
<StyledCancelButton
|
<StyledCancelButton
|
||||||
data-testid="cancel-button"
|
data-testid="cancel-button"
|
||||||
onClick={handleCancelClick}
|
onClick={handleCancelClick}
|
||||||
|
|||||||
@ -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)),
|
||||||
|
});
|
||||||
@ -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)),
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user