fix: view filter and group by types
This commit is contained in:
parent
f95625f20d
commit
71df89c81e
@ -57,7 +57,7 @@ const FilterControl = ({
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{viewFilters.map(viewFilter => {
|
{viewFilters.map(viewFilter => {
|
||||||
const checked = filter[viewFilter.id]?.active ?? false;
|
const checked = Boolean(viewFilter.id && filter[viewFilter?.id]?.active) ?? false;
|
||||||
const labelId = `filter-list-label-${viewFilter.label}`;
|
const labelId = `filter-list-label-${viewFilter.label}`;
|
||||||
return (
|
return (
|
||||||
<MenuItem
|
<MenuItem
|
||||||
|
@ -692,14 +692,14 @@ export type Field<EF extends BaseField = UnknownField> =
|
|||||||
| EF;
|
| EF;
|
||||||
|
|
||||||
export interface ViewFilter {
|
export interface ViewFilter {
|
||||||
id: string;
|
id?: string;
|
||||||
label: string;
|
label: string;
|
||||||
field: string;
|
field: string;
|
||||||
pattern: string;
|
pattern: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ViewGroup {
|
export interface ViewGroup {
|
||||||
id: string;
|
id?: string;
|
||||||
label: string;
|
label: string;
|
||||||
field: string;
|
field: string;
|
||||||
pattern?: string;
|
pattern?: string;
|
||||||
|
@ -405,6 +405,10 @@ function entries(
|
|||||||
const payload = action.payload;
|
const payload = action.payload;
|
||||||
const { collection, filter: viewFilter } = payload;
|
const { collection, filter: viewFilter } = payload;
|
||||||
|
|
||||||
|
if (!viewFilter.id) {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
const filter = {
|
const filter = {
|
||||||
...state.filter,
|
...state.filter,
|
||||||
};
|
};
|
||||||
@ -434,6 +438,10 @@ function entries(
|
|||||||
const payload = action.payload;
|
const payload = action.payload;
|
||||||
const { collection, filter: viewFilter } = payload;
|
const { collection, filter: viewFilter } = payload;
|
||||||
|
|
||||||
|
if (!viewFilter.id) {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
const filter = {
|
const filter = {
|
||||||
...state.filter,
|
...state.filter,
|
||||||
};
|
};
|
||||||
@ -468,6 +476,10 @@ function entries(
|
|||||||
const payload = action.payload;
|
const payload = action.payload;
|
||||||
const { collection, group: groupBy } = payload;
|
const { collection, group: groupBy } = payload;
|
||||||
|
|
||||||
|
if (!groupBy.id) {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
const group = {
|
const group = {
|
||||||
...state.group,
|
...state.group,
|
||||||
};
|
};
|
||||||
@ -494,6 +506,10 @@ function entries(
|
|||||||
const payload = action.payload;
|
const payload = action.payload;
|
||||||
const { collection, group: groupBy } = payload;
|
const { collection, group: groupBy } = payload;
|
||||||
|
|
||||||
|
if (!groupBy.id) {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
const group = {
|
const group = {
|
||||||
...state.group,
|
...state.group,
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user