decap-cms-core 3.13.0 → 3.14.0

package/src/components/Editor/__tests__/__snapshots__/EditorToolbar.spec.js.snap

@@ -106,6 +106,7 @@ exports[`EditorToolbar should render normal save button 1`] = `
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  touch-action: manipulation;
   margin: 0 10px;
 }
 
@@ -127,6 +128,7 @@ exports[`EditorToolbar should render normal save button 1`] = `
   padding-left: 20px;
   padding-right: 40px;
   position: relative;
+  white-space: nowrap;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -245,15 +247,17 @@ exports[`EditorToolbar should render normal save button 1`] = `
           <div
             class="emotion-14 emotion-15 emotion-16"
           >
-            <span
-              aria-expanded="false"
-              aria-haspopup="true"
-              class="emotion-17 emotion-18"
-              role="button"
-              tabindex="0"
-            >
-              editor.editorToolbar.publish
-            </span>
+            <div>
+              <span
+                aria-expanded="false"
+                aria-haspopup="true"
+                class="emotion-17 emotion-18"
+                role="button"
+                tabindex="0"
+              >
+                editor.editorToolbar.publish
+              </span>
+            </div>
           </div>
         </div>
         <div>
@@ -383,6 +387,7 @@ exports[`EditorToolbar should render normal save button 2`] = `
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  touch-action: manipulation;
   margin: 0 10px;
 }
 
@@ -404,6 +409,7 @@ exports[`EditorToolbar should render normal save button 2`] = `
   padding-left: 20px;
   padding-right: 40px;
   position: relative;
+  white-space: nowrap;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -522,15 +528,17 @@ exports[`EditorToolbar should render normal save button 2`] = `
           <div
             class="emotion-14 emotion-15 emotion-16"
           >
-            <span
-              aria-expanded="false"
-              aria-haspopup="true"
-              class="emotion-17 emotion-18"
-              role="button"
-              tabindex="0"
-            >
-              editor.editorToolbar.publish
-            </span>
+            <div>
+              <span
+                aria-expanded="false"
+                aria-haspopup="true"
+                class="emotion-17 emotion-18"
+                role="button"
+                tabindex="0"
+              >
+                editor.editorToolbar.publish
+              </span>
+            </div>
           </div>
         </div>
         <div>
@@ -927,6 +935,7 @@ exports[`EditorToolbar should render with status=draft,useOpenAuthoring=false 1`
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  touch-action: manipulation;
   margin: 0 10px;
 }
 
