feat(index-files): fix editorial workflow with the new nested collection options

Author: demshy

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

@@ -208,15 +208,18 @@ export function normalizeConfig(config: CmsConfig) {
 }
 
 function applyMetaFieldsToCollection(collection: CmsCollection, meta: CmsCollectionMeta) {
-  const metaFields = [
+  const metaFields: CmsFieldBase[] = [
     {
       name: 'path',
       meta: true,
       required: true,
       i18n: 'duplicate',
       ...meta!.path,
     } as CmsFieldMeta,
-    {
+  ];
+
+  if (collection.index_file) {
+    metaFields.push({
       name: 'path_type',
       meta: true,
       required: true,
@@ -226,8 +229,8 @@ function applyMetaFieldsToCollection(collection: CmsCollection, meta: CmsCollect
       label: 'Path type',
       options: ['index', 'slug'],
       default: 'slug',
-    } as CmsFieldBase & CmsFieldSelect,
-  ];
+    } as CmsFieldBase & CmsFieldSelect)
+  }
 
   collection.fields = [...metaFields, ...(collection.fields || [])];
 

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

@@ -942,6 +942,7 @@ export class Backend {
     );
 
     const formatData = (data: string, path: string, newFile: boolean) => {
+      const path_type = prepareMetaPathType(slug, collection);
       const entry = createEntry(collection.get('name'), slug, path, {
         raw: data,
         isModification: !newFile,
@@ -950,7 +951,7 @@ export class Backend {
         updatedOn: entryData.updatedAt,
         author: entryData.pullRequestAuthor,
         status: entryData.status,
-        meta: { path: prepareMetaPath(path, collection) },
+        meta: { path: prepareMetaPath(path, collection), path_type },
       });
 
       const entryWithFormat = this.entryWithFormat(collection)(entry);
@@ -983,6 +984,9 @@ export class Backend {
       );
       entries = entries.filter(Boolean);
       const grouped = await groupEntries(collection, extension, entries as EntryValue[]);
+      if (grouped[0]?.srcSlug) {
+        grouped[0].slug = grouped[0].srcSlug;
+      }
       return grouped[0];
     } else {
       const entryWithFormat = await readAndFormatDataFile(dataFiles[0]);

packages/decap-cms-core/src/lib/i18n.ts

@@ -324,26 +324,35 @@ export function groupEntries(collection: Collection, extension: string, entries:
 
   const groupedEntries = Object.values(grouped).reduce((acc, values) => {
     const entryValue = mergeValues(collection, structure, defaultLocale, values);
+    if (values[0]?.value?.slug !== entryValue.slug) {
+      entryValue.srcSlug = values[0]?.value?.slug;
+    }
     return [...acc, entryValue];
   }, [] as EntryValue[]);
 
   return groupedEntries;
 }
 
+function compareFilePathEndings(path1: string, path2: string, subfolders = false) {
+  const [p1, p2] = [path1, path2].map(p => p.split('/'));
+  return subfolders ? p1.slice(-2).join('/') === p2.slice(-2).join('/') : p1.at(-1) === p2.at(-1);
+}
+
 export function getI18nDataFiles(
   collection: Collection,
   extension: string,
   path: string,
   slug: string,
-  diffFiles: { path: string; id: string; newFile: boolean }[],
+  diffFiles: { path: string; id: string; newFile: boolean; prevPath?: string }[],
 ) {
   const { structure } = getI18nInfo(collection) as I18nInfo;
   if (structure === I18N_STRUCTURE.SINGLE_FILE) {
     return diffFiles;
   }
   const paths = getFilePaths(collection, extension, path, slug);
+  const subfolders = collection.get('nested')?.get('subfolders') !== false;
   const dataFiles = paths.reduce((acc, path) => {
-    const dataFile = diffFiles.find(file => file.path === path);
+    const dataFile = diffFiles.find(file => compareFilePathEndings(file.path, path, subfolders));
     if (dataFile) {
       return [...acc, dataFile];
     } else {

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

@@ -218,6 +218,10 @@ export function selectCustomPath(collection, entryDraft, config) {
   const fileSlug = entryDraft.getIn(['entry', 'slug'])
     ? entryDraft.getIn(['entry', 'slug']).split('/').pop()
     : fileBaseName;
+  const subfolders = collection.get('nested')?.get('subfolders') !== false;
+  if (subfolders) {
+    return path && join(collection.get('folder'), path, `${indexFile}.${extension}`);
+  }
   const customPath =
     path &&
     join(

packages/decap-cms-core/src/valueObjects/Entry.ts

@@ -23,6 +23,7 @@ interface Options {
 export interface EntryValue {
   collection: string;
   slug: string;
+  srcSlug?: string;
   path: string;
   partial: boolean;
   raw: string;