Revert the GoDAM engagement features gated via "rtgodam_enable_engagement_feature" filter (#1832)

KMchaudhary · KMchaudhary · subodhr258 · web-flow · commit 9be61bf45159 · 2026-04-30T16:21:48.000+05:30
* Revert the GoDAM engagement features * feat: Add support for engagements parameter in video embed functionality * Add rtgodam_enable_engagement_feature hook to Enable engagement feature conditionally across video and gallery components * fix: Adjust handling of 'engagements' attribute for correct boolean parsing * Resolve copilot comments * fix: Update migration for engagements feature * fix: Update engagement defaults * Fix the engagment for non-transcoded videos, and non valid api key * Revert "fix: Update engagement defaults" This reverts commit 1f3289e. * Fix the status comparison by converting to lowercase --------- Co-authored-by: KMchaudhary <kuldipkumar.chaudhary@rtcamp.com> Co-authored-by: Subodh Rajpopat <subodh.rajpopat@rtcamp.com>
diff --git a/assets/src/blocks/godam-gallery-v2/block.json b/assets/src/blocks/godam-gallery-v2/block.json
@@ -75,6 +75,10 @@
 		"performanceMode": {
 			"type": "string",
 			"default": "balanced"
+		},
+		"engagements": {
+			"type": "boolean",
+			"default": true
 		}
 	},
 	"providesContext": {
diff --git a/assets/src/blocks/godam-gallery-v2/edit.js b/assets/src/blocks/godam-gallery-v2/edit.js
@@ -207,7 +207,10 @@ export default function Edit( { attributes, setAttributes, clientId } ) {
 		showTitle,
 		layout,
 		performanceMode,
+		engagements,
 	} = attributes;
+	const engagementFeatureEnabled = window?.godamSettings?.engagementFeatureEnabled ?? false;
+	const showEngagementSetting = engagementFeatureEnabled && ( window?.godamSettings?.enableGlobalVideoEngagement ?? false );
 	const [ startDatePopoverOpen, setStartDatePopoverOpen ] = useState( false );
 	const [ endDatePopoverOpen, setEndDatePopoverOpen ] = useState( false );
 	const [ dateError, setDateError ] = useState( '' );
@@ -596,6 +599,16 @@ export default function Edit( { attributes, setAttributes, clientId } ) {
 						checked={ !! showTitle }
 						onChange={ ( value ) => setAttributes( { showTitle: value } ) }
 					/>
+					{
+						showEngagementSetting && (
+							<ToggleControl
+								label={ __( 'Enable Likes & Comments', 'godam' ) }
+								checked={ !! engagements }
+								onChange={ ( value ) => setAttributes( { engagements: value } ) }
+								help={ __( 'Engagement will only be visible for transcoded videos', 'godam' ) }
+							/>
+						)
+					}
 					<SelectControl
 						label={ __( 'Performance', 'godam' ) }
 						value={ performanceMode || 'balanced' }
diff --git a/assets/src/blocks/godam-gallery-v2/render.php b/assets/src/blocks/godam-gallery-v2/render.php
@@ -254,6 +254,7 @@ function godam_gallery_v2_get_video_data( $attachment_id ) {
 		'data-layout'         => $godam_layout,
 		'data-ratio'          => $godam_view_ratio,
 		'data-embed-base-url' => home_url( '/' ),
+		'data-engagements'    => rtgodam_is_engagement_feature_enabled() && ! empty( $attributes['engagements'] ) ? 'show' : '',
 	)
 );
 
diff --git a/assets/src/blocks/godam-gallery-v2/view.js b/assets/src/blocks/godam-gallery-v2/view.js
@@ -163,6 +163,7 @@ const { __ } = require( '@wordpress/i18n' );
 			this.element = element;
 			this.mode = element.dataset.mode || 'handpicked';
 			this.embedBaseUrl = element.dataset.embedBaseUrl || '/';
+			this.engagements = element.dataset.engagements || '';
 			this.currentIndex = -1;
 			this.previouslyFocusedElement = null;
 			this.isLoading = false;
@@ -363,7 +364,8 @@ const { __ } = require( '@wordpress/i18n' );
 
 			this.currentIndex = index;
 			activeGallery = this;
-			this.modal.iframe.src = `${ this.embedBaseUrl }?godam_page=video-embed&id=${ encodeURIComponent( videoId ) }&godam_gallery=1`;
+			const engagementsParam = this.engagements === 'show' ? '&engagements=show' : '';
+			this.modal.iframe.src = `${ this.embedBaseUrl }?godam_page=video-embed&id=${ encodeURIComponent( videoId ) }&godam_gallery=1${ engagementsParam }`;
 			this.modal.overlay.classList.add( 'is-active' );
 			this.modal.modal.classList.add( 'is-active' );
 			this.modal.closeButton.classList.add( 'is-active' );
diff --git a/assets/src/blocks/godam-player/block.json b/assets/src/blocks/godam-player/block.json
@@ -113,6 +113,10 @@
 			"type": "boolean",
 			"default": false
 		},
