decap-cms-core 3.8.0 → 3.9.0

package/dist/esm/components/Editor/EditorNotesPane/NotesList.js

@@ -0,0 +1,54 @@
+import _styled from "@emotion/styled/base";
+function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringify object returned from `css` function. It isn't supposed to be used directly (e.g. as value of the `className` prop), but rather handed to emotion so it can handle it (e.g. as value of `css` prop)."; }
+import PropTypes from 'prop-types';
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import NoteItem from './NoteItem';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+const ListContainer = /*#__PURE__*/_styled("div", {
+  target: "etcnkr60",
+  label: "ListContainer"
+})(process.env.NODE_ENV === "production" ? {
+  name: "1cs7bse",
+  styles: "flex:1;overflow-y:auto;padding:8px"
+} : {
+  name: "1cs7bse",
+  styles: "flex:1;overflow-y:auto;padding:8px/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9jb21wb25lbnRzL0VkaXRvci9FZGl0b3JOb3Rlc1BhbmUvTm90ZXNMaXN0LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9nQyIsImZpbGUiOiIuLi8uLi8uLi8uLi8uLi9zcmMvY29tcG9uZW50cy9FZGl0b3IvRWRpdG9yTm90ZXNQYW5lL05vdGVzTGlzdC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBQcm9wVHlwZXMgZnJvbSAncHJvcC10eXBlcyc7XG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuaW1wb3J0IEltbXV0YWJsZVByb3BUeXBlcyBmcm9tICdyZWFjdC1pbW11dGFibGUtcHJvcHR5cGVzJztcbmltcG9ydCBzdHlsZWQgZnJvbSAnQGVtb3Rpb24vc3R5bGVkJztcblxuaW1wb3J0IE5vdGVJdGVtIGZyb20gJy4vTm90ZUl0ZW0nO1xuXG5jb25zdCBMaXN0Q29udGFpbmVyID0gc3R5bGVkLmRpdmBcbiAgZmxleDogMTtcbiAgb3ZlcmZsb3cteTogYXV0bztcbiAgcGFkZGluZzogOHB4O1xuYDtcblxuZnVuY3Rpb24gTm90ZXNMaXN0KHsgbm90ZXMsIG9uVXBkYXRlLCBvbkRlbGV0ZSwgb25Ub2dnbGVSZXNvbHV0aW9uLCB1c2VyLCB0IH0pIHtcbiAgLy8gU29ydCBub3RlczogdW5yZXNvbHZlZCBmaXJzdCwgdGhlbiBieSBuZXdlc3RcbiAgY29uc3Qgc29ydGVkTm90ZXMgPSBub3Rlcy5zb3J0KChhLCBiKSA9PiB7XG4gICAgLy8gRmlyc3Qgc29ydCBieSByZXNvbHZlZCBzdGF0dXMgKHVucmVzb2x2ZWQgZmlyc3QpXG4gICAgaWYgKGEuZ2V0KCdyZXNvbHZlZCcpICE9PSBiLmdldCgncmVzb2x2ZWQnKSkge1xuICAgICAgcmV0dXJuIGEuZ2V0KCdyZXNvbHZlZCcpID8gMSA6IC0xO1xuICAgIH1cbiAgICAvLyBUaGVuIHNvcnQgYnkgdGltZXN0YW1wIChuZXdlc3QgZmlyc3QpXG4gICAgcmV0dXJuIG5ldyBEYXRlKGIuZ2V0KCd0aW1lc3RhbXAnKSkgLSBuZXcgRGF0ZShhLmdldCgndGltZXN0YW1wJykpO1xuICB9KTtcblxuICByZXR1cm4gKFxuICAgIDxMaXN0Q29udGFpbmVyPlxuICAgICAge3NvcnRlZE5vdGVzLm1hcChub3RlID0+IChcbiAgICAgICAgPE5vdGVJdGVtXG4gICAgICAgICAga2V5PXtub3RlLmdldCgnaWQnKX1cbiAgICAgICAgICBub3RlPXtub3RlfVxuICAgICAgICAgIG9uVXBkYXRlPXtvblVwZGF0ZX1cbiAgICAgICAgICBvbkRlbGV0ZT17b25EZWxldGV9XG4gICAgICAgICAgb25Ub2dnbGVSZXNvbHV0aW9uPXtvblRvZ2dsZVJlc29sdXRpb259XG4gICAgICAgICAgdXNlcj17dXNlcn1cbiAgICAgICAgICB0PXt0fVxuICAgICAgICAvPlxuICAgICAgKSl9XG4gICAgPC9MaXN0Q29udGFpbmVyPlxuICApO1xufVxuXG5Ob3Rlc0xpc3QucHJvcFR5cGVzID0ge1xuICBub3RlczogSW1tdXRhYmxlUHJvcFR5cGVzLmxpc3QuaXNSZXF1aXJlZCxcbiAgb25VcGRhdGU6IFByb3BUeXBlcy5mdW5jLmlzUmVxdWlyZWQsXG4gIG9uRGVsZXRlOiBQcm9wVHlwZXMuZnVuYy5pc1JlcXVpcmVkLFxuICBvblRvZ2dsZVJlc29sdXRpb246IFByb3BUeXBlcy5mdW5jLmlzUmVxdWlyZWQsXG4gIHVzZXI6IFByb3BUeXBlcy5vYmplY3QsXG4gIHQ6IFByb3BUeXBlcy5mdW5jLmlzUmVxdWlyZWQsXG59O1xuXG5leHBvcnQgZGVmYXVsdCBOb3Rlc0xpc3Q7XG4iXX0= */",
+  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+});
+function NotesList({
+  notes,
+  onUpdate,
+  onDelete,
+  onToggleResolution,
+  user,
+  t
+}) {
+  // Sort notes: unresolved first, then by newest
+  const sortedNotes = notes.sort((a, b) => {
+    // First sort by resolved status (unresolved first)
+    if (a.get('resolved') !== b.get('resolved')) {
+      return a.get('resolved') ? 1 : -1;
+    }
+    // Then sort by timestamp (newest first)
+    return new Date(b.get('timestamp')) - new Date(a.get('timestamp'));
+  });
+  return ___EmotionJSX(ListContainer, null, sortedNotes.map(note => ___EmotionJSX(NoteItem, {
+    key: note.get('id'),
+    note: note,
+    onUpdate: onUpdate,
+    onDelete: onDelete,
+    onToggleResolution: onToggleResolution,
+    user: user,
+    t: t
+  })));
+}
+NotesList.propTypes = {
+  notes: ImmutablePropTypes.list.isRequired,
+  onUpdate: PropTypes.func.isRequired,
+  onDelete: PropTypes.func.isRequired,
+  onToggleResolution: PropTypes.func.isRequired,
+  user: PropTypes.object,
+  t: PropTypes.func.isRequired
+};
+export default NotesList;

