decap-cms-core 3.7.1 → 3.8.0

package/src/components/Collection/Entries/EntryListing.js

@@ -3,9 +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 { selectFields, selectInferredField } from '../../../reducers/collections';
+import { filterNestedEntries } from './EntriesCollection';
 import EntryCard from './EntryCard';
 
 const CardsGrid = styled.ul`
@@ -17,7 +18,7 @@ const CardsGrid = styled.ul`
   margin-bottom: 16px;
 `;
 
-export default class EntryListing extends React.Component {
+class EntryListing extends React.Component {
   static propTypes = {
     collections: ImmutablePropTypes.iterable.isRequired,
     entries: ImmutablePropTypes.list,
@@ -25,6 +26,9 @@ export default class EntryListing extends React.Component {
     cursor: PropTypes.any.isRequired,
     handleCursorActions: PropTypes.func.isRequired,
     page: PropTypes.number,
+    getUnpublishedEntries: PropTypes.func.isRequired,
+    getWorkflowStatus: PropTypes.func.isRequired,
+    filterTerm: PropTypes.string,
   };
 
   componentDidMount() {
@@ -54,11 +58,58 @@ export default class EntryListing extends React.Component {
     return { titleField, descriptionField, imageField, remainingFields };
   };
 
+  getAllEntries = () => {
+    const { entries, collections, filterTerm } = 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;
+    }
+
+    let unpublishedList = List(unpublishedEntries.map(entry => entry));
+
+    if (collections.has('nested') && filterTerm) {
+      const collectionFolder = collections.get('folder');
+      const subfolders = collections.get('nested').get('subfolders') !== false;
+
+      unpublishedList = filterNestedEntries(
+        filterTerm,
+        collectionFolder,
+        unpublishedList,
+        subfolders,
+      );
+    }
+
+    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) => <EntryCard {...entryCardProps} entry={entry} key={idx} />);
+
+    return allEntries.map((entry, idx) => {
+      const workflowStatus = this.props.getWorkflowStatus(
+        collections.get('name'),
+        entry.get('slug'),
+      );
+
+      return (
+        <EntryCard {...entryCardProps} entry={entry} workflowStatus={workflowStatus} key={idx} />
+      );
+    });
   };
 
   renderCardsForMultipleCollections = () => {
@@ -69,7 +120,14 @@ export default 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} />;
     });
   };
@@ -89,3 +147,5 @@ export default class EntryListing extends React.Component {
     );
   }
 }
+
+export default EntryListing;

package/src/components/Collection/Entries/__tests__/EntriesCollection.spec.js

@@ -14,6 +14,19 @@ jest.mock('../Entries', () => 'mock-entries');
 const middlewares = [];
 const mockStore = configureStore(middlewares);
 
+function createMockStore(collection, entriesArray, additionalState = {}) {
+  return mockStore({
+    entries: toEntriesState(collection, entriesArray),
+    cursors: fromJS({}),
+    config: fromJS({ publish_mode: 'simple' }),
+    collections: fromJS({ [collection.get('name')]: collection }),
+    editorialWorkflow: fromJS({
+      pages: { ids: [] },
+    }),
+    ...additionalState,
+  });
+}
+
 function renderWithRedux(component, { store } = {}) {
   function Wrapper({ children }) {
     return <Provider store={store}>{children}</Provider>;
@@ -70,10 +83,18 @@ describe('EntriesCollection', () => {
     t: jest.fn(),
     loadEntries: jest.fn(),
     traverseCollectionCursor: jest.fn(),
+    loadUnpublishedEntries: jest.fn(),
     isFetching: false,
     cursor: {},
     collection,
+    collections: fromJS({ pages: collection }),
+    entriesLoaded: true,
+    unpublishedEntriesLoaded: true,
+    isEditorialWorkflowEnabled: false,
+    getWorkflowStatus: jest.fn(),
+    getUnpublishedEntries: jest.fn(() => []),
   };
+
   it('should render with entries', () => {
     const entries = fromJS([{ slug: 'index' }]);
     const { asFragment } = render(<EntriesCollection {...props} entries={entries} />);
@@ -88,10 +109,7 @@ describe('EntriesCollection', () => {
       { slug: 'dir2/index', path: 'src/pages/dir2/index.md', data: { title: 'File 2' } },
     ];
 
-    const store = mockStore({
-      entries: toEntriesState(collection, entriesArray),
-      cursors: fromJS({}),
-    });
+    const store = createMockStore(collection, entriesArray);
 
     const { asFragment } = renderWithRedux(<ConnectedEntriesCollection collection={collection} />, {
       store,
@@ -109,18 +127,13 @@ describe('EntriesCollection', () => {
       { slug: 'dir3/dir4/index', path: 'src/pages/dir3/dir4/index.md', data: { title: 'File 4' } },
     ];
 
-    const store = mockStore({
-      entries: toEntriesState(collection, entriesArray),
-      cursors: fromJS({}),
-    });
+    const store = createMockStore(collection, entriesArray);
 
     const { asFragment } = renderWithRedux(
       <ConnectedEntriesCollection
         collection={collection.set('nested', fromJS({ depth: 10, subfolders: false }))}
       />,
-      {
-        store,
-      },
+      { store },
     );
 
     expect(asFragment()).toMatchSnapshot();
@@ -135,19 +148,14 @@ describe('EntriesCollection', () => {
       { slug: 'dir3/dir4/index', path: 'src/pages/dir3/dir4/index.md', data: { title: 'File 4' } },
     ];
 
-    const store = mockStore({
-      entries: toEntriesState(collection, entriesArray),
-      cursors: fromJS({}),
-    });
+    const store = createMockStore(collection, entriesArray);
 
     const { asFragment } = renderWithRedux(
       <ConnectedEntriesCollection
         collection={collection.set('nested', fromJS({ depth: 10, subfolders: false }))}
         filterTerm="dir3/dir4"
       />,
-      {
-        store,
-      },
+      { store },
     );
 
     expect(asFragment()).toMatchSnapshot();

package/src/components/Collection/Entries/__tests__/__snapshots__/EntriesCollection.spec.js.snap

@@ -29,6 +29,7 @@ exports[`EntriesCollection should render with applied filter term for nested col
     collections="Map { \\"name\\": \\"pages\\", \\"label\\": \\"Pages\\", \\"folder\\": \\"src/pages\\", \\"nested\\": Map { \\"depth\\": 10, \\"subfolders\\": false } }"
     cursor="[object Object]"
     entries="List [ Map { \\"slug\\": \\"dir3/dir4/index\\", \\"path\\": \\"src/pages/dir3/dir4/index.md\\", \\"data\\": Map { \\"title\\": \\"File 4\\" } } ]"
