fix: properly handle default group and filter

StaticJsCMS · Feb 8, 2024 · 9fca472 · 9fca472
1 parent ccd242c
commit 9fca472
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/packages/core/src/actions/entries.ts b/packages/core/src/actions/entries.ts
@@ -338,13 +338,8 @@ export function groupByField(collection: CollectionWithDefaults, group: ViewGrou
   return async (dispatch: ThunkDispatch<RootState, {}, AnyAction>, getState: () => RootState) => {
     const state = getState();
     const isFetching = selectIsFetching(state, collection.name);
-    dispatch({
-      type: GROUP_ENTRIES_REQUEST,
-      payload: {
-        collection: collection.name,
-        group,
-      },
-    });
+    dispatch(groupEntriesRequest(collection, group));
+
     if (isFetching) {
       return;
     }

diff --git a/packages/core/src/components/collections/CollectionView.tsx b/packages/core/src/components/collections/CollectionView.tsx
@@ -189,22 +189,37 @@ const CollectionView: FC<CollectionViewProps> = ({
     const sortGroupFilterEntries = () => {
       setTimeout(async () => {
         if (defaultSort && defaultSort.field) {
-          await onSortClick(defaultSort.field, defaultSort.direction ?? SORT_DIRECTION_ASCENDING);
+          const isDefaultSortActive = Boolean(
+            Object.values(sort).find(s => s.key === defaultSort.field),
+          );
+          if (!isDefaultSortActive) {
+            await onSortClick(defaultSort.field, defaultSort.direction ?? SORT_DIRECTION_ASCENDING);
+          }
         }
 
         if (defaultViewGroupName) {
-          const defaultViewGroup = viewGroups?.groups.find(g => g.name === defaultViewGroupName);
-          if (defaultViewGroup) {
-            await onGroupClick(defaultViewGroup);
+          const isDefaultGroupActive = Boolean(
+            Object.values(group).find(g => g.name === defaultViewGroupName && g.active),
+          );
+          if (!isDefaultGroupActive) {
+            const defaultViewGroup = viewGroups?.groups.find(g => g.name === defaultViewGroupName);
+            if (defaultViewGroup) {
+              await onGroupClick(defaultViewGroup);
+            }
           }
         }
 
         if (defaultViewFilterName) {
-          const defaultViewFilter = viewFilters?.filters.find(
-            f => f.name === defaultViewFilterName,
+          const isDefaultFilterActive = Boolean(
+            Object.values(filter).find(f => f.name === defaultViewFilterName && f.active),
           );
-          if (defaultViewFilter) {
-            await onFilterClick(defaultViewFilter);
+          if (!isDefaultFilterActive) {
+            const defaultViewFilter = viewFilters?.filters.find(
+              f => f.name === defaultViewFilterName,
+            );
+            if (defaultViewFilter) {
+              await onFilterClick(defaultViewFilter);
+            }
           }
         }
 
@@ -219,17 +234,8 @@ const CollectionView: FC<CollectionViewProps> = ({
     return () => {
       alive = false;
     };
-  }, [
-    collection,
-    onFilterClick,
-    onGroupClick,
-    onSortClick,
-    prevCollection,
-    readyToLoad,
-    sort,
-    viewFilters?.filters,
-    viewGroups?.groups,
-  ]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [collection, onFilterClick, onGroupClick, onSortClick, prevCollection, readyToLoad]);
 
   const collectionDescription = collection?.description;