fix: entries loading

Author: martinjagodic

packages/decap-cms-core/src/actions/entries.ts

@@ -157,17 +157,18 @@ export function entriesLoaded(
   collection: Collection,
   entries: EntryValue[],
   pagination: number | null,
-  cursor: Cursor,
+  cursor?: Cursor | Record<string, unknown> | null,
   append = true,
   hasMore = false,
 ) {
+  const safeCursor = cursor ? Cursor.create(cursor) : Cursor.create({});
   return {
     type: ENTRIES_SUCCESS,
     payload: {
       collection: collection.get('name'),
       entries,
       page: pagination,
-      cursor: Cursor.create(cursor),
+      cursor: safeCursor,
       append,
       hasMore,
     },
@@ -875,22 +876,22 @@ export function loadEntries(collection: Collection, page = 0) {
       if (loadAllEntries) {
         if (cachedEntries) {
           // Serve cached full set immediately
-            dispatch(
-              entriesLoaded(
-                collection,
-                cachedEntries,
-                0,
-                addAppendActionsToCursor(Cursor.create({})),
-                false,
-                false,
-              ),
-            );
-            if (isI18nCollection && paginationEnabled) {
-              dispatch({
-                type: SORT_ENTRIES_SUCCESS,
-                payload: { collection: collectionName, entries: cachedEntries },
-              });
-            }
+          dispatch(
+            entriesLoaded(
+              collection,
+              cachedEntries,
+              0,
+              addAppendActionsToCursor(Cursor.create({})),
+              false,
+              false,
+            ),
+          );
+          if (isI18nCollection && paginationEnabled) {
+            dispatch({
+              type: SORT_ENTRIES_SUCCESS,
+              payload: { collection: collectionName, entries: cachedEntries },
+            });
+          }
         } else {
           // Progressive loading loop
           const initial = await provider.listEntries(collection, 0);

packages/decap-cms-core/src/reducers/entries.ts

@@ -251,14 +251,11 @@ function entries(
         );
 
         const ids = List(loadedEntries.map(entry => entry.slug));
-        map.setIn(
-          ['pages', collection],
-          Map({
-            page,
-            ids: append ? map.getIn(['pages', collection, 'ids'], List()).concat(ids) : ids,
-            isFetching: hasMore, // keep fetching flag true until last page
-          }),
-        );
+        const pageMap = Map({
+          page,
+          ids: append ? map.getIn(['pages', collection, 'ids'], List()).concat(ids) : ids,
+        });
+        map.setIn(['pages', collection], hasMore ? pageMap.set('isFetching', true) : pageMap);
 
         // Update pagination metadata from cursor if available
         if (payload.cursor && payload.cursor.meta && payload.cursor.meta.get('count')) {