Merge pull request #1899 from rtCamp/develop

Develop to main sync for v1.11.0 release

Author: KMchaudhary

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog #
 
+## v1.11.0 (May 27, 2026) ##
+
+- Tweak: Extended GoDAM analytics scripts to track Reel Pop interactions from GoDAM for Woo.
+- Tweak: Added a migration script to sync existing virtual media to GoDAM Central.
+- Fix: Improved video selection UX in the handpicked mode of the Video Gallery block.
+
 ## v1.10.2 (May 22, 2026) ##
 
 - Feat: Enhanced Type 1 video analytics tracking with viewport detection.

README.md

@@ -10,7 +10,7 @@ Tested up to: 7.0
 
 Requires PHP: 7.4
 
-Stable tag: 1.10.2
+Stable tag: 1.11.0
 
 License: [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)
 

assets/src/blocks/godam-gallery-v2-item/edit.js

@@ -8,10 +8,12 @@ import {
 	useBlockProps,
 	MediaUpload,
 	MediaUploadCheck,
+	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { Button } from '@wordpress/components';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelect, select as dataSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
+import { store as noticesStore } from '@wordpress/notices';
 import { closeSmall, pencil, video as videoIcon } from '@wordpress/icons';
 import { useRef, useEffect } from '@wordpress/element';
 
@@ -54,6 +56,7 @@ export default function Edit( { attributes, setAttributes, context, clientId } )
 	const itemWidth = itemWidthMap[ itemWidthRaw ] || itemWidthMap.M;
 	const viewRatio = context[ 'godam/galleryV2/viewRatio' ] || '16:9';
 	const { removeBlock } = useDispatch( 'core/block-editor' );
+	const { createNotice } = useDispatch( noticesStore );
 
 	// Ref to track the GoDAM virtual media ID from the most recent selection.
 	const pendingVirtualMediaId = useRef( null );
@@ -65,9 +68,38 @@ export default function Edit( { attributes, setAttributes, context, clientId } )
 		if ( ! mediaItem?.id ) {
 			return;
 		}
+		// Only allow video attachments.
+		if ( mediaItem.type && mediaItem.type !== 'video' ) {
+			createNotice( 'warning', __( 'Only video files can be added to the gallery.', 'godam' ), {
+				type: 'snackbar',
+				isDismissible: true,
+			} );
+			return;
+		}
+		if ( mediaItem.mime && ! mediaItem.mime.startsWith( 'video/' ) ) {
+			createNotice( 'warning', __( 'Only video files can be added to the gallery.', 'godam' ), {
+				type: 'snackbar',
+				isDismissible: true,
+			} );
+			return;
+		}
 		pendingVirtualMediaId.current = mediaItem.id;
 		const numericId = parseInt( mediaItem.id, 10 );
 		if ( numericId > 0 && String( numericId ) === String( mediaItem.id ) ) {
+			// Prevent selecting a video already used by a sibling.
+			const { getBlockRootClientId, getBlock } = dataSelect( blockEditorStore );
+			const parentClientId = getBlockRootClientId( clientId );
+			const parentBlock = getBlock( parentClientId );
+			const isDuplicate = ( parentBlock?.innerBlocks || [] ).some(
+				( block ) => block.clientId !== clientId && block.attributes?.videoId === numericId,
+			);
+			if ( isDuplicate ) {
+				createNotice( 'warning', __( 'This video is already in the gallery.', 'godam' ), {
+					type: 'snackbar',
+					isDismissible: true,
+				} );
+				return;
+			}
 			setAttributes( { videoId: numericId } );
 		}
 	};