+		"engagements": {
+			"type": "boolean",
+			"default": false
+		},
 		"playerHeight": {
 			"type": "string",
 			"default": ""
diff --git a/assets/src/blocks/godam-player/edit-common-settings.js b/assets/src/blocks/godam-player/edit-common-settings.js
@@ -42,9 +42,11 @@ const resolveLegacyPerformanceMode = ( preload, preloadPoster ) => {
  * @return {WPElement} The video settings component.
  */
 const VideoSettings = ( { setAttributes, attributes, isInsideQueryLoop = false } ) => {
-	const { autoplay, controls, loop, muted, preload, preloadPoster, performanceMode, showShareButton } =
+	const { autoplay, controls, loop, muted, preload, preloadPoster, performanceMode, showShareButton, engagements } =
 	attributes;
 	const showShareButtonSetting = window?.godamSettings?.enableGlobalVideoShare ?? false;
+	const engagementFeatureEnabled = window?.godamSettings?.engagementFeatureEnabled ?? false;
+	const showEngagementSetting = engagementFeatureEnabled && ( window?.godamSettings?.enableGlobalVideoEngagement ?? false );
 
 	// Show a specific help for autoplay setting.
 	const getAutoplayHelp = useMemo( () => {
@@ -77,6 +79,7 @@ const VideoSettings = ( { setAttributes, attributes, isInsideQueryLoop = false }
 			muted: toggleAttribute( 'muted' ),
 			controls: toggleAttribute( 'controls' ),
 			showShareButton: toggleAttribute( 'showShareButton' ),
+			engagements: toggleAttribute( 'engagements' ),
 		};
 	}, [ setAttributes ] );
 
@@ -152,6 +155,17 @@ const VideoSettings = ( { setAttributes, attributes, isInsideQueryLoop = false }
 					help={ performanceHelpText[ selectedPerformanceMode ] }
 				/>
 			) }
+			{
+				showEngagementSetting && (
+					<ToggleControl
+						__nextHasNoMarginBottom
+						label={ __( 'Enable Likes & Comments', 'godam' ) }
+						onChange={ toggleFactory.engagements }
+						checked={ !! engagements }
+						help={ __( 'Engagement will only be visible for transcoded videos', 'godam' ) }
+					/>
+				)
+			}
 		</>
 	);
 };
diff --git a/assets/src/js/godam-video-embed.js b/assets/src/js/godam-video-embed.js
@@ -339,3 +339,107 @@ document.addEventListener( 'godamAllPlayersReady', () => {
 		}
 	} );
 } );
