refactor: remove immutable from 'config' state slice (#4960)

decaporg · Mar 11, 2021 · 6623740 · 6623740
1 parent 1336892
commit 6623740
Show file tree

Hide file tree

Showing 39 changed files with 487 additions and 450 deletions.
diff --git a/packages/netlify-cms-backend-gitlab/src/__tests__/gitlab.spec.js b/packages/netlify-cms-backend-gitlab/src/__tests__/gitlab.spec.js
@@ -175,7 +175,7 @@ describe('gitlab backend', () => {
       },
       {
         backendName: 'gitlab',
-        config: fromJS(config),
+        config,
         authStore,
       },
     );
@@ -401,7 +401,7 @@ describe('gitlab backend', () => {
 
       const entry = await backend.getEntry(
         {
-          config: fromJS({}),
+          config: {},
           integrations: fromJS([]),
           entryDraft: fromJS({}),
           mediaLibrary: fromJS({}),

diff --git a/packages/netlify-cms-core/index.d.ts b/packages/netlify-cms-core/index.d.ts
@@ -355,6 +355,14 @@ declare module 'netlify-cms-core' {
     cms_label_prefix?: string;
     squash_merges?: boolean;
     proxy_url?: string;
+    commit_messages?: {
+      create?: string;
+      update?: string;
+      delete?: string;
+      uploadMedia?: string;
+      deleteMedia?: string;
+      openAuthoring?: string;
+    };
   }
 
   export interface CmsSlug {
@@ -382,6 +390,14 @@ declare module 'netlify-cms-core' {
     media_library?: CmsMediaLibrary;
     publish_mode?: CmsPublishMode;
     load_config_file?: boolean;
+    integrations?: {
+      hooks: string[];
+      provider: string;
+      collections?: '*' | string[];
+      applicationID?: string;
+      apiKey?: string;
+      getSignedFormURL?: string;
+    }[];
     slug?: CmsSlug;
     i18n?: CmsI18nConfig;
     local_backend?: boolean | CmsLocalBackend;

diff --git a/packages/netlify-cms-core/src/__tests__/backend.spec.js b/packages/netlify-cms-core/src/__tests__/backend.spec.js
@@ -1,16 +1,15 @@
+import { Map, List, fromJS } from 'immutable';
 import {
   resolveBackend,
   Backend,
   extractSearchFields,
   expandSearchEntries,
   mergeExpandedEntries,
 } from '../backend';
-import registry from 'Lib/registry';
-import { FOLDER } from 'Constants/collectionTypes';
-import { Map, List, fromJS } from 'immutable';
-import { FILES } from '../constants/collectionTypes';
+import registry from '../lib/registry';
+import { FOLDER, FILES } from '../constants/collectionTypes';
 
-jest.mock('Lib/registry');
+jest.mock('../lib/registry');
 jest.mock('netlify-cms-lib-util');
 jest.mock('../lib/urlHelper');
 
@@ -22,13 +21,11 @@ describe('Backend', () => {
       registry.getBackend.mockReturnValue({
         init: jest.fn(),
       });
-      backend = resolveBackend(
-        Map({
-          backend: Map({
-            name: 'git-gateway',
-          }),
-        }),
-      );
+      backend = resolveBackend({
+        backend: {
+          name: 'git-gateway',
+        },
+      });
     });
 
     it('filters string values', () => {
@@ -133,9 +130,8 @@ describe('Backend', () => {
       const implementation = {
         init: jest.fn(() => implementation),
       };
-      const config = Map({});
 
-      const backend = new Backend(implementation, { config, backendName: 'github' });
+      const backend = new Backend(implementation, { config: {}, backendName: 'github' });
 
       const collection = Map({
         name: 'posts',
@@ -155,9 +151,7 @@ describe('Backend', () => {
       const implementation = {
         init: jest.fn(() => implementation),
       };
-      const config = Map({});
-
-      const backend = new Backend(implementation, { config, backendName: 'github' });
+      const backend = new Backend(implementation, { config: {}, backendName: 'github' });
 
       const collection = Map({
         name: 'posts',
@@ -177,9 +171,8 @@ describe('Backend', () => {
       const implementation = {
         init: jest.fn(() => implementation),
       };
-      const config = Map({});
 
-      const backend = new Backend(implementation, { config, backendName: 'github' });
+      const backend = new Backend(implementation, { config: {}, backendName: 'github' });
 
       const collection = Map({
         name: 'posts',
@@ -218,9 +211,8 @@ describe('Backend', () => {
       const implementation = {
         init: jest.fn(() => implementation),
       };
-      const config = Map({});
 
-      const backend = new Backend(implementation, { config, backendName: 'github' });
+      const backend = new Backend(implementation, { config: {}, backendName: 'github' });
 
       const collection = Map({
         name: 'posts',
@@ -268,9 +260,8 @@ describe('Backend', () => {
       const implementation = {
         init: jest.fn(() => implementation),
       };
-      const config = Map({});
 
-      const backend = new Backend(implementation, { config, backendName: 'github' });
+      const backend = new Backend(implementation, { config: {}, backendName: 'github' });
 
       backend.entryToRaw = jest.fn().mockReturnValue('');
 
@@ -295,9 +286,8 @@ describe('Backend', () => {
       const implementation = {
         init: jest.fn(() => implementation),
       };
-      const config = Map({});
 
-      const backend = new Backend(implementation, { config, backendName: 'github' });
+      const backend = new Backend(implementation, { config: {}, backendName: 'github' });
 
       backend.entryToRaw = jest.fn().mockReturnValue('content');
 
@@ -334,10 +324,10 @@ describe('Backend', () => {
         init: jest.fn(() => implementation),
         persistMedia: jest.fn().mockResolvedValue(persistMediaResult),
       };
-      const config = Map({});
+      const config = { backend: { name: 'github' } };
 
+      const backend = new Backend(implementation, { config, backendName: config.backend.name });
       const user = { login: 'login', name: 'name' };
-      const backend = new Backend(implementation, { config, backendName: 'github' });
       backend.currentUser = jest.fn().mockResolvedValue(user);
 
       const file = { path: 'static/media/image.png' };
@@ -365,7 +355,9 @@ describe('Backend', () => {
           .mockResolvedValueOnce('---\ntitle: "Hello World"\n---\n'),
         unpublishedEntryMediaFile: jest.fn().mockResolvedValueOnce({ id: '1' }),
       };
-      const config = Map({ media_folder: 'static/images' });
+      const config = {
+        media_folder: 'static/images',
+      };
 
       const backend = new Backend(implementation, { config, backendName: 'github' });
 
@@ -412,8 +404,6 @@ describe('Backend', () => {
       const { sanitizeSlug } = require('../lib/urlHelper');
       sanitizeSlug.mockReturnValue('some-post-title');
 
-      const config = Map({});
-
       const implementation = {
         init: jest.fn(() => implementation),
         getEntry: jest.fn(() => Promise.resolve()),
@@ -436,7 +426,7 @@ describe('Backend', () => {
         title: 'some post title',
       });
 
-      const backend = new Backend(implementation, { config, backendName: 'github' });
+      const backend = new Backend(implementation, { config: {}, backendName: 'github' });
 
       await expect(backend.generateUniqueSlug(collection, entry, Map({}), [])).resolves.toBe(
         'sub_dir/some-post-title',
@@ -448,8 +438,6 @@ describe('Backend', () => {
       sanitizeSlug.mockReturnValue('some-post-title');
       sanitizeChar.mockReturnValue('-');
 
-      const config = Map({});
-
       const implementation = {
         init: jest.fn(() => implementation),
         getEntry: jest.fn(),
@@ -475,7 +463,7 @@ describe('Backend', () => {
         title: 'some post title',
       });
 
-      const backend = new Backend(implementation, { config, backendName: 'github' });
+      const backend = new Backend(implementation, { config: {}, backendName: 'github' });
 
       await expect(backend.generateUniqueSlug(collection, entry, Map({}), [])).resolves.toBe(
         'sub_dir/some-post-title-1',
@@ -585,11 +573,10 @@ describe('Backend', () => {
     const implementation = {
       init: jest.fn(() => implementation),
     };
-    const config = Map({});
 
     let backend;
     beforeEach(() => {
-      backend = new Backend(implementation, { config, backendName: 'github' });
+      backend = new Backend(implementation, { config: {}, backendName: 'github' });
       backend.listAllEntries = jest.fn(collection => {
         if (collection.get('name') === 'posts') {
           return Promise.resolve(posts);

diff --git a/packages/netlify-cms-core/src/actions/__tests__/config.spec.js b/packages/netlify-cms-core/src/actions/__tests__/config.spec.js
@@ -1,5 +1,4 @@
 import { stripIndent } from 'common-tags';
-import { fromJS } from 'immutable';
 import {
   loadConfig,
   parseConfig,
@@ -932,13 +931,13 @@ describe('config', () => {
       expect(dispatch).toHaveBeenCalledWith({ type: 'CONFIG_REQUEST' });
       expect(dispatch).toHaveBeenCalledWith({
         type: 'CONFIG_SUCCESS',
-        payload: fromJS({
+        payload: {
           backend: { repo: 'test-repo' },
           collections: [],
           publish_mode: 'simple',
           slug: { encoding: 'unicode', clean_accents: false, sanitize_replacement: '-' },
           public_folder: '/',
-        }),
+        },
       });
     });
 
@@ -965,13 +964,13 @@ describe('config', () => {
       expect(dispatch).toHaveBeenCalledWith({ type: 'CONFIG_REQUEST' });
       expect(dispatch).toHaveBeenCalledWith({
         type: 'CONFIG_SUCCESS',
-        payload: fromJS({
+        payload: {
           backend: { repo: 'github' },
           collections: [],
           publish_mode: 'simple',
           slug: { encoding: 'unicode', clean_accents: false, sanitize_replacement: '-' },
           public_folder: '/',
-        }),
+        },
       });
     });
 

diff --git a/packages/netlify-cms-core/src/actions/__tests__/entries.spec.js b/packages/netlify-cms-core/src/actions/__tests__/entries.spec.js
@@ -395,13 +395,13 @@ describe('entries', () => {
 
   describe('validateMetaField', () => {
     const state = {
-      config: fromJS({
+      config: {
         slug: {
           encoding: 'unicode',
           clean_accents: false,
           sanitize_replacement: '-',
         },
-      }),
+      },
       entries: fromJS([]),
     };
     const collection = fromJS({

diff --git a/packages/netlify-cms-core/src/actions/__tests__/mediaLibrary.spec.js b/packages/netlify-cms-core/src/actions/__tests__/mediaLibrary.spec.js
@@ -3,7 +3,7 @@ import thunk from 'redux-thunk';
 import { List, Map } from 'immutable';
 import { insertMedia, persistMedia, deleteMedia } from '../mediaLibrary';
 
-jest.mock('coreSrc/backend');
+jest.mock('../../backend');
 jest.mock('../waitUntil');
 jest.mock('netlify-cms-lib-util', () => {
   const lib = jest.requireActual('netlify-cms-lib-util');
@@ -20,9 +20,9 @@ describe('mediaLibrary', () => {
   describe('insertMedia', () => {
     it('should return mediaPath as string when string is given', () => {
       const store = mockStore({
-        config: Map({
+        config: {
           public_folder: '/media',
-        }),
+        },
         collections: Map({
           posts: Map({ name: 'posts' }),
         }),
@@ -40,9 +40,9 @@ describe('mediaLibrary', () => {
 
     it('should return mediaPath as array of strings when array of strings is given', () => {
       const store = mockStore({
-        config: Map({
+        config: {
           public_folder: '/media',
-        }),
+        },
         collections: Map({
           posts: Map({ name: 'posts' }),
         }),
@@ -81,14 +81,14 @@ describe('mediaLibrary', () => {
       getBlobSHA.mockReturnValue('000000000000000');
 
       const store = mockStore({
-        config: Map({
+        config: {
           media_folder: 'static/media',
-          slug: Map({
+          slug: {
             encoding: 'unicode',
             clean_accents: false,
             sanitize_replacement: '-',
-          }),
-        }),
+          },
+        },
         collections: Map({
           posts: Map({ name: 'posts' }),
         }),
@@ -132,14 +132,14 @@ describe('mediaLibrary', () => {
 
     it('should persist media when not editing draft', () => {
       const store = mockStore({
-        config: Map({
+        config: {
           media_folder: 'static/media',
-          slug: Map({
+          slug: {
             encoding: 'unicode',
             clean_accents: false,
             sanitize_replacement: '-',
-          }),
-        }),
+          },
+        },
         collections: Map({
           posts: Map({ name: 'posts' }),
         }),
@@ -186,14 +186,14 @@ describe('mediaLibrary', () => {
 
     it('should sanitize media name if needed when persisting', () => {
       const store = mockStore({
-        config: Map({
+        config: {
           media_folder: 'static/media',
-          slug: Map({
+          slug: {
             encoding: 'ascii',
             clean_accents: true,
             sanitize_replacement: '_',
-          }),
-        }),
+          },
+        },
         collections: Map({
           posts: Map({ name: 'posts' }),
         }),
@@ -247,9 +247,9 @@ describe('mediaLibrary', () => {
 
     it('should delete non draft file', () => {
       const store = mockStore({
-        config: Map({
+        config: {
           publish_mode: 'editorial_workflow',
-        }),
+        },
         collections: Map(),
         integrations: Map(),
         mediaLibrary: Map({
@@ -290,9 +290,9 @@ describe('mediaLibrary', () => {
 
     it('should not delete a draft file', () => {
       const store = mockStore({
-        config: Map({
+        config: {
           publish_mode: 'editorial_workflow',
-        }),
+        },
         collections: Map(),
         integrations: Map(),
         mediaLibrary: Map({