@@ -83,6 +115,22 @@ export default function Edit( { attributes, setAttributes, context, clientId } )
 				String( pendingVirtualMediaId.current ) === String( virtualMediaId )
 			) {
 				pendingVirtualMediaId.current = null;
+
+				// Prevent selecting a video already used by a sibling.
+				const { getBlockRootClientId, getBlock } = dataSelect( blockEditorStore );
+				const parentClientId = getBlockRootClientId( clientId );
+				const parentBlock = getBlock( parentClientId );
+				const isDuplicate = ( parentBlock?.innerBlocks || [] ).some(
+					( block ) => block.clientId !== clientId && block.attributes?.videoId === attachment.id,
+				);
+				if ( isDuplicate ) {
+					createNotice( 'warning', __( 'This video is already in the gallery.', 'godam' ), {
+						type: 'snackbar',
+						isDismissible: true,
+					} );
+					return;
+				}
+
 				setAttributes( { videoId: attachment.id } );
 			}
 		};
@@ -92,7 +140,7 @@ export default function Edit( { attributes, setAttributes, context, clientId } )
 		return () => {
 			document.removeEventListener( 'godam-virtual-attachment-created', handleVirtualAttachmentCreated );
 		};
-	}, [ setAttributes ] );
+	}, [ clientId, setAttributes, createNotice ] );
 
 	const { media, hasResolvedMedia } = useSelect(
 		( select ) => {

assets/src/blocks/godam-gallery-v2/edit.js

@@ -26,8 +26,9 @@ import {
 	__experimentalToggleGroupControlOptionIcon as ToggleGroupControlOptionIcon,
 	Button,
 } from '@wordpress/components';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelect, select as dataSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
+import { store as noticesStore } from '@wordpress/notices';
 import { useCallback, useEffect, useMemo, useRef, useState } from '@wordpress/element';
 import { columns, grid, listView, plus } from '@wordpress/icons';
 
@@ -172,6 +173,7 @@ const AddVideoAppender = ( { onSelect } ) => (
 	<MediaUploadCheck>
 		<MediaUpload
 			allowedTypes={ [ 'video' ] }
+			multiple
 			onSelect={ onSelect }
 			render={ ( { open } ) => (
 				<Button
@@ -214,7 +216,8 @@ export default function Edit( { attributes, setAttributes, clientId } ) {
 	const [ startDatePopoverOpen, setStartDatePopoverOpen ] = useState( false );
 	const [ endDatePopoverOpen, setEndDatePopoverOpen ] = useState( false );
 	const [ dateError, setDateError ] = useState( '' );
-	const { insertBlocks, updateBlockAttributes } = useDispatch( blockEditorStore );
+	const { insertBlocks, updateBlockAttributes, removeBlock } = useDispatch( blockEditorStore );
+	const { createNotice } = useDispatch( noticesStore );
 
 	// Tracks {virtualId, blockClientId} pairs for GoDAM virtual insertions
 	// so the godam-virtual-attachment-created event can update the correct block.
@@ -367,28 +370,85 @@ export default function Edit( { attributes, setAttributes, clientId } ) {
 	);
 
 	const insertHandpickedVideo = useCallback(
-		( mediaItem ) => {
-			if ( ! mediaItem?.id ) {
+		( mediaItemOrArray ) => {
+			const items = Array.isArray( mediaItemOrArray ) ? mediaItemOrArray : [ mediaItemOrArray ];
+			if ( ! items.length ) {
 				return;
 			}
 
-			const numericId = parseInt( mediaItem.id, 10 );
-			const isVirtual = ! ( numericId > 0 && String( numericId ) === String( mediaItem.id ) );
+			// Get existing video IDs from inner blocks to prevent duplicates.
+			const { getBlock } = dataSelect( blockEditorStore );
+			const parentBlock = getBlock( clientId );
+			const existingVideoIds = new Set(
+				( parentBlock?.innerBlocks || [] )
+					.map( ( block ) => block.attributes?.videoId )
+					.filter( Boolean ),
+			);
+
+			const newBlocks = [];
+			let skippedNonVideo = false;
+			let skippedDuplicate = false;
+
+			items.forEach( ( mediaItem ) => {
+				if ( ! mediaItem?.id ) {
+					return;
+				}
+
+				// Only allow video attachments.
+				if ( mediaItem.type && mediaItem.type !== 'video' ) {
+					skippedNonVideo = true;
+					return;
+				}
+				if ( mediaItem.mime && ! mediaItem.mime.startsWith( 'video/' ) ) {
+					skippedNonVideo = true;
+					return;
+				}
+
+				const numericId = parseInt( mediaItem.id, 10 );
+				const isVirtual = ! ( numericId > 0 && String( numericId ) === String( mediaItem.id ) );
+
+				if ( ! isVirtual ) {
+					// Skip if this video is already in the gallery.
+					if ( existingVideoIds.has( numericId ) ) {
+						skippedDuplicate = true;
+						return;
+					}
+					existingVideoIds.add( numericId );
+				}
+
+				const newBlock = createBlock( 'godam/gallery-v2-item', {
+					videoId: isVirtual ? 0 : numericId,
+				} );
+
+				if ( isVirtual ) {
+					pendingVirtualInserts.current.push( {
+						virtualId: mediaItem.id,
+						blockClientId: newBlock.clientId,
+					} );
+				}
 
-			const newBlock = createBlock( 'godam/gallery-v2-item', {
-				videoId: isVirtual ? 0 : numericId,
+				newBlocks.push( newBlock );
 			} );
 
-			if ( isVirtual ) {
-				pendingVirtualInserts.current.push( {
-					virtualId: mediaItem.id,
-					blockClientId: newBlock.clientId,
+			if ( skippedNonVideo ) {
+				createNotice( 'warning', __( 'Only video files can be added to the gallery.', 'godam' ), {
+					type: 'snackbar',
+					isDismissible: true,
+				} );
+			}
+
+			if ( skippedDuplicate ) {
+				createNotice( 'warning', __( 'Duplicate videos were skipped.', 'godam' ), {
+					type: 'snackbar',
+					isDismissible: true,
 				} );
 			}
 
-			insertBlocks( newBlock, undefined, clientId );
+			if ( newBlocks.length > 0 ) {
+				insertBlocks( newBlocks, undefined, clientId );
+			}
 		},
-		[ clientId, insertBlocks ],
+		[ clientId, createNotice, insertBlocks ],
 	);
 
 	// When GoDAM creates a real WP attachment, find the pending child block
@@ -409,6 +469,22 @@ export default function Edit( { attributes, setAttributes, clientId } ) {
 			}
 
 			const [ { blockClientId } ] = pendingVirtualInserts.current.splice( idx, 1 );
+
+			// Skip if this video already exists in another gallery item.
+			const { getBlock } = dataSelect( blockEditorStore );
+			const parentBlock = getBlock( clientId );
+			const isDuplicate = ( parentBlock?.innerBlocks || [] ).some(
+				( block ) => block.clientId !== blockClientId && block.attributes?.videoId === attachment.id,
+			);
+			if ( isDuplicate ) {
+				createNotice( 'warning', __( 'Duplicate videos were skipped.', 'godam' ), {
+					type: 'snackbar',
+					isDismissible: true,
+				} );
+				removeBlock( blockClientId );
+				return;
+			}
+
 			updateBlockAttributes( blockClientId, { videoId: attachment.id } );
 		};
 
@@ -417,7 +493,7 @@ export default function Edit( { attributes, setAttributes, clientId } ) {
 		return () => {
 			document.removeEventListener( 'godam-virtual-attachment-created', handleVirtualAttachmentCreated );
 		};
-	}, [ updateBlockAttributes ] );
+	}, [ clientId, createNotice, removeBlock, updateBlockAttributes ] );
 
 	const renderVideoAppender = useCallback(
 		() => <AddVideoAppender onSelect={ insertHandpickedVideo } />,

assets/src/blocks/godam-gallery-v2/editor.scss

@@ -23,6 +23,7 @@
 
 	.block-list-appender {
 		position: initial;
+		width: 100%;
 	}
 }
 

assets/src/js/godam-player/analytics-helpers.js

@@ -6,6 +6,50 @@
  * is the single source of truth for the request schema.
  */
 
+/**
+ * External dependencies
+ */
+import { v4 as uuidv4 } from 'uuid';
+
+// Module-scope cache. Generated once on first event, reused for the rest of
+// the page load. Every type=1/2/3/4 event from the same page load shares this
+// UUID so the microservice can dedup with uniqExact(page_load_session_id).
+let _pageLoadSessionId = null;
+
+/**
+ * Return a stable UUID v4 for this page load.
+ *
+ * @return {string} UUID v4 (36 chars).
+ */
+export function getPageLoadSessionId() {
+	if ( ! _pageLoadSessionId ) {
+		_pageLoadSessionId = uuidv4();
+	}
+	return _pageLoadSessionId;
+}
+
+/**
+ * Normalized browser name (e.g. "Google Chrome", "Apple Safari").
+ *
+ * Wraps getUserAgent so callers outside this module can produce the same
+ * config_browser_name string buildAnalyticsRequestBody emits — guarantees
+ * type=1/2/3 and reel-pop type=4 device buckets line up.
+ *
+ * @return {string} Browser name.
+ */
+export function getBrowserName() {
+	return getUserAgent( window.navigator.userAgent ).name;
+}
+
+/**
+ * Normalized OS / platform name (e.g. "Macintosh", "Windows", "Linux").
+ *
+ * @return {string} OS / platform name.
+ */
+export function getOSName() {
+	return getUserAgent( window.navigator.userAgent ).platform;
+}
+
 /**
  * Check if we should skip analytics tracking.
  *
@@ -111,6 +155,7 @@ export function getUserAgent( userAgent ) {
  * @param {Array}  [opts.videoIds]         Array of [videoId, jobId] pairs (type 1).
  * @param {Array}  [opts.ranges]           Played time-range pairs (type 2).
  * @param {number} [opts.videoLength]      Duration in seconds (type 2).
+ * @param {number} [opts.reelPopId]        Reel Pop CPT post ID (when event originates from a reel-pop modal).
  * @return {{ endpoint: string|null, body: Object|null }} Object with `endpoint` (the base
  * API URL) and `body` (the request payload). Both are `null` when the plugin token is
  * missing or unverified — callers must check `endpoint` before sending.
@@ -124,6 +169,7 @@ export function buildAnalyticsRequestBody( {
 	videoIds = [],
 	ranges = [],
 	videoLength = 0,
+	reelPopId = 0,
 } ) {
 	const {
 		endpoint,
@@ -194,6 +240,7 @@ export function buildAnalyticsRequestBody( {
 		video_ids: type === 1 ? videoIds : [],
 		ranges,
 		video_length: videoLength || 0,
+		page_load_session_id: getPageLoadSessionId(),
 	};
 
 	// Only include job_id when it has a value — an empty string triggers
@@ -202,5 +249,19 @@ export function buildAnalyticsRequestBody( {
 		body.job_id = jobId;
 	}
 
+	const reelPopIdInt = parseInt( reelPopId, 10 );
+	if ( reelPopIdInt > 0 ) {
+		body.reel_pop_id = reelPopIdInt;
+	}
+
 	return { endpoint, body };
 }
+
+// Expose helpers on a global namespace so sibling plugins (e.g. godam-for-woo)
+// that are bundled separately can reuse them without a shared import path.
+// Reusing these guarantees parity between type=1/2/3 and type=4 envelopes.
+window.GoDAM = window.GoDAM || {};
+window.GoDAM.getPageLoadSessionId = getPageLoadSessionId;
+window.GoDAM.getBrowserName = getBrowserName;
+window.GoDAM.getOSName = getOSName;
+window.GoDAM.shouldSkipAnalytics = shouldSkipAnalytics;