From 97787741d731c10f56f5f7181a9c434675c9eec1 Mon Sep 17 00:00:00 2001 From: Daniel Lautzenheiser Date: Thu, 8 Sep 2022 22:00:00 -0400 Subject: [PATCH] Clean up after image widget experiments --- packages/netlify-cms-core/index.d.ts | 31 ------------------- .../Editor/EditorControlPane/EditorControl.js | 2 -- packages/netlify-cms-core/src/lib/registry.js | 12 ------- .../src/withFileControl.js | 4 --- 4 files changed, 49 deletions(-) diff --git a/packages/netlify-cms-core/index.d.ts b/packages/netlify-cms-core/index.d.ts index 03a92a77..42c689f2 100644 --- a/packages/netlify-cms-core/index.d.ts +++ b/packages/netlify-cms-core/index.d.ts @@ -528,36 +528,6 @@ declare module 'netlify-cms-core' { fileObj: File; }; - type DisplayURL = { id: string; path: string } | string; - - type EntryField = StaticallyTypedRecord<{ - field?: EntryField; - fields?: List; - types?: List; - widget: string; - name: string; - default: string | null | boolean | List; - media_folder?: string; - public_folder?: string; - comment?: string; - meta?: boolean; - i18n: 'translate' | 'duplicate' | 'none'; - }>; - - interface BackendMediaFile { - name: string; - id: string; - size?: number; - displayURL?: DisplayURL; - path: string; - draft?: boolean; - url?: string; - file?: File; - field?: EntryField; - } - - type MediaFile = BackendMediaFile & { key?: string }; - export type PreviewTemplateComponentProps = { entry: Map; collection: Map; @@ -579,7 +549,6 @@ declare module 'netlify-cms-core' { getRemarkPlugins: () => Array; getLocale: (locale: string) => CmsLocalePhrases | undefined; getMediaLibrary: (name: string) => CmsMediaLibrary | undefined; - selectMediaFiles: (field?: EntryField | undefined) => MediaFile[]; resolveWidget: (name: string) => CmsWidget | undefined; getPreviewStyles: () => PreviewStyle[]; getPreviewTemplate: (name: string) => ComponentType | undefined; diff --git a/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControl.js b/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControl.js index 995a63d1..6fc40985 100644 --- a/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControl.js +++ b/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControl.js @@ -222,8 +222,6 @@ class EditorControl extends React.Component { const childErrors = this.isAncestorOfFieldError(); const hasErrors = !!errors || childErrors; - console.log('[EditorControl] widgetName', widgetName, 'mediaPaths', mediaPaths); - return ( {({ css, cx }) => ( diff --git a/packages/netlify-cms-core/src/lib/registry.js b/packages/netlify-cms-core/src/lib/registry.js index 1ad7c9b0..3f27ddf1 100644 --- a/packages/netlify-cms-core/src/lib/registry.js +++ b/packages/netlify-cms-core/src/lib/registry.js @@ -3,8 +3,6 @@ import produce from 'immer'; import { oneLine } from 'common-tags'; import EditorComponent from '../valueObjects/EditorComponent'; -import { selectMediaFiles as selectMediaFilesSelector } from '../reducers/mediaLibrary'; -import { store } from '../redux'; const allowedEvents = [ 'prePublish', @@ -54,7 +52,6 @@ export default { getBackend, registerMediaLibrary, getMediaLibrary, - selectMediaFiles, registerLocale, getLocale, registerEventListener, @@ -227,15 +224,6 @@ export function getMediaLibrary(name) { return registry.mediaLibraries.find(ml => ml.name === name); } -export function selectMediaFiles(field) { - const state = store.getState(); - if (state) { - return selectMediaFilesSelector(state, field); - } - - return []; -} - export function getFiles(name) { return registry.mediaLibraries.find(ml => ml.name === name); } diff --git a/packages/netlify-cms-widget-file/src/withFileControl.js b/packages/netlify-cms-widget-file/src/withFileControl.js index c1f7eb56..215dcc28 100644 --- a/packages/netlify-cms-widget-file/src/withFileControl.js +++ b/packages/netlify-cms-widget-file/src/withFileControl.js @@ -195,8 +195,6 @@ export default function withFileControl({ forImage } = {}) { } shouldComponentUpdate(nextProps) { - console.log('[withFileControl][shouldComponentUpdate] nextProps', nextProps); - /** * Always update if the value or getAsset changes. */ @@ -219,8 +217,6 @@ export default function withFileControl({ forImage } = {}) { componentDidUpdate() { const { mediaPaths, value, onRemoveInsertedMedia, onChange } = this.props; const mediaPath = mediaPaths.get(this.controlID); - console.log('[withFileControl][shouldComponentUpdate] mediaPath', mediaPath); - console.log('[withFileControl][shouldComponentUpdate] value', value); if (mediaPath && mediaPath !== value) { onChange(mediaPath); } else if (mediaPath && mediaPath === value) {