Save the event ID as block attribute

Automattic · Jan 23, 2020 · 25e0fb9 · 25e0fb9
1 parent 1691393
commit 25e0fb9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 26 deletions.
diff --git a/extensions/blocks/eventbrite/edit.js b/extensions/blocks/eventbrite/edit.js
@@ -110,7 +110,7 @@ class EventbriteEdit extends Component {
 			return;
 		}
 
-		this.props.setAttributes( { url } );
+		this.props.setAttributes( { eventId: eventIdFromUrl( url ), url } );
 
 		// Setting the `resolvingUrl` state here, then waiting for `componentDidUpdate()` to
 		// be called before actually resolving it ensures that the `editedUrl` state has also been
@@ -290,9 +290,7 @@ class EventbriteEdit extends Component {
 
 	renderInlinePreview() {
 		const { className } = this.props;
-		const { url } = this.props.attributes;
-
-		const eventId = url ? eventIdFromUrl( url ) : null;
+		const { eventId } = this.props.attributes;
 
 		if ( ! eventId ) {
 			return;

diff --git a/extensions/blocks/eventbrite/eventbrite.php b/extensions/blocks/eventbrite/eventbrite.php
@@ -14,8 +14,7 @@
 	)
 );
 
-const JETPACK_EVENTBRITE_ID_FROM_URL_REGEX = '(\d+)\/?\s*$';
-const JETPACK_EVENTBRITE_WIDGET_SLUG       = 'eventbrite-widget';
+const JETPACK_EVENTBRITE_WIDGET_SLUG = 'eventbrite-widget';
 
 /**
  * Eventbrite block registration/dependency delclaration.
@@ -26,19 +25,11 @@
  * @return string
  */
 function jetpack_render_eventbrite_block( $attr, $content ) {
-	if ( empty( $attr['url'] ) ) {
+	if ( empty( $attr['eventId'] ) || empty( $attr['url'] ) ) {
 		return '';
 	}
 
-	$matches = array();
-	preg_match( '/' . JETPACK_EVENTBRITE_ID_FROM_URL_REGEX . '/', $attr['url'], $matches );
-	$event_id = isset( $matches[1] ) && $matches[1] ? $matches[1] : null;
-
-	if ( ! $event_id ) {
-		return '';
-	}
-
-	$widget_id = JETPACK_EVENTBRITE_WIDGET_SLUG . '-' . $event_id;
+	$widget_id = JETPACK_EVENTBRITE_WIDGET_SLUG . '-' . $attr['eventId'];
 
 	wp_enqueue_script( 'eventbrite-widget', 'https://www.eventbrite.com/static/widgets/eb_widgets.js', array(), JETPACK__VERSION, true );
 
@@ -48,7 +39,7 @@ function jetpack_render_eventbrite_block( $attr, $content ) {
 			'eventbrite-widget',
 			"window.EBWidgets.createWidget({
 				widgetType: 'checkout',
-				eventId: " . absint( $event_id ) . ",
+				eventId: " . absint( $attr['eventId'] ) . ",
 				iframeContainerId: '" . esc_js( $widget_id ) . "',
 			});"
 		);
@@ -66,7 +57,7 @@ function jetpack_render_eventbrite_block( $attr, $content ) {
 		'eventbrite-widget',
 		"window.EBWidgets.createWidget({
 			widgetType: 'checkout',
-			eventId: " . absint( $event_id ) . ",
+			eventId: " . absint( $attr['eventId'] ) . ",
 			modal: true,
 			modalTriggerElementId: '" . esc_js( $widget_id ) . "',
 		});"
@@ -89,8 +80,7 @@ function jetpack_eventbrite_block_editor_assets() {
 		'jetpack-blocks-editor',
 		'Jetpack_Block_Eventbrite_Settings',
 		array(
-			'event_id_from_url_regex' => JETPACK_EVENTBRITE_ID_FROM_URL_REGEX,
-			'widget_slug'             => JETPACK_EVENTBRITE_WIDGET_SLUG,
+			'widget_slug' => JETPACK_EVENTBRITE_WIDGET_SLUG,
 		)
 	);
 }

diff --git a/extensions/blocks/eventbrite/index.js b/extensions/blocks/eventbrite/index.js
@@ -48,6 +48,9 @@ export const settings = {
 		url: {
 			type: 'string',
 		},
+		eventId: {
+			type: 'number',
+		},
 		useModal: {
 			type: 'boolean',
 		},

diff --git a/extensions/blocks/eventbrite/save.js b/extensions/blocks/eventbrite/save.js
@@ -7,7 +7,7 @@ import { RichText, getColorClassName } from '@wordpress/block-editor';
 /**
  * Internal dependencies
  */
-import { createWidgetId, eventIdFromUrl } from './utils';
+import { createWidgetId } from './utils';
 
 /**
  * Adapted button save function from @wordpress/block-library
@@ -72,9 +72,7 @@ function saveButton( eventId, attributes ) {
 }
 
 export default function save( { attributes } ) {
-	const { useModal, url } = attributes;
-
-	const eventId = eventIdFromUrl( url );
+	const { eventId, useModal } = attributes;
 
 	if ( ! eventId ) {
 		return;

diff --git a/extensions/blocks/eventbrite/utils.js b/extensions/blocks/eventbrite/utils.js
@@ -27,8 +27,7 @@ export function eventIdFromUrl( url ) {
 		return null;
 	}
 
-	const regex = new RegExp( window.Jetpack_Block_Eventbrite_Settings.event_id_from_url_regex );
-	const match = url.match( regex );
+	const match = url.match( /(\d+)\/?\s*$/ );
 	return match && match[ 1 ] ? match[ 1 ] : null;
 }