Merge branch 'feat/db-cache-poc' into moc-db-cache-poc

Author: demshy

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

@@ -109,6 +109,7 @@ export const CHANGE_VIEW_STYLE = 'CHANGE_VIEW_STYLE';
 export const SET_ENTRIES_PAGE_SIZE = 'SET_ENTRIES_PAGE_SIZE';
 export const LOAD_ENTRIES_PAGE = 'LOAD_ENTRIES_PAGE';
 export const SET_ENTRIES_PAGE = 'SET_ENTRIES_PAGE';
+export const SYNC_ENTRIES = 'SYNC_ENTRIES';
 
 /*
  * Simple Action Creators (Internal)
@@ -864,7 +865,7 @@ function addAppendActionsToCursor(cursor: Cursor) {
   return updatedCursor;
 }
 
-export function loadEntries(collection: Collection, page = 0) {
+export function loadEntries(collection: Collection, page = 0, sync = false) {
   return async (dispatch: ThunkDispatch<State, {}, AnyAction>, getState: () => State) => {
     if (collection.get('isFetching')) {
       return;
@@ -1511,3 +1512,10 @@ export function validateMetaField(
   }
   return { error: false };
 }
+
+export function syncEntries(collection: Collection) {
+  return (dispatch: ThunkDispatch<State, {}, AnyAction>) => {
+    dispatch({ type: SYNC_ENTRIES, payload: { collection: collection.get('name') } });
+    return dispatch(loadEntries(collection, 0, true)); // Pass sync=true
+  };
+}

packages/decap-cms-core/src/backend.ts

@@ -59,6 +59,11 @@ import {
   getI18nInfo,
   I18N_STRUCTURE,
 } from './lib/i18n';
+import {
+  getDataFilesByCollection,
+  saveDataFilesByCollection,
+  saveDataFileToDbCache,
+} from './dbcache';
 
 import type { I18nInfo } from './lib/i18n';
 import type AssetProxy from './valueObjects/AssetProxy';
@@ -676,7 +681,14 @@ export class Backend {
       totalCount: number;
       entries: EntryValue[];
     }) => void,
+    sync = false,
   ) {
+    const cacheFiles = await getDataFilesByCollection(collection.get('name'));
+
+    if (cacheFiles.length > 0 && !sync) {
+      return cacheFiles;
+    }
+
     if (collection.get('folder') && this.implementation.allEntriesByFolder) {
       const depth = collectionDepth(collection);
       const extension = selectFolderEntryExtension(collection);
@@ -708,11 +720,23 @@ export class Backend {
           collectionRegex(collection),
           wrappedOnProgress,
         )
-        .then(entries => {
+        .then(async entries => {
           console.log(
             `[backend.listAllEntries] allEntriesByFolder returned ${entries.length} entries`,
           );
-          return this.processEntries(entries, collection);
+
+          const all = this.processEntries(entries, collection);
+
+          await saveDataFilesByCollection(
+            collection.get('name'),
+            all.map(entry => ({
+              path: entry.path,
+              raw: entry.raw,
+              json: entry,
+            })),
+          );
+
+          return all;
         });
     }
 
@@ -724,6 +748,9 @@ export class Backend {
       entries.push(...newEntries);
       cursor = newCursor;
     }
+
+    console.log('list all entries', entries);
+
     return entries;
   }
 
@@ -1276,6 +1303,7 @@ export class Backend {
         raw: this.entryToRaw(collection, entryDraft.get('entry')),
         newPath: customPath === path ? undefined : customPath,
         isFolder,
+        json: entryDraft.get('entry').toJS(),
       };
     }
 
@@ -1332,6 +1360,7 @@ export class Backend {
       },
       opts,
     );
+    await saveDataFileToDbCache(collectionName, dataFile);
 
     await this.invokePostSaveEvent(entryDraft.get('entry'));
 

packages/decap-cms-core/src/components/Collection/Collection.js

@@ -12,7 +12,13 @@ import CollectionTop from './CollectionTop';
 import EntriesCollection from './Entries/EntriesCollection';
 import EntriesSearch from './Entries/EntriesSearch';
 import CollectionControls from './CollectionControls';
-import { sortByField, filterByField, changeViewStyle, groupByField } from '../../actions/entries';
+import {
+  sortByField,
+  filterByField,
+  changeViewStyle,
+  groupByField,
+  syncEntries,
+} from '../../actions/entries';
 import {
   selectSortableFields,
   selectViewFilters,
@@ -100,6 +106,7 @@ export class Collection extends React.Component {
       onChangeViewStyle,
       viewStyle,
       isFetchingEntries,
+      onSyncClick,
     } = this.props;
 
     let newEntryUrl = collection.get('create') ? getNewEntryUrl(collectionName) : '';
@@ -131,7 +138,11 @@ export class Collection extends React.Component {
             </SearchResultContainer>
           ) : (
             <>
-              <CollectionTop collection={collection} newEntryUrl={newEntryUrl} />
+              <CollectionTop
+                collection={collection}
+                newEntryUrl={newEntryUrl}
+                onSyncClick={onSyncClick}
+              />
               <CollectionControls
                 viewStyle={viewStyle}
                 onChangeViewStyle={onChangeViewStyle}
@@ -195,6 +206,7 @@ const mapDispatchToProps = {
   filterByField,
   changeViewStyle,
   groupByField,
+  syncEntries,
 };
 
 function mergeProps(stateProps, dispatchProps, ownProps) {
@@ -206,6 +218,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     onFilterClick: filter => dispatchProps.filterByField(stateProps.collection, filter),
     onGroupClick: group => dispatchProps.groupByField(stateProps.collection, group),
     onChangeViewStyle: viewStyle => dispatchProps.changeViewStyle(viewStyle),
+    onSyncClick: () => dispatchProps.syncEntries(stateProps.collection),
   };
 }
 

packages/decap-cms-core/src/components/Collection/CollectionTop.js

@@ -66,7 +66,7 @@ function getCollectionProps(collection) {
 
 const history = createHashHistory();
 
-function CollectionTop({ collection, newEntryUrl, t }) {
+function CollectionTop({ collection, newEntryUrl, onSyncClick, t }) {
   const { collectionLabel, collectionLabelSingular, collectionDescription } = getCollectionProps(
     collection,
     t,
@@ -82,10 +82,17 @@ function CollectionTop({ collection, newEntryUrl, t }) {
 
   // TODO: find some nice names for the path types, translate and consolidate
 
+  function handleSync() {
+    if (onSyncClick) {
+      onSyncClick();
+    }
+  }
+
   return (
     <CollectionTopContainer>
       <CollectionTopRow>
         <CollectionTopHeading>{collectionLabel}</CollectionTopHeading>
+        <button onClick={handleSync}>Sync</button>
         {indexFileConfig && collection.get('nested') ? (
           <Dropdown
             renderButton={() => (
@@ -128,6 +135,7 @@ function CollectionTop({ collection, newEntryUrl, t }) {
 CollectionTop.propTypes = {
   collection: ImmutablePropTypes.map.isRequired,
   newEntryUrl: PropTypes.string,
+  onSyncClick: PropTypes.func,
   t: PropTypes.func.isRequired,
 };