Fix/111895 event venue separation logic presentation

readme.md

@@ -27,6 +27,7 @@ This plugin is our first attempt at integrating the Event post type with the Gut
 #### 0.2.7-alpha - TBD
 
 * Tweak - Use event timezone as default value
+* Tweak - Separate logic and presentation in event venue block
 * Fix - Allow removal of organizers from classic block if the organizer block is removed
 
 #### 0.2.6-alpha - 2018-08-10

src/modules/blocks/event-venue/container.js

@@ -0,0 +1,80 @@
+/**
+ * External dependencies
+ */
+import { connect } from 'react-redux';
+import { compose, bindActionCreators } from 'redux';
+
+/**
+ * Internal dependencies
+ */
+import EventVenue from './template';
+import { toVenue } from 'elements';
+import { withStore, withSaveData, withDetails, withForm } from 'editor/hoc';
+import { actions, selectors } from 'data/blocks/venue';
+import { VENUE } from 'editor/post-types';
+
+const setVenue = ( dispatch ) => ( id ) => {
+	const { setVenue, setShowMap, setShowMapLink } = actions;
+	dispatch( setVenue( id ) );
+	dispatch( setShowMap( true ) );
+	dispatch( setShowMapLink( true ) );
+};
+
+const onFormComplete = ( dispatch, ownProps ) => ( body ) => {
+	const { setDetails } = ownProps;
+	const { id } = body;
+	setDetails( id, body );
+	setVenue( dispatch )( id );
+};
+
+const onFormSubmit = ( dispatch, ownProps ) => ( fields ) => (
+	ownProps.sendForm( toVenue( fields ), onFormComplete( dispatch, ownProps ) )
+);
+
+const onItemSelect = ( dispatch ) => setVenue( dispatch );
+
+const onCreateNew = ( ownProps ) => ( title ) => ownProps.createDraft( {
+	title: {
+		rendered: title,
+	},
+} );
+
+// TODO: need to remove the use of "maybe" functions as they hold logic they
+// ultimately should not.
+const removeVenue = ( dispatch, ownProps ) => () => {
+	const { volatile, maybeRemoveEntry, details } = ownProps;
+
+	dispatch( actions.removeVenue() );
+	if ( volatile ) {
+		maybeRemoveEntry( details );
+	}
+};
+
+const editVenue = ( ownProps ) => () => {
+	const { details, editEntry } = ownProps;
+	editEntry( details );
+};
+
+const mapStateToProps = ( state ) => ( {
+	venue: selectors.getVenue( state ),
+	showMapLink: selectors.getshowMapLink( state ),
+	showMap: selectors.getshowMap( state ),
+} );
+
+const mapDispatchToProps = ( dispatch, ownProps ) => ( {
+	...bindActionCreators( actions, dispatch ),
+	onFormSubmit: onFormSubmit( dispatch, ownProps ),
+	onItemSelect: onItemSelect( dispatch ),
+	onCreateNew: onCreateNew( ownProps ),
+	removeVenue: removeVenue( dispatch, ownProps ),
+	editVenue: editVenue( ownProps ),
+} );
+
+export default compose(
+	withStore( { postType: VENUE } ),
+	connect( mapStateToProps ),
+	withDetails( 'venue' ),
+	withForm( ( props ) => props.name ),
+	connect( null, mapDispatchToProps ),
+	withSaveData(),
+)( EventVenue );

src/modules/blocks/event-venue/index.js

@@ -6,10 +6,8 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import EventVenue from './block';
-import { withStore } from 'editor/hoc';
+import EventVenue from './container';
 import { Icons } from 'elements';
-import { VENUE } from 'editor/post-types';
 
 /**
  * Module Code
@@ -50,7 +48,7 @@ export default {
 		},
 	},
 
-	edit: withStore( { postType: VENUE } )( EventVenue ),
+	edit: EventVenue,
 
 	save( props ) {
 		return null;