decap-cms-core 3.8.1 → 3.10.0

package/src/reducers/collections.ts

@@ -412,23 +412,46 @@ export function selectDefaultSortableFields(
     defaultSortable = [COMMIT_DATE, ...defaultSortable];
   }
 
-  return defaultSortable as string[];
+  // Return as objects with field property
+  return defaultSortable.map(field => ({ field })) as {
+    field: string;
+    label?: string;
+    default_sort?: boolean | 'asc' | 'desc';
+  }[];
 }
 
 export function selectSortableFields(collection: Collection, t: (key: string) => string) {
   const fields = collection
     .get('sortable_fields')
     .toArray()
-    .map(key => {
+    .map(sortableField => {
+      // Extract the field name and custom label from the sortable field object
+      const key = sortableField.get('field');
+      const customLabel = sortableField.get('label');
+
       if (key === COMMIT_DATE) {
-        return { key, field: { name: key, label: t('collection.defaultFields.updatedOn.label') } };
+        const label = customLabel || t('collection.defaultFields.updatedOn.label');
+        return { key, field: { name: key, label } };
       }
       const field = selectField(collection, key);
       if (key === COMMIT_AUTHOR && !field) {
-        return { key, field: { name: key, label: t('collection.defaultFields.author.label') } };
+        const label = customLabel || t('collection.defaultFields.author.label');
+        return { key, field: { name: key, label } };
+      }
+
+      let fieldObj: Record<string, unknown> | undefined = field?.toJS();
+
+      // If custom label is provided, override the field's label
+      if (fieldObj && customLabel) {
+        fieldObj = { ...fieldObj, label: customLabel };
       }
 
-      return { key, field: field?.toJS() };
+      // If no label exists at all, use the field name
+      if (fieldObj && !fieldObj.label) {
+        fieldObj = { ...fieldObj, label: (fieldObj.name as string) || key };
+      }
+
+      return { key, field: fieldObj };
     })
     .filter(item => !!item.field)
     .map(item => ({ ...item.field, key: item.key }));
@@ -436,6 +459,30 @@ export function selectSortableFields(collection: Collection, t: (key: string) =>
   return fields;
 }
 
+export function selectDefaultSortField(collection: Collection) {
+  const sortableFields = collection.get('sortable_fields').toArray();
+  const defaultField = sortableFields.find(field => field.get('default_sort') !== undefined);
+
+  if (!defaultField) {
+    return null;
+  }
+
+  const fieldName = defaultField.get('field');
+  const defaultSortValue = defaultField.get('default_sort');
+
+  // Determine direction based on default_sort value
+  let direction;
+  if (defaultSortValue === true || defaultSortValue === 'asc') {
+    direction = 'asc';
+  } else if (defaultSortValue === 'desc') {
+    direction = 'desc';
+  } else {
+    direction = 'asc'; // fallback
+  }
+
+  return { field: fieldName, direction };
+}
+
 export function selectSortDataPath(collection: Collection, key: string) {
   if (key === COMMIT_DATE) {
     return 'updatedOn';

package/src/reducers/entries.ts

@@ -78,6 +78,14 @@ let slug: string;
 
 const storageSortKey = 'decap-cms.entries.sort';
 const viewStyleKey = 'decap-cms.entries.viewStyle';
+
+function normalizeDoubleSlashes(path: string) {
+  if (!path) {
+    return path;
+  }
+
+  return path.replace(/([^:]\/)\/+/g, '$1');
+}
 type StorageSortObject = SortObject & { index: number };
 type StorageSort = { [collection: string]: { [key: string]: StorageSortObject } };
 
@@ -532,8 +540,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 +758,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);
     }
   }
 
@@ -787,12 +793,14 @@ export function selectMediaFilePublicPath(
   }
 
   const name = 'public_folder';
-  let publicFolder = config[name]!;
+  let publicFolder = normalizeDoubleSlashes(config[name]!);
 
   const customFolder = hasCustomFolder(name, collection, entryMap?.get('slug'), field);
 
   if (customFolder) {
-    publicFolder = evaluateFolder(name, config, collection!, entryMap, field);
+    publicFolder = normalizeDoubleSlashes(
+      evaluateFolder(name, config, collection!, entryMap, field),
+    );
   }
 
   if (isAbsolutePath(publicFolder)) {

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;
@@ -307,6 +309,12 @@ export interface ViewGroup {
   id: string;
 }
 
+export interface SortableField {
+  field: string;
+  label?: string;
+  default_sort?: boolean | 'asc' | 'desc';
+}
+
 export interface CmsCollection {
   name: string;
   label: string;
@@ -346,7 +354,7 @@ export interface CmsCollection {
   path?: string;
   media_folder?: string;
   public_folder?: string;
-  sortable_fields?: string[];
+  sortable_fields?: (string | SortableField)[];
   view_filters?: ViewFilter[];
   view_groups?: ViewGroup[];
   i18n?: boolean | CmsI18nConfig;
@@ -354,7 +362,7 @@ export interface CmsCollection {
   /**
    * @deprecated Use sortable_fields instead
    */
-  sortableFields?: string[];
+  sortableFields?: (string | SortableField)[];
 }
 
 export interface CmsBackend {
@@ -633,7 +641,7 @@ type CollectionObject = {
   slug?: string;
   label_singular?: string;
   label: string;
-  sortable_fields: List<string>;
+  sortable_fields: List<StaticallyTypedRecord<SortableField>>;
   view_filters: List<StaticallyTypedRecord<ViewFilter>>;
   view_groups: List<StaticallyTypedRecord<ViewGroup>>;
   nested?: Nested;