Organise block utils

private/src/scripts/editor/blocks/blockquote/transforms.jsx

@@ -1,4 +1,4 @@
-import { versionCompare } from '../utils';
+import { versionCompare } from '../../utils';
 
 const { createBlock } = wp.blocks;
 

private/src/scripts/editor/blocks/columns/index.jsx

@@ -1,5 +1,6 @@
 import classNames from 'classnames';
 
+import { findBlockType } from '../../utils';
 import './row-column.jsx';
 import DisplayComponent from './DisplayComponent.jsx';
 
@@ -46,23 +47,6 @@ registerBlockType('amnesty-core/block-row', {
   ),
 });
 
-const findBlockType = (blocks, type) => {
-  let found = [];
-
-  // eslint-disable-next-line no-restricted-syntax
-  for (const block of blocks) {
-    if (block.name === type) {
-      found.push(block.clientId);
-    }
-
-    if (block.innerBlocks.length) {
-      found = [...found, ...findBlockType(block.innerBlocks, type)];
-    }
-  }
-
-  return found;
-};
-
 wp.domReady(() => {
   const select = wp.data.select('core/block-editor');
   const dispatch = wp.data.dispatch('core/block-editor');

private/src/scripts/editor/blocks/embed-flourish/DisplayComponent.jsx

@@ -1,4 +1,4 @@
-import { httpsOnly } from '../utils';
+import { httpsOnly } from '../../utils';
 
 const { delay } = lodash;
 const { Button, TextControl } = wp.components;

private/src/scripts/editor/blocks/embed-sutori/DisplayComponent.jsx

@@ -1,4 +1,4 @@
-import { httpsOnly } from '../utils';
+import { httpsOnly } from '../../utils';
 
 const { Button, TextControl } = wp.components;
 const { Fragment, useState } = wp.element;

private/src/scripts/editor/blocks/embed-tickcounter/DisplayComponent.jsx

@@ -1,4 +1,4 @@
-import { httpsOnly } from '../utils';
+import { httpsOnly } from '../../utils';
 
 const { BlockAlignmentToolbar, BlockControls } = wp.blockEditor;
 const { Placeholder, TextControl } = wp.components;

private/src/scripts/editor/blocks/hero/DisplayComponent.jsx

@@ -3,7 +3,7 @@ import BlockImageSelector from './components/BlockImageSelector.jsx';
 import MediaMetadata from '../../components/MediaMetadata.jsx';
 import MediaMetadataVisibilityControls from '../../components/MediaMetadataVisibilityControls.jsx';
 import PostFeaturedVideo from '../../components/PostFeaturedVideo.jsx';
-import { fetchMediaData } from '../utils';
+import { fetchMediaData } from '../../utils';
 
 const { InnerBlocks, InspectorControls, RichText, URLInputButton } = wp.blockEditor;
 const { PanelBody, SelectControl } = wp.components;

private/src/scripts/editor/blocks/hero/replaceHeaders.js

@@ -1,30 +1,8 @@
+import { findBlockType } from '../../utils';
+
 const { omit } = lodash;
 const { createBlock } = wp.blocks;
 
-/**
- * Recursively search blocks on page for a specific block type
- *
- * @param {Array} blocks the list of blocks to search
- * @param {String} type the block type to find
- *
- * @returns {Array}
- */
-const findBlockType = (blocks, type) => {
-  let found = [];
-
-  Array.from(blocks).forEach((block) => {
-    if (block.name === type) {
-      found.push(block.clientId);
-    }
-
-    if (block.innerBlocks.length) {
-      found = [...found, ...findBlockType(block.innerBlocks, type)];
-    }
-  });
-
-  return found;
-};
-
 const metaKeyToAttributeMap = {
   _hero_alignment: 'align',
   _hero_background: 'background',

private/src/scripts/editor/blocks/iframe-button/DisplayComponent.jsx

@@ -1,5 +1,5 @@
 import classnames from 'classnames';
-import { httpsOnly } from '../utils';
+import { httpsOnly } from '../../utils';
 
 const { BlockAlignmentToolbar, BlockControls, InspectorControls, RichText } = wp.blockEditor;
 const { Button, PanelBody, TextControl } = wp.components;

private/src/scripts/editor/blocks/iframe/DisplayComponent.jsx

@@ -1,4 +1,4 @@
-import { httpsOnly } from '../utils';
+import { httpsOnly } from '../../utils';
 
 const { InspectorControls, RichText, BlockControls, AlignmentToolbar } = wp.blockEditor;
 const { Button, PanelBody, Placeholder, TextControl } = wp.components;

private/src/scripts/editor/blocks/slider/DisplayComponent.jsx

@@ -1,6 +1,6 @@
 import classnames from 'classnames';
 import PostMediaSelector from '../../components/PostMediaSelector.jsx';
-import { randId } from '../utils';
+import { randId } from '../../utils';
 
 const { map, omit } = lodash;
 const { InspectorControls, RichText, URLInputButton } = wp.blockEditor;

private/src/scripts/editor/blocks/slider/build-slide-deprecated.jsx

@@ -1,5 +1,5 @@
 import classnames from 'classnames';
-import { brToP, trimBr } from '../utils';
+import { brToP, trimBr } from '../../utils';
 
 const { __ } = wp.i18n;
 

private/src/scripts/editor/blocks/slider/build-slide.jsx

@@ -1,5 +1,5 @@
 import classnames from 'classnames';
-import { brToP, trimBr } from '../utils';
+import { brToP, trimBr } from '../../utils';
 
 const { __ } = wp.i18n;
 

private/src/scripts/editor/blocks/slider/deprecated.jsx

@@ -1,6 +1,6 @@
 import classnames from 'classnames';
 import blockAttributes from './attributes';
-import { trimBr } from '../utils';
+import { trimBr } from '../../utils';
 import SlideBuilder from './build-slide.jsx';
 import buildSlideDeprecated from './build-slide-deprecated.jsx';
 

private/src/scripts/editor/plugins/pop-in/index.jsx

@@ -1,6 +1,6 @@
 import './block-restrictions';
 
-import { validateBool } from '../../blocks/utils';
+import { validateBool } from '../../utils';
 
 const { ToggleControl } = wp.components;
 const { compose, ifCondition } = wp.compose;

private/src/scripts/editor/utils/apis.js

@@ -0,0 +1,33 @@
+/* eslint-disable import/prefer-default-export */
+
+/**
+ * Retrieve media data and pass response to a callback
+ *
+ * @param {Number} id the media to fetch
+ * @param {Function} callback the callback to execute
+ * @param {Object} state previous data, if any
+ *
+ * @return {Promise}
+ */
+export function fetchMediaData(id, callback, state = {}) {
+  if (!id) {
+    return Promise.resolve(callback({}));
+  }
+
+  if (state?.id === id) {
+    return Promise.resolve(callback(state));
+  }
+
+  return wp
+    .apiFetch({
+      path: `/wp/v2/media/${id}?_fields=id,source_url,caption,description&context=edit`,
+    })
+    .then((media) =>
+      callback({
+        id: media.id,
+        url: media.source_url,
+        caption: media.caption.raw,
+        copyright: media.description.raw,
+      }),
+    );
+}