decap-cms-core 3.12.0 → 3.14.0

package/src/components/Collection/__tests__/__snapshots__/NestedCollection.spec.js.snap

@@ -138,20 +138,6 @@ exports[`NestedCollection should render connected component 1`] = `
   margin-right: 4px;
 }
 
-.emotion-6 {
-  position: relative;
-  top: 2px;
-  color: #fff;
-  width: 0;
-  height: 0;
-  border: 5px solid transparent;
-  border-radius: 2px;
-  border-left: 6px solid currentColor;
-  border-right: 0;
-  color: currentColor;
-  left: 2px;
-}
-
 <a
     class="emotion-0 emotion-1"
     data-testid="/a"
@@ -169,9 +155,6 @@ exports[`NestedCollection should render connected component 1`] = `
       >
         File 1
       </div>
-      <div
-        class="emotion-6 emotion-7"
-      />
     </div>
   </a>
   .emotion-0 {
@@ -224,20 +207,6 @@ exports[`NestedCollection should render connected component 1`] = `
   margin-right: 4px;
 }
 
-.emotion-6 {
-  position: relative;
-  top: 2px;
-  color: #fff;
-  width: 0;
-  height: 0;
-  border: 5px solid transparent;
-  border-radius: 2px;
-  border-left: 6px solid currentColor;
-  border-right: 0;
-  color: currentColor;
-  left: 2px;
-}
-
 <a
     class="emotion-0 emotion-1"
     data-testid="/b"
@@ -255,9 +224,6 @@ exports[`NestedCollection should render connected component 1`] = `
       >
         File 2
       </div>
-      <div
-        class="emotion-6 emotion-7"
-      />
     </div>
   </a>
 </DocumentFragment>
@@ -401,20 +367,6 @@ exports[`NestedCollection should render correctly with nested entries 1`] = `
   margin-right: 4px;
 }
 
-.emotion-6 {
-  position: relative;
-  top: 2px;
-  color: #fff;
-  width: 0;
-  height: 0;
-  border: 5px solid transparent;
-  border-radius: 2px;
-  border-left: 6px solid currentColor;
-  border-right: 0;
-  color: currentColor;
-  left: 2px;
-}
-
 <a
     class="emotion-0 emotion-1"
     data-testid="/a"
@@ -432,9 +384,6 @@ exports[`NestedCollection should render correctly with nested entries 1`] = `
       >
         File 1
       </div>
-      <div
-        class="emotion-6 emotion-7"
-      />
     </div>
   </a>
   .emotion-0 {
@@ -487,20 +436,6 @@ exports[`NestedCollection should render correctly with nested entries 1`] = `
   margin-right: 4px;
 }
 
-.emotion-6 {
-  position: relative;
-  top: 2px;
-  color: #fff;
-  width: 0;
-  height: 0;
-  border: 5px solid transparent;
-  border-radius: 2px;
-  border-left: 6px solid currentColor;
-  border-right: 0;
-  color: currentColor;
-  left: 2px;
-}
-
 <a
     class="emotion-0 emotion-1"
     data-testid="/b"
@@ -518,9 +453,6 @@ exports[`NestedCollection should render correctly with nested entries 1`] = `
       >
         File 2
       </div>
-      <div
-        class="emotion-6 emotion-7"
-      />
     </div>
   </a>
 </DocumentFragment>

package/src/components/Editor/EditorPreviewPane/EditorPreviewPane.js

@@ -224,17 +224,18 @@ export class PreviewPane extends React.Component {
    * This function exists entirely to expose collections from outside of this entry
    *
    */
-  getCollection = async (collectionName, slug) => {
+  getCollection = async (collectionName, slugToLoad) => {
     const { state } = this.props;
     const selectedCollection = state.collections.get(collectionName);
 
-    if (typeof slug === 'undefined') {
+    if (typeof slugToLoad === 'undefined') {
       const entries = await getAllEntries(state, selectedCollection);
-      return entries.map(entry => Map().set('data', entry.data));
+
+      return entries.map(({ data, slug, path }) => Map({ data, slug, path }));
     }
 
-    const entry = await tryLoadEntry(state, selectedCollection, slug);
-    return Map().set('data', entry.data);
+    const { data, slug, path } = await tryLoadEntry(state, selectedCollection, slugToLoad);
+    return Map({ data, slug, path });
   };
 
   render() {

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

@@ -224,6 +224,7 @@ function getConfigSchema() {
                   file: { type: 'string' },
                   preview_path: { type: 'string' },
                   preview_path_date_field: { type: 'string' },
+                  preview_path_preserve_slashes: { type: 'boolean' },
                   fields: fieldsConfig(),
                 },
                 required: ['name', 'label', 'file', 'fields'],
@@ -236,6 +237,7 @@ function getConfigSchema() {
             path: { type: 'string' },
             preview_path: { type: 'string' },
             preview_path_date_field: { type: 'string' },
+            preview_path_preserve_slashes: { type: 'boolean' },
             create: { type: 'boolean' },
             publish: { type: 'boolean' },
             hide: { type: 'boolean' },
@@ -303,7 +305,7 @@ function getConfigSchema() {
                     widget: { type: 'string' },
                     index_file: { type: 'string' },
                   },
-                  required: ['label', 'widget', 'index_file'],
+                  required: ['label', 'widget'],
                 },
               },
               additionalProperties: false,