@@ -948,6 +957,7 @@ exports[`EditorToolbar should render with status=draft,useOpenAuthoring=false 1`
   padding-left: 20px;
   padding-right: 40px;
   position: relative;
+  white-space: nowrap;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -1072,15 +1082,17 @@ exports[`EditorToolbar should render with status=draft,useOpenAuthoring=false 1`
         <div
           class="emotion-16 emotion-17 emotion-18"
         >
-          <span
-            aria-expanded="false"
-            aria-haspopup="true"
-            class="emotion-19 emotion-20"
-            role="button"
-            tabindex="0"
-          >
-            editor.editorToolbar.status
-          </span>
+          <div>
+            <span
+              aria-expanded="false"
+              aria-haspopup="true"
+              class="emotion-19 emotion-20"
+              role="button"
+              tabindex="0"
+            >
+              editor.editorToolbar.status
+            </span>
+          </div>
         </div>
         <button
           class="emotion-21 emotion-22"
@@ -1238,6 +1250,7 @@ exports[`EditorToolbar should render with status=draft,useOpenAuthoring=true 1`]
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  touch-action: manipulation;
   margin: 0 10px;
 }
 
@@ -1259,6 +1272,7 @@ exports[`EditorToolbar should render with status=draft,useOpenAuthoring=true 1`]
   padding-left: 20px;
   padding-right: 40px;
   position: relative;
+  white-space: nowrap;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -1417,15 +1431,17 @@ exports[`EditorToolbar should render with status=draft,useOpenAuthoring=true 1`]
         <div
           class="emotion-16 emotion-17 emotion-18"
         >
-          <span
-            aria-expanded="false"
-            aria-haspopup="true"
-            class="emotion-19 emotion-20"
-            role="button"
-            tabindex="0"
-          >
-            editor.editorToolbar.status
-          </span>
+          <div>
+            <span
+              aria-expanded="false"
+              aria-haspopup="true"
+              class="emotion-19 emotion-20"
+              role="button"
+              tabindex="0"
+            >
+              editor.editorToolbar.status
+            </span>
+          </div>
         </div>
         <div
           class="emotion-21 emotion-22"
@@ -1610,6 +1626,7 @@ exports[`EditorToolbar should render with status=pending_publish,useOpenAuthorin
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  touch-action: manipulation;
   margin: 0 10px;
 }
 
@@ -1631,6 +1648,7 @@ exports[`EditorToolbar should render with status=pending_publish,useOpenAuthorin
   padding-left: 20px;
   padding-right: 40px;
   position: relative;
+  white-space: nowrap;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -1755,15 +1773,17 @@ exports[`EditorToolbar should render with status=pending_publish,useOpenAuthorin
         <div
           class="emotion-16 emotion-17 emotion-18"
         >
-          <span
-            aria-expanded="false"
-            aria-haspopup="true"
-            class="emotion-19 emotion-20"
-            role="button"
-            tabindex="0"
-          >
-            editor.editorToolbar.status
-          </span>
+          <div>
+            <span
+              aria-expanded="false"
+              aria-haspopup="true"
+              class="emotion-19 emotion-20"
+              role="button"
+              tabindex="0"
+            >
+              editor.editorToolbar.status
+            </span>
+          </div>
         </div>
         <button
           class="emotion-21 emotion-22"
@@ -1921,6 +1941,7 @@ exports[`EditorToolbar should render with status=pending_publish,useOpenAuthorin
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  touch-action: manipulation;
   margin: 0 10px;
 }
 
@@ -1942,6 +1963,7 @@ exports[`EditorToolbar should render with status=pending_publish,useOpenAuthorin
   padding-left: 20px;
   padding-right: 40px;
   position: relative;
+  white-space: nowrap;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -2082,15 +2104,17 @@ exports[`EditorToolbar should render with status=pending_publish,useOpenAuthorin
         <div
           class="emotion-16 emotion-17 emotion-18"
         >
-          <span
-            aria-expanded="false"
-            aria-haspopup="true"
-            class="emotion-19 emotion-20"
-            role="button"
-            tabindex="0"
-          >
-            editor.editorToolbar.status
-          </span>
+          <div>
+            <span
+              aria-expanded="false"
+              aria-haspopup="true"
+              class="emotion-19 emotion-20"
+              role="button"
+              tabindex="0"
+            >
+              editor.editorToolbar.status
+            </span>
+          </div>
         </div>
         <div
           class="emotion-21 emotion-22"
@@ -2270,6 +2294,7 @@ exports[`EditorToolbar should render with status=pending_review,useOpenAuthoring
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  touch-action: manipulation;
   margin: 0 10px;
 }
 
@@ -2291,6 +2316,7 @@ exports[`EditorToolbar should render with status=pending_review,useOpenAuthoring
   padding-left: 20px;
   padding-right: 40px;
   position: relative;
+  white-space: nowrap;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -2415,15 +2441,17 @@ exports[`EditorToolbar should render with status=pending_review,useOpenAuthoring
         <div
           class="emotion-16 emotion-17 emotion-18"
         >
-          <span
-            aria-expanded="false"
-            aria-haspopup="true"
-            class="emotion-19 emotion-20"
-            role="button"
-            tabindex="0"
-          >
-            editor.editorToolbar.status
-          </span>
+          <div>
+            <span
+              aria-expanded="false"
+              aria-haspopup="true"
+              class="emotion-19 emotion-20"
+              role="button"
+              tabindex="0"
+            >
+              editor.editorToolbar.status
+            </span>
+          </div>
         </div>
         <button
           class="emotion-21 emotion-22"
@@ -2581,6 +2609,7 @@ exports[`EditorToolbar should render with status=pending_review,useOpenAuthoring
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  touch-action: manipulation;
   margin: 0 10px;
 }
 
@@ -2602,6 +2631,7 @@ exports[`EditorToolbar should render with status=pending_review,useOpenAuthoring
   padding-left: 20px;
   padding-right: 40px;
   position: relative;
+  white-space: nowrap;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -2760,15 +2790,17 @@ exports[`EditorToolbar should render with status=pending_review,useOpenAuthoring
         <div
           class="emotion-16 emotion-17 emotion-18"
         >
-          <span
-            aria-expanded="false"
-            aria-haspopup="true"
-            class="emotion-19 emotion-20"
-            role="button"
-            tabindex="0"
-          >
-            editor.editorToolbar.status
-          </span>
+          <div>
+            <span
+              aria-expanded="false"
+              aria-haspopup="true"
+              class="emotion-19 emotion-20"
+              role="button"
+              tabindex="0"
+            >
+              editor.editorToolbar.status
+            </span>
+          </div>
         </div>
         <div
           class="emotion-21 emotion-22"

package/src/components/UI/SettingsDropdown.js

@@ -3,7 +3,14 @@ import PropTypes from 'prop-types';
 import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 import { translate } from 'react-polyglot';
-import { Icon, Dropdown, DropdownItem, DropdownButton, colors } from 'decap-cms-ui-default';
+import {
+  Icon,
+  Dropdown,
+  DropdownItem,
+  DropdownButton,
+  colors,
+  shadows,
+} from 'decap-cms-ui-default';
 
 import { stripProtocol } from '../../lib/urlHelper';
 
@@ -33,18 +40,32 @@ const AvatarPlaceholderIcon = styled(Icon)`
   background-color: ${colors.textFieldBorder};
 `;
 
-const AppHeaderSiteLink = styled.a`
+const AppHeaderLink = css`
   font-size: 14px;
   font-weight: 400;
-  color: #7b8290;
+  color: ${colors.text};
   padding: 10px 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 `;
 
+const AppHeaderSiteLink = styled.a(AppHeaderLink);
+
 const AppHeaderTestRepoIndicator = styled.a`
-  font-size: 14px;
-  font-weight: 400;
-  color: #7b8290;
-  padding: 10px 16px;
+  ${AppHeaderLink};
+
+  @media (max-width: 399px) {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    font-size: 12px;
+    background-color: ${colors.background};
+    padding: 4px 12px;
+    border-radius: 0 0 4px 4px;
+    ${shadows.drop}
+  }
 `;
 
 function Avatar({ imageUrl }) {
@@ -59,9 +80,15 @@ Avatar.propTypes = {
   imageUrl: PropTypes.string,
 };
 
+const SettingsWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  min-width: 0;
+`;
+
 function SettingsDropdown({ displayUrl, isTestRepo, imageUrl, onLogoutClick, t }) {
   return (
-    <React.Fragment>
+    <SettingsWrapper>
       {isTestRepo && (
         <AppHeaderTestRepoIndicator
           href="https://www.decapcms.org/docs/test-backend"
@@ -88,7 +115,7 @@ function SettingsDropdown({ displayUrl, isTestRepo, imageUrl, onLogoutClick, t }
       >
         <DropdownItem label={t('ui.settingsDropdown.logOut')} onClick={onLogoutClick} />
       </Dropdown>
-    </React.Fragment>
+    </SettingsWrapper>
   );
 }
 

package/src/constants/__tests__/configSchema.spec.js

@@ -477,22 +477,25 @@ describe('config', () => {
           merge({}, validConfig, { collections: [{ meta: { path: { label: 'Label' } } }] }),
         );
       }).toThrowError("'collections[0].meta.path' must have required property 'widget'");
+    });
+
+    it('should allow collection meta to have a path configuration with index_file', () => {
       expect(() => {
         validateConfig(
           merge({}, validConfig, {
-            collections: [{ meta: { path: { label: 'Label', widget: 'widget' } } }],
+            collections: [
+              { meta: { path: { label: 'Path', widget: 'string', index_file: 'index' } } },
+            ],
           }),
         );
-      }).toThrowError("'collections[0].meta.path' must have required property 'index_file'");
+      }).not.toThrow();
     });
 
-    it('should allow collection meta to have a path configuration', () => {
+    it('should allow collection meta to have a path configuration without index_file', () => {
       expect(() => {
         validateConfig(
           merge({}, validConfig, {
-            collections: [
-              { meta: { path: { label: 'Path', widget: 'string', index_file: 'index' } } },
-            ],
+            collections: [{ meta: { path: { label: 'Path', widget: 'string' } } }],
           }),
         );
       }).not.toThrow();

package/src/constants/configSchema.js

@@ -305,7 +305,7 @@ function getConfigSchema() {
                     widget: { type: 'string' },
                     index_file: { type: 'string' },
                   },
-                  required: ['label', 'widget', 'index_file'],
+                  required: ['label', 'widget'],
                 },
               },
               additionalProperties: false,

package/src/lib/__tests__/formatters.spec.js

@@ -295,8 +295,8 @@ describe('formatters', () => {
   };
 
   describe('slugFormatter', () => {
-    const date = new Date('2020-01-01').valueOf();
-    Date.now = jest.spyOn(Date, 'now').mockImplementation(() => date);
+    const date = new Date('2020-01-01T13:28:27.679Z').valueOf();
+    jest.spyOn(Date, 'now').mockImplementation(() => date);
 
     const { selectIdentifier } = require('../../reducers/collections');
 
@@ -333,10 +333,22 @@ describe('formatters', () => {
       ).toBe('entry-slug');
     });
 
+    it('should allow filters in slug templates', () => {
+      selectIdentifier.mockReturnValueOnce('published');
+
+      expect(
+        slugFormatter(
+          Map({ slug: "{{published | date('MM-DD')}}" }),
+          Map({ title: 'Post Title', published: new Date(date) }),
+          slugConfig,
+        ),
+      ).toBe('01-01');
+    });
+
     it('should see date filters applied to date from entry if it exists', () => {
       const { selectInferredField } = require('../../reducers/collections');
       selectInferredField.mockReturnValue('date');
-      const entryDate = new Date('2026-10-20');
+      const entryDate = new Date('2026-10-20T13:28:27.679Z');
 
       expect(
         slugFormatter(
@@ -350,7 +362,7 @@ describe('formatters', () => {
     it('should see date filters applied to publishDate from entry if it exists', () => {
       const { selectInferredField } = require('../../reducers/collections');
       selectInferredField.mockReturnValue('publishDate');
-      const entryDate = new Date('2026-10-20');
+      const entryDate = new Date('2026-10-20T13:28:27.679Z');
 
       expect(
         slugFormatter(

package/src/lib/__tests__/registry.spec.js

@@ -200,7 +200,7 @@ describe('registry', () => {
         });
       });
 
-      it(`should return an updated entry's DataMap`, async () => {
+      it(`should return the complete updated entry object`, async () => {
         const { registerEventListener, invokeEvent } = require('../registry');
 
         const event = 'preSave';
@@ -233,7 +233,7 @@ describe('registry', () => {
         expect(handler1).toHaveBeenCalledWith(data, options);
         expect(handler2).toHaveBeenCalledWith(dataAfterFirstHandlerExecution, options);
 
-        expect(result).toEqual(dataAfterSecondHandlerExecution.entry.get('data'));
+        expect(result).toEqual(dataAfterSecondHandlerExecution.entry);
       });
 
       it('should allow multiple events to not return a value', async () => {
@@ -254,7 +254,7 @@ describe('registry', () => {
 
         expect(handler1).toHaveBeenCalledWith(data, options);
         expect(handler2).toHaveBeenCalledWith(data, options);
-        expect(result).toEqual(data.entry.get('data'));
+        expect(result).toEqual(data.entry);
       });
     });
   });

package/src/lib/registry.js

@@ -257,7 +257,10 @@ export async function invokeEvent({ name, data }) {
       _data = { ...data, entry };
     }
   }
-  return _data.entry.get('data');
+  // Return the full entry object with all metadata (slug, path, meta, etc.)
+  // rather than just the data payload. Callers like invokePreSaveEvent expect
+  // the complete entry object to be preserved through the event handler chain.
+  return _data.entry;
 }
 
 export function removeEventListener({ name, handler }) {

package/src/reducers/__tests__/entryDraft.spec.js

@@ -195,4 +195,121 @@ describe('entryDraft reducer', () => {
       });
     });
   });
+
+  describe('selectCustomPath', () => {
+    let selectCustomPath;
+    let selectHasMetaPath;
+    let selectFolderEntryExtension;
+
+    beforeEach(() => {
+      jest.resetModules();
+      selectHasMetaPath = jest.fn(
+        collection => collection.has('meta') && collection.get('meta').has('path'),
+      );
+      selectFolderEntryExtension = jest.fn(collection => collection.get('extension') || 'md');
+
+      jest.doMock('../collections', () => ({
+        selectHasMetaPath,
+        selectFolderEntryExtension,
+      }));
+
+      const entryDraftModule = require('../entryDraft');
+      selectCustomPath = entryDraftModule.selectCustomPath;
+    });
+
+    afterEach(() => {
+      jest.unmock('../collections');
+    });
+
+    it('should generate dynamic filename for new entries without index_file', () => {
+      const collection = fromJS({
+        folder: '_pages',
+        extension: 'md',
+        meta: { path: { label: 'Path', widget: 'string' } },
+      });
+      const entryDraft = fromJS({
+        entry: {
+          newRecord: true,
+          data: { title: 'My Great Article' },
+          meta: { path: 'blog' },
+        },
+      });
+
+      const result = selectCustomPath(collection, entryDraft);
+      expect(result).toBe('_pages/blog/my-great-article.md');
+    });
+
+    it('should preserve filename for existing entries without index_file', () => {
+      const collection = fromJS({
+        folder: '_pages',
+        extension: 'md',
+        meta: { path: { label: 'Path', widget: 'string' } },
+      });
+      const entryDraft = fromJS({
+        entry: {
+          newRecord: false,
+          path: '_pages/old-folder/existing-file.md',
+          data: { title: 'Updated Title' },
+          meta: { path: 'new-folder' },
+        },
+      });
+
+      const result = selectCustomPath(collection, entryDraft);
+      expect(result).toBe('_pages/new-folder/existing-file.md');
+    });
+
+    it('should use index_file when specified (backward compatibility)', () => {
+      const collection = fromJS({
+        folder: '_pages',
+        extension: 'md',
+        meta: { path: { label: 'Path', widget: 'string', index_file: 'index' } },
+      });
+      const entryDraft = fromJS({
+        entry: {
+          newRecord: true,
+          data: { title: 'My Article' },
+          meta: { path: 'blog' },
+        },
+      });
+
+      const result = selectCustomPath(collection, entryDraft);
+      expect(result).toBe('_pages/blog/index.md');
+    });
+
+    it('should return undefined when path is not set', () => {
+      const collection = fromJS({
+        folder: '_pages',
+        extension: 'md',
+        meta: { path: { label: 'Path', widget: 'string' } },
+      });
+      const entryDraft = fromJS({
+        entry: {
+          newRecord: true,
+          data: { title: 'My Article' },
+          meta: {},
+        },
+      });
+
+      const result = selectCustomPath(collection, entryDraft);
+      expect(result).toBeUndefined();
+    });
+
+    it('should preserve non-latin characters in generated filename', () => {
+      const collection = fromJS({
+        folder: '_pages',
+        extension: 'md',
+        meta: { path: { label: 'Path', widget: 'string' } },
+      });
+      const entryDraft = fromJS({
+        entry: {
+          newRecord: true,
+          data: { title: '日本語のタイトル' },
+          meta: { path: 'blog' },
+        },
+      });
+
+      const result = selectCustomPath(collection, entryDraft);
+      expect(result).toBe('_pages/blog/日本語のタイトル.md');
+    });
+  });
 });