Skip to content

Sync Develop to Main for 1.4.3#1237

Merged
subodhr258 merged 16 commits into
mainfrom
develop
Oct 9, 2025
Merged

Sync Develop to Main for 1.4.3#1237
subodhr258 merged 16 commits into
mainfrom
develop

Conversation

@subodhr258
Copy link
Copy Markdown
Collaborator

@subodhr258 subodhr258 commented Oct 8, 2025

Sync for Release 1.4.3 - #1232

subodhr258 and others added 16 commits September 25, 2025 18:24
Sync Main to Dev after 1.4.2
* fix: avoid replacing jetpack form when not using ajax

* fix: jetpack form comment
* FIX: Removes the Analytics page menu link.

* FIX: Added strict comparison

* FIX: Remove Analytics page only.

* FIX: Remove Analytics page menu appearance using css.

Revert previous code to prevent other menu items being removed. Remove the Analytics menu item using targeted CSS

* FEAT: Remove Settings page access from Authors and Contributors roles
* Remove videojs import from analytics source and expose videojs globally

* Load fontawesome icons async and add load ima3 script in defer mode

---------

Co-authored-by: KMchaudhary <kuldipkumar.chaudhary@rtcamp.com>
* Enqueue the player skin styles conditionally

* code quality

---------

Co-authored-by: KMchaudhary <kuldipkumar.chaudhary@rtcamp.com>
* feat: replace icon imports with SVG components for audio, gallery, and player blocks

* feat: replace icon imports for block editor view in edit.js

---------

Co-authored-by: Subodh Rajpopat <subodh.rajpopat@rtcamp.com>
* fix: Correct event dispatching logic in updateSelectDropdown function

* fix: Adjust padding for tree container and remove min-height from media library styles
* feat: Add GTM Tracking feature for analytics

* fix: GTM dataLayer condition

* fix: Add filename as backup for video_title
* Add edit media capability check and show proper message on video editor tool

* Remove redudant code

* docs: Copilot comments

---------

Co-authored-by: KMchaudhary <kuldipkumar.chaudhary@rtcamp.com>
Co-authored-by: Subodh Rajpopat <subodh.rajpopat@rtcamp.com>
* FEAT: Prevent rendering video actions and thumbnails for non access users.

* FEAT: Prevent visiting video editor for non access users.

* FIX: Admin not able to view others post.

* REFACTOR: Create common utility function for `canManageAttachment` check.

* FIX: Type cast to number before comparing.

* FIX: Prevent clicking on media item if not access.

* FIX: Remove commented code.

* FEAT: Remove `Retranscode Media` button if the user cannot manage options.

* FEAT: Remove `GoDAM` menu to users having `Contributor` or below roles.
…scoding for local environment (#1215)

* Add rtgodam_is_local_environment function and restrict the media transcoding for local environment

* Fix typos

* Add code quality changes

* Remove redudant code, that not solve problem fully

* Replace the local env check position

* Add proper error message for media transcoding failure for local development environment

---------

Co-authored-by: KMchaudhary <kuldipkumar.chaudhary@rtcamp.com>
* Refactor the GoDAM pages permission for core users roles

* FEAT: Show only analytics to the `Author` user if cannot manage attachment.

* FEAT: Tools page is visible to editor and above.

* FEAT: Retranscode button on media library available to Editor and above roles

* FEAT: Hide `Customise Video` button on Block editor if user cannot manage the media.

* Change the video migration REST endpoint permission from manage_options to edit_pages

* Remove commented code

---------

Co-authored-by: KMchaudhary <kuldipkumar.chaudhary@rtcamp.com>
Co-authored-by: Vipul Patil <vipulrpatil.8@gmail.com>
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR synchronizes the develop branch to main for version 1.4.3, introducing several key enhancements and fixes to the GoDAM video management plugin.

Key changes:

  • Added GTM (Google Tag Manager) video tracking functionality with configurable settings
  • Enhanced user permission management with granular access controls for different user roles
  • Implemented localhost environment detection to prevent transcoding requests in development
  • Fixed various UI/UX issues including video editor styling and quality selector improvements

Reviewed Changes

Copilot reviewed 37 out of 40 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
pages/video-editor/attachment-picker.scss Added height styling for video editor root container
pages/tools/components/tabs/RetranscodeTab.jsx Added whitespace handling for log display
pages/media-library/index.scss Updated overflow and padding for better layout
pages/media-library/data/media-grid.js Fixed JavaScript syntax error with misplaced brace
pages/godam/redux/slice/media-settings.js Added GTM tracking setting to initial state
pages/godam/components/tabs/GeneralSettings/GeneralSettings.jsx Added GTM tracking toggle control
inc/templates/godam-player.php Added video title data attribute for tracking
inc/helpers/custom-functions.php Added localhost environment detection function
inc/classes/rest-api/class-video-migration.php Changed permission from manage_options to edit_pages
inc/classes/rest-api/class-transcoding.php Added localhost environment check for transcoding
inc/classes/rest-api/class-settings.php Added GTM tracking setting handling
inc/classes/rest-api/class-media-library.php Fixed virtual media marker timing issue
inc/classes/class-pages.php Enhanced permission checks and user capability validation
inc/classes/class-media-library-ajax.php Added localhost check for media upload
inc/classes/class-assets.php Added GTM tracking setting and improved script loading
assets/src/js/media-library/views/filters/media-retranscode.js Added permission check for retranscode button
assets/src/js/media-library/views/attachment-detail-two-column.js Enhanced button visibility based on user permissions
assets/src/js/media-library/utility.js Added new permission checking functions
assets/src/js/jetpack-form.js Improved form handling with conditional class check
assets/src/js/godam-player/videoPlayer.js Added quality selector setup functionality
assets/src/js/godam-player/managers/playerManager.js Made videojs globally accessible
assets/src/js/godam-player/managers/eventsManager.js Added quality levels event handling
assets/src/js/godam-player/gtm-video-tracker.js New GTM video tracking implementation
assets/src/js/godam-player/frontend.js Optimized FontAwesome loading with async imports
assets/src/js/godam-player/analytics.js Integrated GTM tracking functionality
assets/src/css/admin.scss Updated menu hiding and added error page styling
assets/src/blocks/godam-player/utils/index.js Added SEO data validation function
assets/src/blocks/godam-player/render.php Added conditional skin style loading
assets/src/blocks/godam-player/index.js Updated block icon
assets/src/blocks/godam-player/edit.js Enhanced SEO handling and permission checks
assets/src/blocks/godam-player/components/VideoSEOModal.js Improved SEO modal data handling
assets/src/blocks/godam-player/block.json Optimized style loading
assets/src/blocks/godam-gallery/index.js Updated block icon
assets/src/blocks/godam-audio/index.js Updated block icon
assets/src/blocks/godam-audio/edit.js Updated block icon
admin/godam-transcoder-functions.php Removed deprecated blacklist function
admin/class-rtgodam-transcoder-handler.php Enhanced transcoding with virtual media and localhost checks
Comments suppressed due to low confidence (1)

pages/media-library/data/media-grid.js:1

  • There appears to be an incorrect brace placement. Line 40 has a closing brace that doesn't match the opening structure, and line 52 has an extra closing brace. The function should have proper brace matching.
/**

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

Comment thread assets/src/js/godam-player/gtm-video-tracker.js
@subodhr258 subodhr258 merged commit 689f0f9 into main Oct 9, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants