feat: get unpublished entries

Author: martinjagodic

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

@@ -3,10 +3,10 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import styled from '@emotion/styled';
 import { Waypoint } from 'react-waypoint';
-import { Map } from 'immutable';
+import { Map, List } from 'immutable';
 import { connect } from 'react-redux';
 
-import { selectUnpublishedEntry } from '../../../reducers';
+import { selectUnpublishedEntry, selectUnpublishedEntriesByStatus } from '../../../reducers';
 import { selectFields, selectInferredField } from '../../../reducers/collections';
 import EntryCard from './EntryCard';
 
@@ -27,6 +27,7 @@ class EntryListing extends React.Component {
     cursor: PropTypes.any.isRequired,
     handleCursorActions: PropTypes.func.isRequired,
     page: PropTypes.number,
+    getUnpublishedEntries: PropTypes.func.isRequired,
   };
 
   hasMore = () => {
@@ -51,20 +52,46 @@ class EntryListing extends React.Component {
     return { titleField, descriptionField, imageField, remainingFields };
   };
 
+  getAllEntries = () => {
+    const { entries, collections } = this.props;
+    const collectionName = Map.isMap(collections) ? collections.get('name') : null;
+
+    if (!collectionName) {
+      return entries;
+    }
+
+    const unpublishedEntries = this.props.getUnpublishedEntries(collectionName);
+
+    if (!unpublishedEntries || unpublishedEntries.length === 0) {
+      return entries;
+    }
+
+    const unpublishedList = List(unpublishedEntries.map(entry => entry));
+
+    const publishedSlugs = entries.map(entry => entry.get('slug')).toSet();
+    const uniqueUnpublished = unpublishedList.filterNot(entry =>
+      publishedSlugs.has(entry.get('slug'))
+    );
+
+    return entries.concat(uniqueUnpublished);
+  };
+
   renderCardsForSingleCollection = () => {
-    const { collections, entries, viewStyle } = this.props;
+    const { collections, viewStyle } = this.props;
+    const allEntries = this.getAllEntries();
     const inferredFields = this.inferFields(collections);
     const entryCardProps = { collection: collections, inferredFields, viewStyle };
 
-    return entries.map((entry, idx) => {
+    return allEntries.map((entry, idx) => {
       const workflowStatus = this.props.getWorkflowStatus(collections.get('name'), entry.get('slug'));
-      console.log('workflowStatus', workflowStatus);
+      const isUnpublished = !!workflowStatus;
 
       return (
         <EntryCard
           {...entryCardProps}
           entry={entry}
           workflowStatus={workflowStatus}
+          isUnpublished={isUnpublished}
           key={idx}
         />
       );
@@ -79,7 +106,14 @@ class EntryListing extends React.Component {
       const collection = collections.find(coll => coll.get('name') === collectionName);
       const collectionLabel = !isSingleCollectionInList && collection.get('label');
       const inferredFields = this.inferFields(collection);
-      const entryCardProps = { collection, entry, inferredFields, collectionLabel };
+      const workflowStatus = this.props.getWorkflowStatus(collectionName, entry.get('slug'));
+      const entryCardProps = {
+        collection,
+        entry,
+        inferredFields,
+        collectionLabel,
+        workflowStatus
+      };
       return <EntryCard {...entryCardProps} key={idx} />;
     });
   };
@@ -103,10 +137,26 @@ class EntryListing extends React.Component {
 function mapStateToProps(state) {
   return {
     getWorkflowStatus: (collectionName, slug) => {
-
       const unpublishedEntry = selectUnpublishedEntry(state, collectionName, slug);
-      console.log('getWorkflowStatus', unpublishedEntry);
       return unpublishedEntry ? unpublishedEntry.get('status') : null;
+    },
+    getUnpublishedEntries: (collectionName) => {
+      const allStatuses = ['draft', 'pending_review', 'pending_publish'];
+      const unpublishedEntries = [];
+
+      allStatuses.forEach(statusKey => {
+        const entriesForStatus = selectUnpublishedEntriesByStatus(state, statusKey);
+        if (entriesForStatus) {
+          entriesForStatus.forEach(entry => {
+            if (entry.get('collection') === collectionName) {
+              const entryWithCollection = entry.set('collection', collectionName);
+              unpublishedEntries.push(entryWithCollection);
+            }
+          });
+        }
+      });
+
+      return unpublishedEntries;
     }
   };
 }