+    filterterm="dir3/dir4"
   />
 </DocumentFragment>
 `;

package/src/constants/configSchema.js

@@ -160,7 +160,15 @@ function getConfigSchema() {
       i18n: i18nRoot,
       site_url: { type: 'string', examples: ['https://example.com'] },
       display_url: { type: 'string', examples: ['https://example.com'] },
-      logo_url: { type: 'string', examples: ['https://example.com/images/logo.svg'] },
+      logo_url: { type: 'string', examples: ['https://example.com/images/logo.svg'] }, // Deprecated, replaced by `logo.src`
+      logo: {
+        type: 'object',
+        properties: {
+          src: { type: 'string', examples: ['https://example.com/images/logo.svg'] },
+          show_in_header: { type: 'boolean' },
+        },
+        required: ['src'],
+      },
       show_preview_links: { type: 'boolean' },
       media_folder: { type: 'string', examples: ['assets/uploads'] },
       public_folder: { type: 'string', examples: ['/uploads'] },

package/src/lib/i18n.ts

@@ -221,6 +221,24 @@ export function formatI18nBackup(
   return i18n;
 }
 
+function applyDefaultI18nValues(
+  collection: Collection,
+  value: EntryValue,
+  defaultLocaleValue: EntryValue,
+) {
+  if (collection.get('fields') === undefined) {
+    return;
+  }
+  collection.get('fields').forEach(field => {
+    if (field && field.get(I18N) === I18N_FIELD.DUPLICATE) {
+      const data = value.data[field.get('name')];
+      if (!data) {
+        value.data[field.get('name')] = defaultLocaleValue.data[field.get('name')];
+      }
+    }
+  });
+}
+
 function mergeValues(
   collection: Collection,
   structure: I18N_STRUCTURE,
@@ -236,6 +254,9 @@ function mergeValues(
     .filter(e => e.locale !== defaultEntry!.locale)
     .reduce((acc, { locale, value }) => {
       const dataPath = getLocaleDataPath(locale);
+      if (defaultEntry) {
+        applyDefaultI18nValues(collection, value, defaultEntry.value);
+      }
       return set(acc, dataPath, value.data);
     }, {});
 

package/src/types/redux.ts

@@ -397,7 +397,11 @@ export interface CmsConfig {
   locale?: string;
   site_url?: string;
   display_url?: string;
-  logo_url?: string;
+  logo_url?: string; // Deprecated, replaced by `logo.src`
+  logo?: {
+    src: string;
+    show_in_header?: boolean;
+  };
   show_preview_links?: boolean;
   media_folder?: string;
   public_folder?: string;