decap-cms-core 3.14.0 → 3.16.0

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

@@ -3,7 +3,7 @@ import { Map, fromJS } from 'immutable';
 import * as actions from '../../actions/entries';
 import reducer from '../entryDraft';
 
-jest.mock('uuid', () => ({ v4: jest.fn(() => '1') }));
+global.crypto.randomUUID = jest.fn(() => '1');
 
 const initialState = Map({
   entry: Map(),

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

@@ -7,7 +7,6 @@ import mediaLibrary, {
   selectMediaDisplayURL,
 } from '../mediaLibrary';
 
-jest.mock('uuid');
 jest.mock('../entries');
 jest.mock('../');
 

package/src/reducers/entries.ts

@@ -474,14 +474,16 @@ function getGroup(entry: EntryMap, selectedGroup: GroupMap) {
   if (selectedGroup.has('pattern')) {
     const pattern = selectedGroup.get('pattern');
     let value = '';
-    try {
-      const regex = new RegExp(pattern);
-      const matched = dataAsString.match(regex);
-      if (matched) {
-        value = matched[0];
+    if (pattern !== undefined) {
+      try {
+        const regex = new RegExp(pattern);
+        const matched = dataAsString.match(regex);
+        if (matched) {
+          value = matched[0];
+        }
+      } catch (e) {
+        console.warn(`Invalid view group pattern '${pattern}' for field '${field}'`, e);
       }
-    } catch (e) {
-      console.warn(`Invalid view group pattern '${pattern}' for field '${field}'`, e);
     }
     return {
       id: `${label}${value}`,

package/src/reducers/entryDraft.js

@@ -1,5 +1,4 @@
 import { Map, List, fromJS } from 'immutable';
-import { v4 as uuid } from 'uuid';
 import get from 'lodash/get';
 import { join, basename } from 'path';
 
@@ -53,7 +52,7 @@ function entryDraftReducer(state = Map(), action) {
         state.set('fieldsMetaData', Map());
         state.set('fieldsErrors', Map());
         state.set('hasChanged', false);
-        state.set('key', uuid());
+        state.set('key', crypto.randomUUID());
       });
     case DRAFT_CREATE_EMPTY:
       // New Entry
@@ -63,7 +62,7 @@ function entryDraftReducer(state = Map(), action) {
         state.set('fieldsMetaData', Map());
         state.set('fieldsErrors', Map());
         state.set('hasChanged', false);
-        state.set('key', uuid());
+        state.set('key', crypto.randomUUID());
       });
     case DRAFT_CREATE_FROM_LOCAL_BACKUP:
       // Local Backup
@@ -76,7 +75,7 @@ function entryDraftReducer(state = Map(), action) {
         state.set('fieldsMetaData', Map());
         state.set('fieldsErrors', Map());
         state.set('hasChanged', true);
-        state.set('key', uuid());
+        state.set('key', crypto.randomUUID());
       });
     case DRAFT_CREATE_DUPLICATE_FROM_ENTRY:
       // Duplicate Entry

package/src/reducers/mediaLibrary.ts

@@ -1,5 +1,4 @@
 import { Map, List } from 'immutable';
-import { v4 as uuid } from 'uuid';
 import { dirname } from 'path';
 
 import {
@@ -150,7 +149,7 @@ function mediaLibrary(state = Map(defaultState), action: MediaLibraryAction) {
         return state;
       }
 
-      const filesWithKeys = files.map(file => ({ ...file, key: uuid() }));
+      const filesWithKeys = files.map(file => ({ ...file, key: crypto.randomUUID() }));
       return state.withMutations(map => {
         map.set('isLoading', false);
         map.set('isPaginating', false);
@@ -186,7 +185,7 @@ function mediaLibrary(state = Map(defaultState), action: MediaLibraryAction) {
         return state;
       }
       return state.withMutations(map => {
-        const fileWithKey = { ...file, key: uuid() };
+        const fileWithKey = { ...file, key: crypto.randomUUID() };
         const files = map.get('files') as MediaFile[];
         const updatedFiles = [fileWithKey, ...files];
         map.set('files', updatedFiles);

package/src/reducers/notifications.ts

@@ -1,5 +1,4 @@
 import { produce } from 'immer';
-import { v4 as uuid } from 'uuid';
 
 import {
   NOTIFICATION_SEND,
@@ -41,7 +40,7 @@ const notifications = produce((state: NotificationsState, action: NotificationsA
       state.notifications = [
         ...state.notifications,
         {
-          id: uuid(),
+          id: crypto.randomUUID(),
           ...(action.payload as NotificationPayload),
         },
       ];

package/src/types/redux.ts

@@ -72,7 +72,7 @@ export interface CmsFieldBase {
   label?: string;
   required?: boolean;
   hint?: string;
-  pattern?: [string, string];
+  pattern?: [string | RegExp, string];
   i18n?: boolean | 'translate' | 'duplicate' | 'none';
   media_folder?: string;
   public_folder?: string;
@@ -315,14 +315,14 @@ export interface CmsCollectionFile {
 export interface ViewFilter {
   label: string;
   field: string;
-  pattern: string;
+  pattern: string | boolean;
   id: string;
 }
 
 export interface ViewGroup {
   label: string;
   field: string;
-  pattern: string;
+  pattern?: string;
   id: string;
 }
 

package/src/lib/textHelper.js

@@ -1,11 +0,0 @@
-export function stringToRGB(str) {
-  if (!str) return '000000';
-  let hash = 0;
-  for (let i = 0; i < str.length; i++) {
-    hash = str.charCodeAt(i) + ((hash << 5) - hash);
-  }
-
-  const c = (hash & 0x00ffffff).toString(16).toUpperCase();
-
-  return `00000${c}`.slice(-6);
-}