Merge branch 'decaporg:main' into add-multiple-filter-values

Author: paulroub

packages/decap-cms-core/src/reducers/__tests__/entries.spec.js

@@ -85,15 +85,15 @@ describe('entries', () => {
       ).toEqual('static/media');
     });
 
-    it('should return draft media folder when collection specifies media_folder and entry is undefined', () => {
+    it('should return collection folder when collection specifies media_folder and entry is undefined', () => {
       expect(
         selectMediaFolder(
           { media_folder: 'static/media' },
           fromJS({ name: 'posts', folder: 'posts', media_folder: '' }),
           undefined,
           undefined,
         ),
-      ).toEqual('posts/DRAFT_MEDIA_FILES');
+      ).toEqual('posts');
     });
 
     it('should return relative media folder when collection specifies media_folder and entry path is not null', () => {
@@ -364,7 +364,7 @@ describe('entries', () => {
           'image.png',
           undefined,
         ),
-      ).toBe('posts/DRAFT_MEDIA_FILES/image.png');
+      ).toBe('posts/image.png');
     });
 
     it('should handle relative media_folder', () => {

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

@@ -532,8 +532,6 @@ export function selectIsFetching(state: Entries, collection: string) {
   return state.getIn(['pages', collection, 'isFetching'], false);
 }
 
-const DRAFT_MEDIA_FILES = 'DRAFT_MEDIA_FILES';
-
 function getFileField(collectionFiles: CollectionFiles, slug: string | undefined) {
   const file = collectionFiles.find(f => f?.get('name') === slug);
   return file;
@@ -752,7 +750,7 @@ export function selectMediaFolder(
       const entryPath = entryMap?.get('path');
       mediaFolder = entryPath
         ? join(dirname(entryPath), folder)
-        : join(collection!.get('folder') as string, DRAFT_MEDIA_FILES);
+        : (collection!.get('folder') as string);
     }
   }