From 8350ee6c04a1e02f0156b2147f966b3d8a6b26f8 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Sun, 29 Dec 2019 19:21:56 -0600
Subject: [PATCH] Add a function to save a new field value

Also, add a unit test for that.
@todo: test the 'happy path' of that function.
---
 js/src/block-lab-editor/components/editor.js  |  2 +-
 .../block-lab-editor/components/field-edit.js | 33 +++++---
 js/src/block-lab-editor/components/field.js   |  4 +-
 .../helpers/saveFieldValue.js                 | 40 ++++++++++
 .../helpers/test/saveFieldValue.js            | 21 +++++
 package.json                                  |  2 +-
 php/blocks/class-loader.php                   |  6 ++
 tests/js/setup-globals.js                     | 16 +++-
 webpack.config.js                             | 78 ++++++++-----------
 9 files changed, 139 insertions(+), 63 deletions(-)
 create mode 100644 js/src/block-lab-editor/helpers/saveFieldValue.js
 create mode 100644 js/src/block-lab-editor/helpers/test/saveFieldValue.js

diff --git a/js/src/block-lab-editor/components/editor.js b/js/src/block-lab-editor/components/editor.js
index 7add21c54..5929c239f 100644
--- a/js/src/block-lab-editor/components/editor.js
+++ b/js/src/block-lab-editor/components/editor.js
@@ -40,7 +40,7 @@ class Editor extends Component {
 					<div className="fields">
 						{
 							!! fields && Object.values( fields ).map( ( field, index ) => {
-								return <Field field={ field } uid={ index } key={ `field-row-${ index }` } />;
+								return <Field field={ field } uiud={ index } key={ `field-row-${ index }` } />;
 							} )
 						}
 						<div className="add-field-container">
diff --git a/js/src/block-lab-editor/components/field-edit.js b/js/src/block-lab-editor/components/field-edit.js
index 0cea090f4..7cfc7e79d 100644
--- a/js/src/block-lab-editor/components/field-edit.js
+++ b/js/src/block-lab-editor/components/field-edit.js
@@ -6,16 +6,21 @@ const { Button, TextControl } = wp.components;
 const { Component } = wp.element;
 
 /**
- * A field row.
+ * Internal dependencies
+ */
+import saveFieldValue from '../helpers/saveFieldValue';
+
+/**
+ * A field's editing section.
  */
 class FieldEdit extends Component {
 	/**
-	 * Renders the field row.
+	 * Renders the field's editing section.
 	 *
 	 * @return {Function} The rendered component.
 	 */
 	render() {
-		const { field, uid } = this.props;
+		const { field, uiud } = this.props;
 		const isFieldDisabled = false;
 
 		return (
@@ -24,7 +29,7 @@ class FieldEdit extends Component {
 					<tr className="block-fields-edit-label">
 						<td className="spacer"></td>
 						<th scope="row">
-							<label htmlFor={ `block-fields-edit-label-input_${ uid } ` }>
+							<label htmlFor={ `block-fields-edit-label-input_${ uiud } ` }>
 								{ __( 'Field Label', 'block-lab' ) }
 							</label>
 							<p className="description">
@@ -34,10 +39,13 @@ class FieldEdit extends Component {
 						<td>
 							<TextControl
 								type="text"
-								id={ `block-fields-edit-label-input_${ uid }` }
+								id={ `block-fields-edit-label-input_${ uiud }` }
 								className="regular-text"
 								value={ field.label }
-								data-sync={ `block-fields-label_${ uid }` }
+								onChange={ ( newValue ) => {
+									saveFieldValue( field.name, 'label', newValue );
+								} }
+								data-sync={ `block-fields-label_${ uiud }` }
 								readOnly={ isFieldDisabled }
 							/>
 						</td>
@@ -45,7 +53,7 @@ class FieldEdit extends Component {
 					<tr className="block-fields-edit-name">
 						<td className="spacer"></td>
 						<th scope="row">
-							<label id={ `block-fields-edit-name-${ uid }` } htmlFor={ `block-fields-edit-name-input_${ uid }` }>
+							<label id={ `block-fields-edit-name-${ uiud }` } htmlFor={ `block-fields-edit-name-input_${ uiud }` }>
 								{ __( 'Field Name', 'block-lab' ) }
 							</label>
 							<p className="description">
@@ -54,9 +62,12 @@ class FieldEdit extends Component {
 						</th>
 						<td>
 							<TextControl
-								id={ `block-fields-edit-name-input_${ uid }` }
+								id={ `block-fields-edit-name-input_${ uiud }` }
 								className="regular-text"
 								value={ field.name }
+								onChange={ ( newValue ) => {
+									saveFieldValue( field.name, 'name', newValue );
+								} }
 								data-sync="block-fields-name-code"
 								readOnly={ isFieldDisabled }
 							/>
@@ -65,14 +76,14 @@ class FieldEdit extends Component {
 					<tr className="block-fields-edit-control">
 						<td className="spacer"></td>
 						<th scope="row">
-							<label htmlFor={ `block-fields-edit-control-input_${ uid }` }>
+							<label htmlFor={ `block-fields-edit-control-input_${ uiud }` }>
 								{ __( 'Field Type', 'block-lab' ) }
 							</label>
 						</th>
 						<td>
 							<select
-								id={ `block-fields-edit-control-input_${ uid }` }
-								data-sync={ `block-fields-control_${ uid }` }
+								id={ `block-fields-edit-control-input_${ uiud }` }
+								data-sync={ `block-fields-control_${ uiud }` }
 								disabled={ isFieldDisabled }
 							>
 								{
diff --git a/js/src/block-lab-editor/components/field.js b/js/src/block-lab-editor/components/field.js
index 15c4a3860..8897202c0 100644
--- a/js/src/block-lab-editor/components/field.js
+++ b/js/src/block-lab-editor/components/field.js
@@ -18,7 +18,7 @@ class Field extends Component {
 	 * @return {Function} The rendered component.
 	 */
 	render() {
-		const { field } = this.props;
+		const { field, uiud } = this.props;
 
 		return (
 			<div className="field">
@@ -44,7 +44,7 @@ class Field extends Component {
 						</svg>
 					</div>
 				</div>
-				<FieldEdit field={ field } />
+				<FieldEdit field={ field } uiud={ uiud } />
 			</div>
 		);
 	}
diff --git a/js/src/block-lab-editor/helpers/saveFieldValue.js b/js/src/block-lab-editor/helpers/saveFieldValue.js
new file mode 100644
index 000000000..718af57e9
--- /dev/null
+++ b/js/src/block-lab-editor/helpers/saveFieldValue.js
@@ -0,0 +1,40 @@
+/**
+ * WordPress dependencies
+ */
+const { dispatch, select } = wp.data;
+
+/**
+ * Internal dependencies
+ */
+import getBlockFromContent from './getBlockFromContent';
+
+/**
+ * Parses the block from the post content into an object.
+ *
+ * @param {string} fieldSlug The slug of the field.
+ * @param {string} key The key of the field value to change, like 'label'.
+ * @param {string} value The new field value.
+ * @return {boolean} Whether saving the field value succeeded.
+ */
+const saveFieldValue = ( fieldSlug, key, value ) => {
+	if ( ! fieldSlug ) {
+		return false;
+	}
+
+	const content = select( 'core/editor' ).getEditedPostContent();
+	const block = getBlockFromContent( content ) || {};
+	if ( ! block.hasOwnProperty( 'fields' ) ) {
+		block.fields = {};
+	}
+
+	if ( ! block.fields.hasOwnProperty( fieldSlug ) || 'object' !== typeof block.fields[ fieldSlug ] ) {
+		return false;
+	}
+
+	block.fields[ fieldSlug ][ key ] = value;
+	dispatch( 'core/editor' ).editPost( { content: JSON.stringify( [ block ] ) } );
+	dispatch( 'core/block-editor' ).resetBlocks( [] ); // Prevent the block editor from overwriting the saved content.
+	return true;
+};
+
+export default saveFieldValue;
diff --git a/js/src/block-lab-editor/helpers/test/saveFieldValue.js b/js/src/block-lab-editor/helpers/test/saveFieldValue.js
new file mode 100644
index 000000000..ccec10b08
--- /dev/null
+++ b/js/src/block-lab-editor/helpers/test/saveFieldValue.js
@@ -0,0 +1,21 @@
+/**
+ * Internal dependencies
+ */
+import saveFieldValue from '../saveFieldValue';
+
+describe( 'saveFieldValue', () => {
+	it( 'should not update the post if the field argument is an empty string', () => {
+		saveFieldValue( '', 'example-email', 'you@example.com' );
+		expect( global.wp.data.dispatch( 'core/editor' ).editPost ).toHaveBeenCalledTimes( 0 );
+	} );
+
+	it( 'should not attempt to update the post if there is no fields index', () => {
+		saveFieldValue( 'real-field-slug', 'example-email', 'you@example.com' );
+		expect( global.wp.data.dispatch( 'core/editor' ).editPost ).toHaveBeenCalledTimes( 0 );
+	} );
+
+	it( 'should not update the post if the field does not exist yet', () => {
+		saveFieldValue( 'real-field-slug', 'example-email', 'you@example.com' );
+		expect( global.wp.data.dispatch( 'core/editor' ).editPost ).toHaveBeenCalledTimes( 0 );
+	} );
+} );
diff --git a/package.json b/package.json
index 56351a9ef..301fb05e5 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "url": "https://github.com/getblocklab/block-lab"
   },
   "scripts": {
-    "dev": "cross-env BABEL_ENV=default webpack --watch",
+    "dev": "wp-scripts start",
     "build": "cross-env BABEL_ENV=default NODE_ENV=production webpack",
     "lint": "npm-run-all --parallel lint:*",
     "lint:js": "eslint js",
diff --git a/php/blocks/class-loader.php b/php/blocks/class-loader.php
index 3744439bb..045b2c04d 100644
--- a/php/blocks/class-loader.php
+++ b/php/blocks/class-loader.php
@@ -132,6 +132,12 @@ protected function get_callback( $method_name ) {
 	 * Launch the blocks inside Gutenberg.
 	 */
 	protected function editor_assets() {
+		// There's no need to for these assets on the Block Lab block editor (the 'Edit Block' UI).
+		$screen = get_current_screen();
+		if ( is_object( $screen ) && block_lab()->get_post_type_slug() === $screen->post_type ) {
+			return;
+		}
+
 		wp_enqueue_script(
 			'block-lab-blocks',
 			$this->assets['url']['entry'],
diff --git a/tests/js/setup-globals.js b/tests/js/setup-globals.js
index 580eff218..81fe266d2 100644
--- a/tests/js/setup-globals.js
+++ b/tests/js/setup-globals.js
@@ -1,5 +1,19 @@
 // Mock wp object.
 
 global.wp = {
-	blocks: { registerBlockType: jest.fn() },
+	blocks: {
+		registerBlockType: jest.fn(),
+	},
+	data: {
+		dispatch: ( store ) => {
+			if ( 'core/editor' === store ) {
+				return { editPost: jest.fn() };
+			}
+		},
+		select: ( store ) => {
+			if ( 'core/editor' === store ) {
+				return { getEditedPostContent: jest.fn() };
+			}
+		},
+	}
 };
diff --git a/webpack.config.js b/webpack.config.js
index 3b2f14fd7..3855cddb6 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,52 +1,20 @@
 const path = require( 'path' );
-const ExtractTextPlugin = require( 'extract-text-webpack-plugin' );
-const UglifyJSPlugin = require( 'uglifyjs-webpack-plugin' );
-
-// Set different CSS extraction for editor only and common block styles
-const blocksCSSPlugin = new ExtractTextPlugin( {
-	filename: './css/blocks.style.css',
-} );
-const editBlocksCSSPlugin = new ExtractTextPlugin( {
-	filename: './css/blocks.editor.css',
-} );
-const uglifyJSPlugin = new UglifyJSPlugin( {
-	uglifyOptions: {
-		mangle: {},
-		compress: true
-	},
-	sourceMap: false
-} );
-
-// Configuration for the ExtractTextPlugin.
-const extractConfig = {
-	use: [
-		{ loader: 'raw-loader' },
-		{
-			loader: 'postcss-loader',
-			options: {
-				plugins: [ require( 'autoprefixer' ) ],
-			},
-		},
-		{
-			loader: 'sass-loader',
-			query: {
-				outputStyle: 'compressed',
-			},
-		},
-	],
-};
+const MiniCssExtractPlugin = require( 'mini-css-extract-plugin' );
+const defaultConfig = require( '@wordpress/scripts/config/webpack.config' );
+const isProduction = process.env.NODE_ENV === 'production';
 
 module.exports = {
+	...defaultConfig,
 	entry: {
-		'./js/build/block-lab-editor': './js/src/block-editor/index.js',
-		'./js/build/block-editor': './js/src/block-lab-editor/index.js',
+		'./js/build/block-lab-editor': './js/src/block-lab-editor/index.js',
+		'./js/build/block-editor': './js/src/block-editor/index.js',
 	},
 	output: {
 		path: path.resolve( __dirname ),
 		filename: '[name].js',
 	},
 	watch: false,
-	// devtool: 'cheap-eval-source-map',
+	mode: isProduction ? 'production' : 'development',
 	module: {
 		rules: [
 			{
@@ -56,19 +24,35 @@ module.exports = {
 					loader: 'babel-loader',
 				},
 			},
-			{
-				test: /style\.s?css$/,
-				use: blocksCSSPlugin.extract( extractConfig ),
-			},
 			{
 				test: /editor\.s?css$/,
-				use: editBlocksCSSPlugin.extract( extractConfig ),
+				use: [
+					{
+						loader: MiniCssExtractPlugin.loader,
+						options: {
+							// Only allow hot module reloading in development.
+							hmr: process.env.NODE_ENV === 'development',
+							// Force reloading if hot module reloading does not work.
+							reloadAll: true,
+						},
+					},
+					'css-loader',
+					{
+						loader: 'postcss-loader',
+						options: {
+							plugins: [ require( 'autoprefixer' ) ],
+						},
+					},
+					{
+						loader: 'sass-loader',
+					},
+				],
 			},
 		],
 	},
 	plugins: [
-		blocksCSSPlugin,
-		editBlocksCSSPlugin,
-		uglifyJSPlugin,
+		new MiniCssExtractPlugin( {
+			filename: './css/blocks.editor.css',
+		} ),
 	],
 };