+
+/**
+ * Render CommentBox component on video embed page by default.
+ *
+ * @since 1.5.0
+ */
+document.addEventListener( 'DOMContentLoaded', function() {
+	const embedElement = document.querySelector( '.godam-video-embed' );
+
+	if ( embedElement?.getAttribute( 'data-show-engagements' ) !== 'true' ) {
+		return;
+	}
+
+	const urlParams = new URLSearchParams( window.location.search );
+
+	const videoId = urlParams.get( 'id' );
+
+	if ( ! videoId ) {
+		return;
+	}
+
+	const videoIdNum = parseInt( videoId, 10 );
+	if ( ! videoIdNum || isNaN( videoIdNum ) ) {
+		return;
+	}
+
+	// Create and show loading overlay
+	const loadingOverlay = document.createElement( 'div' );
+	loadingOverlay.className = 'godam-video-embed-loading';
+
+	// Create spinner element
+	const spinner = document.createElement( 'div' );
+	spinner.className = 'godam-video-embed-spinner';
+	loadingOverlay.appendChild( spinner );
+
+	document.body.appendChild( loadingOverlay );
+
+	// Function to hide loading overlay
+	const hideLoadingOverlay = () => {
+		if ( loadingOverlay && loadingOverlay.parentNode ) {
+			loadingOverlay.style.opacity = '0';
+			loadingOverlay.style.pointerEvents = 'none';
+			loadingOverlay.style.transition = 'opacity 0.3s ease-out';
+			setTimeout( () => {
+				loadingOverlay.remove();
+			}, 300 );
+		}
+	};
+
+	// Fallback: remove the overlay after 10 s in case the engagement store
+	// event never fires or renderCommentBox() exits early.
+	const overlayFallbackTimer = setTimeout( hideLoadingOverlay, 10000 );
+
+	// Listen for the engagement store to be initialized (once only).
+	document.addEventListener( 'godamEngagementStoreInitialized', renderCommentBox, { once: true } );
+
+	// Render the comment box.
+	function renderCommentBox() {
+		// Always clear the fallback timer — we are now handling the overlay ourselves.
+		clearTimeout( overlayFallbackTimer );
+
+		// Check WordPress dependencies
+		if ( typeof wp === 'undefined' || ! wp.data || ! wp.element?.createRoot ) {
+			hideLoadingOverlay();
+			return;
+		}
+
+		const storeName = 'godam-video-engagement';
+		const select = wp.data.select( storeName );
+		const dispatch = wp.data.dispatch( storeName );
+
+		if ( ! select || ! dispatch ) {
+			hideLoadingOverlay();
+			return;
+		}
+
+		// Find video element and get instance ID
+		const videoElement = document.querySelector( `.easydam-player.video-js[data-id="${ videoIdNum }"]` );
+		const videoInstanceId = videoElement?.getAttribute( 'data-instance-id' );
+
+		if ( ! videoInstanceId ) {
+			hideLoadingOverlay();
+			return;
+		}
+
+		// Get site URL
+		const siteUrl = window.location.origin;
+
+		// Determine if engagements should be shown
+		const skipEngagements = embedElement?.getAttribute( 'data-show-engagements' ) !== 'true';
+
+		// Dispatch action to initiate comment modal
+		dispatch.initiateCommentModal(
+			videoIdNum.toString(),
+			siteUrl,
+			`engagement-${ videoInstanceId }`,
+			skipEngagements,
+			true,
+		);
+
+		// Hide loading overlay after modal is initiated
+		hideLoadingOverlay();
+	}
+} );
diff --git a/inc/classes/class-assets.php b/inc/classes/class-assets.php
@@ -386,6 +386,7 @@ private function enqueue_godam_settings() {
 		$brand_image                    = $godam_settings['video_player']['brand_image'] ?? '';
 		$brand_color                    = $godam_settings['video_player']['brand_color'] ?? '';
 		$enable_gtm_tracking            = $godam_settings['general']['enable_gtm_tracking'] ?? false;
+		$engagement_feature_enabled     = rtgodam_is_engagement_feature_enabled();
 		$enable_global_video_engagement = $godam_settings['video']['enable_global_video_engagement'] ?? true;
 		$enable_global_share            = $godam_settings['video']['enable_global_video_share'] ?? true;
 
@@ -396,7 +397,8 @@ private function enqueue_godam_settings() {
 			'apiBase'                     => RTGODAM_API_BASE,
 			'enableGTMTracking'           => $enable_gtm_tracking,
 			'videoPostSettings'           => get_option( 'rtgodam_video_post_settings', array() ),
-			'enableGlobalVideoEngagement' => $enable_global_video_engagement,
+			'engagementFeatureEnabled'    => $engagement_feature_enabled,
+			'enableGlobalVideoEngagement' => $engagement_feature_enabled ? $enable_global_video_engagement : false,
 			'enableGlobalVideoShare'      => $enable_global_share,
 
 		);
diff --git a/inc/classes/class-video-engagement.php b/inc/classes/class-video-engagement.php
@@ -149,6 +149,9 @@ public function add_engagement_to_video( $attributes, $instance_id, $easydam_met
 	 * @return bool True if engagements are enabled, otherwise false.
 	 */
 	public function check_if_engagements_enabled( $attachment_id, $attributes ) {
+		if ( ! rtgodam_is_engagement_feature_enabled() ) {
+			return false;
+		}
 
 		if ( empty( $attachment_id ) || ! isset( $attributes['engagements'] ) ) {
 			return false;
diff --git a/inc/classes/migrations/class-gallery-v1-to-v2.php b/inc/classes/migrations/class-gallery-v1-to-v2.php
@@ -36,7 +36,7 @@
  * | category        | (dropped)          | V2 query does not support category filter |
  * | tag             | (dropped)          | V2 query does not support tag filter      |
  * | search          | (dropped)          | V2 query does not support search filter   |
- * | engagements     | (dropped)          | V2 does not have engagement support       |
+ * | engagements     | engagements        | direct pass-through                       |
  * | openToNewPage   | (dropped)          | V2 does not have single-page linking      |
  */
 class Gallery_V1_To_V2 {
@@ -374,6 +374,7 @@ private static function convert_block_match( array $block_match ) {
 			'customDateStart'   => '',
 			'customDateEnd'     => '',
 			'showTitle'         => true,
+			'engagements'       => true,
 		);
 
 		$diff = array();
@@ -422,6 +423,7 @@ private static function map_attributes( array $v1 ) {
 			'customDateStart',
 			'customDateEnd',
 			'showTitle',
+			'engagements',
 		);
 
 		foreach ( $passthrough as $key ) {
@@ -446,7 +448,7 @@ private static function map_attributes( array $v1 ) {
 
 		/*
 		 * Intentionally dropped (no equivalent in V2):
-		 * category, tag, search, engagements, openToNewPage, include.
+		 * category, tag, search, openToNewPage, include.
 		 */
 
 		return $v2;
diff --git a/inc/classes/rest-api/class-dynamic-gallery.php b/inc/classes/rest-api/class-dynamic-gallery.php
@@ -309,7 +309,7 @@ public function render_gallery( WP_REST_Request $request ) {
 					data-date-range="' . esc_attr( $atts['date_range'] ?? '' ) . '"
 					data-custom-date-start="' . esc_attr( $atts['custom_date_start'] ?? '' ) . '"
 					data-custom-date-end="' . esc_attr( $atts['custom_date_end'] ?? '' ) . '"
-data-engagements="' . ( $atts['engagements'] ? '1' : '0' ) . '">';
+data-engagements="' . ( rtgodam_is_engagement_feature_enabled() && $atts['engagements'] ? '1' : '0' ) . '">';
 			}
 	
 			do_action( 'rtgodam_dynamic_gallery_before_output', $query, $atts );
@@ -340,7 +340,7 @@ public function render_gallery( WP_REST_Request $request ) {
 				}
 
 				// Check if engagements are enabled for the video.
-				$engagements_enabled      = $atts['engagements'];
+				$engagements_enabled      = rtgodam_is_engagement_feature_enabled() && $atts['engagements'];
 				$item_engagements_enabled = false;
 				if ( $engagements_enabled ) {
 					// Check if engagements are enabled for the video is transcoded.
diff --git a/inc/classes/shortcodes/class-godam-player.php b/inc/classes/shortcodes/class-godam-player.php
@@ -275,13 +275,22 @@ public function render( $atts ) {
 		);
 
 		// Handle boolean attributes passed as strings (do this before mapping).
-		$boolean_attributes = array( 'autoplay', 'controls', 'loop', 'muted', 'engagements', 'preview', 'showShareButton', 'show_share_button' );
+		$boolean_attributes = array( 'autoplay', 'controls', 'loop', 'muted', 'preview', 'showShareButton', 'show_share_button' );
 		foreach ( $boolean_attributes as $bool_attr ) {
 			if ( isset( $attributes[ $bool_attr ] ) ) {
 				$attributes[ $bool_attr ] = filter_var( $attributes[ $bool_attr ], FILTER_VALIDATE_BOOLEAN );
 			}
 		}
 
+		// Normalize 'engagements' separately: the embed page passes 'show' as a truthy value,
+		// which filter_var() would incorrectly map to false. Treat 'show' as true, then fall
+		// back to standard boolean parsing for all other string representations.
+		if ( isset( $attributes['engagements'] ) && is_string( $attributes['engagements'] ) ) {
+			$attributes['engagements'] = 'show' === $attributes['engagements']
+				? true
+				: filter_var( $attributes['engagements'], FILTER_VALIDATE_BOOLEAN );
+		}
+
 		// Map WPBakery format (lowercase_underscore) to camelCase for backward compatibility.
 		// Check if WPBakery format exists and camelCase doesn't, then use WPBakery format.
 		if ( isset( $attributes['aspect_ratio'] ) && '' !== $attributes['aspect_ratio'] && ( ! isset( $attributes['aspectRatio'] ) || '' === $attributes['aspectRatio'] ) ) {
diff --git a/inc/classes/shortcodes/class-godam-video-gallery.php b/inc/classes/shortcodes/class-godam-video-gallery.php
@@ -296,7 +296,7 @@ public function render( $atts ) {
 				data-date-range="' . esc_attr( $atts['date_range'] ) . '"
 				data-custom-date-start="' . esc_attr( $atts['custom_date_start'] ) . '"
 				data-custom-date-end="' . esc_attr( $atts['custom_date_end'] ) . '"
-				data-engagements="' . esc_attr( $atts['engagements'] ) . '"
+				data-engagements="' . esc_attr( rtgodam_is_engagement_feature_enabled() && $atts['engagements'] ? '1' : '0' ) . '"
 
 			>';
 			foreach ( $query->posts as $video ) {
@@ -334,7 +334,7 @@ public function render( $atts ) {
 				}
 
 				// Check if engagements are enabled for the video.
-				$engagements_enabled      = $atts['engagements'];
+				$engagements_enabled      = rtgodam_is_engagement_feature_enabled() && $atts['engagements'];
 				$item_engagements_enabled = false;
 				if ( $engagements_enabled ) {
 					// Check if the video is transcoded when engagements are enabled.
diff --git a/inc/helpers/custom-functions.php b/inc/helpers/custom-functions.php
diff --git a/inc/templates/video-embed.php b/inc/templates/video-embed.php
diff --git a/pages/godam/components/tabs/VideoSettings/VideoEngagement.jsx b/pages/godam/components/tabs/VideoSettings/VideoEngagement.jsx

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,7 @@ function godam_gallery_v2_get_video_data( $attachment_id ) {`
`254`	`254`	`'data-layout' => $godam_layout,`
`255`	`255`	`'data-ratio' => $godam_view_ratio,`
`256`	`256`	`'data-embed-base-url' => home_url( '/' ),`
	`257`	`+ 'data-engagements' => rtgodam_is_engagement_feature_enabled() && ! empty( $attributes['engagements'] ) ? 'show' : '',`
`257`	`258`	`)`
`258`	`259`	`);`
`259`	`260`