Merge pull request #711 from marmelab/revert-659-fix_optimistic_rendering

Revert "[RFR] Fix list optimistic rendering"

Author: fzaninotto

CHANGELOG.md

@@ -14,7 +14,6 @@
 * Add Swedish translation ([StefanWallin](https://github.com/StefanWallin))
 * Fix filters with dot notation not properly cleared ([djhi](https://github.com/djhi))
 * Fix show (edit) button in Edit (Show) page on initial load ([wesley6j](https://github.com/wesley6j))
-* Fix list optimistic rendering ([djhi](https://github.com/djhi))
 * Fix defaultValue typo in blog example ([wesley6j](https://github.com/wesley6j))
 
 ## v1.0.2

src/reducer/resource/list/ids.js

@@ -1,57 +1,10 @@
-import { CRUD_GET_MANY_SUCCESS, CRUD_GET_LIST_SUCCESS, CRUD_DELETE_SUCCESS } from '../../../actions/dataActions';
+import { CRUD_GET_LIST_SUCCESS, CRUD_DELETE_SUCCESS } from '../../../actions/dataActions';
 
-const cacheDuration = 10 * 60 * 1000; // ten minutes
-
-/**
- * Add new records to the pool, and remove outdated ones.
- *
- * This is the equivalent of a stale-while-revalidate caching strategy:
- * The cached data is displayed before fetching, and stale data is removed
- * only once fresh data is fetched.
- */
-const addRecords = (newRecords = [], oldRecords) => {
-    const now = new Date();
-    const newRecordsFetchedAt = newRecords.reduce((prev, record) => {
-        prev[record] = now; // eslint-disable-line no-param-reassign
-        return prev;
-    }, []);
-    // remove outdated old records
-    const latestValidDate = new Date();
-    latestValidDate.setTime(latestValidDate.getTime() - cacheDuration);
-    const oldValidRecordIds = oldRecords.fetchedAt
-        ? Object.keys(oldRecords.fetchedAt)
-            .filter(id => oldRecords.fetchedAt[id] > latestValidDate)
-        : [];
-    const oldValidRecords = oldValidRecordIds.reduce((prev, id) => {
-        prev[id] = oldRecords[id]; // eslint-disable-line no-param-reassign
-        return prev;
-    }, []);
-    const oldValidRecordsFetchedAt = oldValidRecordIds.reduce((prev, id) => {
-        prev[id] = oldRecords.fetchedAt[id]; // eslint-disable-line no-param-reassign
-        return prev;
-    }, []);
-    // combine old records and new records
-    const records = [
-        ...oldValidRecords,
-        ...newRecords,
-    ];
-    Object.defineProperty(records, 'fetchedAt', { value: {
-        ...oldValidRecordsFetchedAt,
-        ...newRecordsFetchedAt,
-    } }); // non enumerable by default
-    return records;
-};
-
-const initialState = [];
-Object.defineProperty(initialState, 'fetchedAt', { value: {} }); // non enumerable by default
-
-export default resource => (previousState = initialState, { type, payload, requestPayload, meta }) => {
+export default resource => (previousState = [], { type, payload, requestPayload, meta }) => {
     if (!meta || meta.resource !== resource) {
         return previousState;
     }
     switch (type) {
-    case CRUD_GET_MANY_SUCCESS:
-        return addRecords(payload.data.map(record => record.id), previousState);
     case CRUD_GET_LIST_SUCCESS:
         return payload.data.map(record => record.id);
     case CRUD_DELETE_SUCCESS: {
@@ -66,4 +19,4 @@ export default resource => (previousState = initialState, { type, payload, reque
     }
 };
 
-export const getIds = state => state;
+export const getIds = (state) => state;