Feat: nested collections (#3716)

packages/netlify-cms-core/src/reducers/collections.ts

@@ -449,4 +449,13 @@ export const selectFieldsComments = (collection: Collection, entryMap: EntryMap)
   return comments;
 };
 
+export const selectHasMetaPath = (collection: Collection) => {
+  return (
+    collection.has('folder') &&
+    collection.get('type') === FOLDER &&
+    collection.has('meta') &&
+    collection.get('meta')?.has('path')
+  );
+};
+
 export default collections;

packages/netlify-cms-core/src/reducers/editorialWorkflow.ts

@@ -98,12 +98,7 @@ const unpublishedEntries = (state = Map(), action: EditorialWorkflowAction) => {
       // Update Optimistically
       return state.withMutations(map => {
         map.setIn(
-          [
-            'entities',
-            `${action.payload!.collection}.${action.payload!.slug}`,
-            'metaData',
-            'status',
-          ],
+          ['entities', `${action.payload!.collection}.${action.payload!.slug}`, 'status'],
           action.payload!.newStatus,
         );
         map.setIn(
@@ -148,7 +143,7 @@ export const selectUnpublishedEntry = (
 export const selectUnpublishedEntriesByStatus = (state: EditorialWorkflow, status: string) => {
   if (!state) return null;
   const entities = state.get('entities') as Entities;
-  return entities.filter(entry => entry.getIn(['metaData', 'status']) === status).valueSeq();
+  return entities.filter(entry => entry.get('status') === status).valueSeq();
 };
 
 export const selectUnpublishedSlugs = (state: EditorialWorkflow, collection: string) => {

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

@@ -351,6 +351,14 @@ export const selectEntries = (state: Entries, collection: Collection) => {
   return entries;
 };
 
+export const selectEntryByPath = (state: Entries, collection: string, path: string) => {
+  const slugs = selectPublishedSlugs(state, collection);
+  const entries =
+    slugs && (slugs.map(slug => selectEntry(state, collection, slug as string)) as List<EntryMap>);
+
+  return entries && entries.find(e => e?.get('path') === path);
+};
+
 export const selectEntriesLoaded = (state: Entries, collection: string) => {
   return !!state.getIn(['pages', collection]);
 };

packages/netlify-cms-core/src/reducers/entryDraft.js

@@ -22,6 +22,9 @@ import {
   UNPUBLISHED_ENTRY_PERSIST_SUCCESS,
   UNPUBLISHED_ENTRY_PERSIST_FAILURE,
 } from 'Actions/editorialWorkflow';
+import { get } from 'lodash';
+import { selectFolderEntryExtension, selectHasMetaPath } from './collections';
+import { join } from 'path';
 
 const initialState = Map({
   entry: Map(),
@@ -87,10 +90,22 @@ const entryDraftReducer = (state = Map(), action) => {
     }
     case DRAFT_CHANGE_FIELD: {
       return state.withMutations(state => {
-        state.setIn(['entry', 'data', action.payload.field], action.payload.value);
-        state.mergeDeepIn(['fieldsMetaData'], fromJS(action.payload.metadata));
+        const { field, value, metadata, entries } = action.payload;
+        const name = field.get('name');
+        const meta = field.get('meta');
+        if (meta) {
+          state.setIn(['entry', 'meta', name], value);
+        } else {
+          state.setIn(['entry', 'data', name], value);
+        }
+        state.mergeDeepIn(['fieldsMetaData'], fromJS(metadata));
         const newData = state.getIn(['entry', 'data']);
-        state.set('hasChanged', !action.payload.entries.some(e => newData.equals(e.get('data'))));
+        const newMeta = state.getIn(['entry', 'meta']);
+        state.set(
+          'hasChanged',
+          !entries.some(e => newData.equals(e.get('data'))) ||
+            !entries.some(e => newMeta.equals(e.get('meta'))),
+        );
       });
     }
     case DRAFT_VALIDATION_ERRORS:
@@ -161,4 +176,16 @@ const entryDraftReducer = (state = Map(), action) => {
   }
 };
 
+export const selectCustomPath = (collection, entryDraft) => {
+  if (!selectHasMetaPath(collection)) {
+    return;
+  }
+  const meta = entryDraft.getIn(['entry', 'meta']);
+  const path = meta && meta.get('path');
+  const indexFile = get(collection.toJS(), ['meta', 'path', 'index_file']);
+  const extension = selectFolderEntryExtension(collection);
+  const customPath = path && join(collection.get('folder'), path, `${indexFile}.${extension}`);
+  return customPath;
+};
+
 export default entryDraftReducer;