package/dist/esm/components/UI/ErrorBoundary.js

@@ -44,8 +44,8 @@ function buildIssueTemplate({
   let version = '';
   if (typeof DECAP_CMS_VERSION === 'string') {
     version = `decap-cms@${DECAP_CMS_VERSION}`;
-  } else if (typeof "3.8.0" === 'string') {
-    version = `decap-cms-app@${"3.8.0"}`;
+  } else if (typeof "3.8.4" === 'string') {
+    version = `decap-cms-app@${"3.8.4"}`;
   }
   const template = getIssueTemplate({
     version,

package/dist/esm/reducers/entries.js

@@ -429,7 +429,6 @@ export function selectEntriesLoaded(state, collection) {
 export function selectIsFetching(state, collection) {
   return state.getIn(['pages', collection, 'isFetching'], false);
 }
-const DRAFT_MEDIA_FILES = 'DRAFT_MEDIA_FILES';
 function getFileField(collectionFiles, slug) {
   const file = collectionFiles.find(f => f?.get('name') === slug);
   return file;
@@ -528,7 +527,7 @@ export function selectMediaFolder(config, collection, entryMap, field) {
       mediaFolder = join(folder);
     } else {
       const entryPath = entryMap?.get('path');
-      mediaFolder = entryPath ? join(dirname(entryPath), folder) : join(collection.get('folder'), DRAFT_MEDIA_FILES);
+      mediaFolder = entryPath ? join(dirname(entryPath), folder) : collection.get('folder');
     }
   }
   return trim(mediaFolder, '/');

package/index.d.ts

@@ -133,6 +133,8 @@ declare module 'decap-cms-core' {
     default?: any;
 
     allow_add?: boolean;
+    allow_remove?: boolean;
+    allow_reorder?: boolean;
     collapsed?: boolean;
     summary?: string;
     minimize_collapsed?: boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-core",
   "description": "Decap CMS core application, see decap-cms package for the main distribution.",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-core",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "module": "dist/esm/index.js",
@@ -100,5 +100,5 @@
   "browser": {
     "path": "path-browserify"
   },
-  "gitHead": "d3465f53b7f056ad5d872948a07eaa8e4ae63315"
+  "gitHead": "13afe6686b32f7c03b4819d343d787c63f13664f"
 }

package/src/components/Collection/Entries/EntriesSearch.js

@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import isEqual from 'lodash/isEqual';
 import { Cursor } from 'decap-cms-lib-util';
 
-import { selectSearchedEntries } from '../../../reducers';
+import { selectSearchedEntries, selectUnpublishedEntry } from '../../../reducers';
 import {
   searchEntries as actionSearchEntries,
   clearSearch as actionClearSearch,
@@ -22,6 +22,7 @@ class EntriesSearch extends React.Component {
     collectionNames: PropTypes.array,
     entries: ImmutablePropTypes.list,
     page: PropTypes.number,
+    getWorkflowStatus: PropTypes.func,
   };
 
   componentDidMount() {
@@ -63,7 +64,7 @@ class EntriesSearch extends React.Component {
   };
 
   render() {
-    const { collections, entries, isFetching } = this.props;
+    const { collections, entries, isFetching, getWorkflowStatus } = this.props;
     return (
       <Entries
         cursor={this.getCursor()}
@@ -71,6 +72,7 @@ class EntriesSearch extends React.Component {
         collections={collections}
         entries={entries}
         isFetching={isFetching}
+        getWorkflowStatus={getWorkflowStatus}
       />
     );
   }
@@ -83,7 +85,13 @@ function mapStateToProps(state, ownProps) {
   const isFetching = state.search.isFetching;
   const page = state.search.page;
   const entries = selectSearchedEntries(state, collectionNames);
-  return { isFetching, page, collections, collectionNames, entries, searchTerm };
+
+  function getWorkflowStatus(collectionName, slug) {
+    const unpublishedEntry = selectUnpublishedEntry(state, collectionName, slug);
+    return unpublishedEntry ? unpublishedEntry.get('status') : null;
+  }
+
+  return { isFetching, page, collections, collectionNames, entries, searchTerm, getWorkflowStatus };
 }
 
 const mapDispatchToProps = {

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

@@ -85,7 +85,7 @@ 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' },
@@ -93,7 +93,7 @@ describe('entries', () => {
           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', () => {

package/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);
     }
   }
 

package/src/types/redux.ts

@@ -148,6 +148,8 @@ export interface CmsFieldList {
   default?: unknown;
 
   allow_add?: boolean;
+  allow_remove?: boolean;
+  allow_reorder?: boolean;
   collapsed?: boolean;
   summary?: string;
   minimize_collapsed?: boolean;