gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix view filters

Browse Source
This commit is contained in:
Daniel Lautzenheiser 2023-04-10 16:25:46 -04:00
parent 3582b2bb89
commit 7a9a465bf4
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/src/backend.ts
View File

@ -1005,17 +1005,15 @@ export class Backend<EF extends BaseField = UnknownField, BC extends BackendClas
fieldsOrder(collection: Collection, entry: Entry) {
if ('fields' in collection) {
return collection.fields?.map(f => f!.name) ?? [];
} else {
const files = collection.files ?? [];
const file: CollectionFile | null = files.filter(f => f!.name === entry.slug)?.[0] ?? null;
if (file == null) {
throw new Error(`No file found for ${entry.slug} in ${collection.name}`);
}
return file.fields.map(f => f.name);
}
return [];
const files = collection.files ?? [];
const file: CollectionFile | null = files.filter(f => f!.name === entry.slug)?.[0] ?? null;
if (file == null) {
throw new Error(`No file found for ${entry.slug} in ${collection.name}`);
}
return file.fields.map(f => f.name);
}
filterEntries(collection: { entries: Entry[] }, filterRule: FilterRule) {

1
packages/core/src/components/collections/FilterControl.tsx
View File

@ -25,6 +25,7 @@ const FilterControl = ({
const handleFilterClick = useCallback(
(viewFilter: ViewFilter) => (event: MouseEvent | ChangeEvent) => {
event.stopPropagation();
event.preventDefault();
onFilterClick(viewFilter);
},
[onFilterClick],

1
packages/core/src/components/collections/entries/EntriesCollection.tsx
View File

@ -71,7 +71,6 @@ const EntriesCollection = ({
const [prevCollection, setPrevCollection] = useState(collection);
const groups = useGroups(collection.name);
console.log('[GROUPS] groups', groups);
const entries = useEntries(collection);

8
packages/core/src/lib/hooks/useFilters.ts
View File

@ -1,14 +1,14 @@
import { useMemo } from 'react';
import { selectEntriesSortField } from '@staticcms/core/reducers/selectors/entries';
import { selectEntriesFilter } from '@staticcms/core/reducers/selectors/entries';
import { useAppSelector } from '@staticcms/core/store/hooks';
export default function useFilters(collectionName: string) {
const entriesSortFieldSelector = useMemo(
() => selectEntriesSortField(collectionName),
const entriesFilterFieldSelector = useMemo(
() => selectEntriesFilter(collectionName),
[collectionName],
);
const filters = useAppSelector(entriesSortFieldSelector);
const filters = useAppSelector(entriesFilterFieldSelector);
return useMemo(() => {
return Object.values(filters ?? {}).filter(v => v?.active === true) || [];