Merge pull request #25 from gin0115/fix/2_0_0__release-bugs

Fixed issue where sometimes a timezone object is passed not a string …

Author: gin0115

src/blocks/event-info/event-manager.js

@@ -1,6 +1,8 @@
 import { sortBy, isEqual, clone } from 'lodash';
 import { getStartAndEndDate, createDefaultDate, getDstOffset, TIMEZONE, OFFSET } from './date-utils';
 import moment from 'moment';
+import { select } from '@wordpress/data';
+
 
 /**
  * Date Manager Service
@@ -25,11 +27,15 @@ import moment from 'moment';
  * @param {string} end   The end time of the date.
  * @return {string} A unique hash for the date.
  */
-const createDateHash = (start, end) => {
-	// Get the current timestamp.
-	const timestamp = Date.now();
+const createDateHash = (start, end, postId) => {
+	// If the post id is not passed, use the editor post id.
+	if (!postId) {
+		// Generate a radom string with alphanumeric characters.
+		const randomString = Math.random().toString(36).substring(2, 15);
+		postId = select('core/editor').getCurrentPostId() + randomString;
+	}
 	// Create a hash using the start and end times along with the timestamp.
-	const hash = `${start}-${end}-${timestamp}`;
+	const hash = `${start}-${end}-${postId}`;
 	return hash;
 }
 
@@ -48,7 +54,6 @@ const createDateHash = (start, end) => {
  * @return {Object} Date management service with public interface.
  */
 export const dateManager = (initialDates = [], timezone = '', metaSync = null) => {
-
 	// lOOP through dates and add a hash to each date
 	initialDates.dates.forEach(date => {
 		date.hash = createDateHash(date.start_date, date.end_date);
@@ -93,7 +98,6 @@ export const dateManager = (initialDates = [], timezone = '', metaSync = null) =
 			originalTimezone = currentTimezone;
 		}
 
-
 		return getCurrentDates();
 	};
 
@@ -109,11 +113,13 @@ export const dateManager = (initialDates = [], timezone = '', metaSync = null) =
 	 */
 	const getCurrentDates = () => {
 		const timezoneChanged = currentTimezone !== originalTimezone;
-		return {
+		const result = {
 			dates: currentDates,
 			timezone: currentTimezone,
 			isDirty: isDirty || timezoneChanged,
 		};
+
+		return result;
 	}
 
 	/**

src/blocks/event-info/index.js

@@ -323,29 +323,66 @@ registerBlockType('simple-events/event-info', {
 			};
 		}, []);
 
-		// Trigger date save when post is being saved
+		// Save dates before post save begins
 		useEffect(() => {
-			const saveDatesOnPostSave = async () => {
-				if (isSavingPost && !isAutosavingPost && dateManagerState?.getCurrentDates()?.dates) {
-					try {
-						await saveEventDatesOnPostSave(dateManagerState.getCurrentDates().dates, dateManagerState);
-					} catch (error) {
-						console.error('Failed to save event dates on post save:', error);
-					}
+			let wasSaving = false;
+			let dateSavePromise = null;
+
+			const unsubscribe = window.wp.data.subscribe(() => {
+				const { isSavingPost, isAutosavingPost } = window.wp.data.select('core/editor');
+				const currentSaving = isSavingPost();
+				const currentAutosaving = isAutosavingPost();
+
+				// Detect when save is about to start (transition from false to true)
+				if (currentSaving && !currentAutosaving && !wasSaving && dateManagerState?.getCurrentDates()?.dates) {
+					// Save dates immediately before post save continues
+					dateSavePromise = saveEventDatesOnPostSave(dateManagerState.getCurrentDates().dates, dateManagerState)
+						.then((savedDates) => {
+							if (savedDates && savedDates.dates) {
+								setAttributes({
+									eventDates: savedDates.dates
+								});
+							}
+							dateSavePromise = null;
+						})
+						.catch((error) => {
+							console.error('Failed to save event dates before post save:', error);
+							dateSavePromise = null;
+						});
+				}
+
+				// Detect when save finishes but date sync is still in progress
+				if (!currentSaving && wasSaving && dateSavePromise) {
+					// Wait for date sync to complete, then save again
+					dateSavePromise.then(() => {
+						// Trigger another post save to include the updated dates
+						window.wp.data.dispatch('core/editor').savePost();
+					});
 				}
-			};
 
-			saveDatesOnPostSave();
-		}, [isSavingPost, isAutosavingPost, dateManagerState]);
+				wasSaving = currentSaving;
+			});
+
+			return () => unsubscribe();
+		}, [dateManagerState, setAttributes]);
 
 		// Sync dateManagerState dates to block attributes
 		useEffect(() => {
 			if (dateManagerState?.getCurrentDates()?.dates) {
-				setAttributes({
-					eventDates: dateManagerState.getCurrentDates().dates
-				});
+				// Get current block attributes
+				const currentEventDates = attributes.eventDates || [];
+				const newEventDates = dateManagerState.getCurrentDates().dates;
+
+				// Compare the dates to see if they're actually different
+				const datesChanged = JSON.stringify(currentEventDates) !== JSON.stringify(newEventDates);
+
+				if (datesChanged) {
+					setAttributes({
+						eventDates: newEventDates
+					});
+				}
 			}
-		}, [dateManagerState, refreshCounter, setAttributes]);
+		}, [dateManagerState, refreshCounter, setAttributes, attributes.eventDates]);
 
 		// Check if we should be in edit mode based on missing data
 		useEffect(() => {
@@ -372,7 +409,7 @@ registerBlockType('simple-events/event-info', {
 					setDateManagerReady(true);
 					setDateManagerState(manager);
 				} catch (error) {
-					console.error('Failed to initialize date manager:', error);
+					console.error('❌ Failed to initialize date manager:', error);
 				} finally {
 					setIsGettingDates(false);
 				}
@@ -534,7 +571,9 @@ registerBlockType('simple-events/event-info', {
 		 * @return {JSX.Element|null} Warning component or null if no unsaved changes.
 		 */
 		const UnsavedChangesWarning = () => {
-			if (!dateManagerState?.getCurrentDates()?.isDirty) {
+			const isDirty = dateManagerState?.getCurrentDates()?.isDirty;
+
+			if (!isDirty) {
 				return null;
 			}
 
@@ -618,30 +657,33 @@ registerBlockType('simple-events/event-info', {
 		 *
 		 * @return {JSX.Element} The preview component with ServerSideRender.
 		 */
-		const renderPreview = () => (
-			<div {...useBlockProps()}>
-				{getBlockControls()}
-				<UnsavedChangesWarning />
-				<Disabled>
-					<ServerSideRender
-						block="simple-events/event-info"
-						additionalQueryArgs={{
-							context: 'edit'
-						}}
-						attributes={{
-							eventVenue: meta?.se_event_venue,
-							eventLocation: meta?.se_event_location,
-							eventDates: dateManagerState?.getCurrentDates()?.dates,
-							eventTimezone: dateManagerState?.getCurrentDates()?.timezone ?? meta?.se_event_timezone,
-							externalLink: meta?.se_event_external_link,
-							externalLinkLabel: meta?.se_event_external_link_label,
-							addCalendarLinks: meta?.se_event_add_calendar_links,
-						}}
+		const renderPreview = () => {
+			const attributes = {
+				eventVenue: meta?.se_event_venue,
+				eventLocation: meta?.se_event_location,
+				eventDates: dateManagerState?.getCurrentDates()?.dates,
+				eventTimezone: dateManagerState?.getCurrentDates()?.timezone ?? meta?.se_event_timezone,
+				externalLink: meta?.se_event_external_link,
+				externalLinkLabel: meta?.se_event_external_link_label,
+				addCalendarLinks: meta?.se_event_add_calendar_links,
+			};
 
-					/>
-				</Disabled>
-			</div>
-		);
+			return (
+				<div {...useBlockProps()}>
+					{getBlockControls()}
+					<UnsavedChangesWarning />
+					<Disabled>
+						<ServerSideRender
+							block="simple-events/event-info"
+							additionalQueryArgs={{
+								context: 'edit'
+							}}
+							attributes={attributes}
+						/>
+					</Disabled>
+				</div>
+			);
+		};
 
 		if (!editMode) {
 			return renderPreview();

src/event-functions.php

@@ -778,6 +778,16 @@ function ( $date_id ) {
  * @return DateTime The created DateTime object.
  */
 function se_create_date_time_from_timestamp( $timestamp, $timezone = null ): DateTime {
+	// If we have a timezone instance, get its name.
+	if ( $timezone instanceof DateTimeZone ) {
+		$timezone = $timezone->getName();
+	}
+
+	// If we still dont have a string or its empty, use the site timezone.
+	if ( ! is_string( $timezone ) || empty( $timezone ) ) {
+		$timezone = null;
+	}
+
 	/**
 	 * If no timezone is passed, use the site timezone
 	 */