Forms: Remove classic Admin initialization and migrate functionality #46254

CGastrell · 2025-12-10T14:29:41Z

This is a rebase of #44538 but decided to open a new PR so to not mess with the original changes.

Proposed changes:

Deprecates the Admin::init() method in the Forms package as part of migrating away from the classic admin interface
Removes the call to Admin::init() from Util::init() to stop initializing the deprecated classic admin functionality
Migrates Google Drive export functionality from the deprecated Admin class to Contact_Form_Plugin class where it belongs
Adds comprehensive test coverage for:
- Verifying Admin::init() is no longer called during initialization
- Testing deprecation warnings are properly implemented
- Validating export functionality delegation works correctly
- Ensuring security validation in export methods
Updates Phan baseline to reflect code changes

Other information:

Have you written new tests for your changes, if applicable?
Have you checked the E2E test CI results, and verified that your changes do not break them?
Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Does this pull request change what data or activity we track or use?

No

Testing instructions:

Test that Forms functionality still works:

In your Docker environment, go to Jetpack > Forms
Verify that you can still view form responses
Verify that CSV export still works by clicking the "Export" button and choosing "CSV"
If you have Google Drive connected, verify that Google Drive export still works

Test that deprecated code triggers warnings (optional):

In your test environment with WP_DEBUG enabled, add this code to call the deprecated method:

add_action('init', function() {
    \Automattic\Jetpack\Forms\ContactForm\Admin::init();
});

Check debug.log for deprecation warnings
Remove the test code when done

Test that classic admin is no longer initialized:

Run the new unit tests: jetpack test projects/packages/forms -- --filter=Util_Test
Verify all tests pass, especially the new tests that check Admin::init() is not called

github-actions · 2025-12-10T14:30:46Z

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

To test on WoA, go to the Plugins menu on a WoA dev site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin (Jetpack), and enable the remove/forms-old-admin-2 branch.
To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack remove/forms-old-admin-2

Interested in more tips and information?

In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
Read more about our development workflow here: PCYsg-eg0-p2
Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

github-actions · 2025-12-10T14:30:52Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Review, ...).
✅ Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

Follow this PR Review Process:

Ensure all required checks appearing at the bottom of this PR are passing.
Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
You can use GitHub's Reviewers functionality to request a review.
When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

WordPress.com Simple releases happen as soon as you deploy your changes after merging this PR (PCYsg-Jjm-p2).
WoA releases happen weekly.
Releases to self-hosted sites happen monthly:
- Scheduled release: January 6, 2026

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

jp-launch-control · 2025-12-10T14:41:08Z

Code Coverage Summary

Coverage changed in 4 files.

File	Coverage	Δ%	Δ Uncovered
projects/packages/forms/src/contact-form/class-contact-form-plugin.php	471/1438 (32.75%)	-1.11%	47 💔
projects/packages/forms/src/contact-form/class-editor-view.php	0/156 (0.00%)	0.00%	-1 💚
projects/packages/forms/src/contact-form/class-util.php	46/175 (26.29%)	7.64%	-15 💚
projects/packages/forms/src/contact-form/class-admin.php	0/747 (0.00%)	0.00%	-54 💚

Full summary · PHP report · JS report

_{Coverage check overridden by

Coverage tests to be added later
Use to ignore the Code coverage requirement check when tests will be added in a follow-up PR
.}

edanzer · 2025-12-10T16:32:29Z

projects/packages/forms/src/contact-form/class-contact-form-plugin.php

+	 * @var string The nonce field name for GDrive export.
+	 */
+	private $export_nonce_field_gdrive = 'feedback_export_nonce_gdrive';
+


I wonder if it makes any sense to move all the Google drive logic to the Google_Drive class that was created in August? That's in forms/src/services/.

I guess it would? But I'm also on the side of sticking to what we have tested and worked well. We can always follow up or find optimizations, specially in terms of code readability and organization. I just wanted to stay as simple as possible, after all, this is janitorial and not meant to take so much of us.

That said, feel free to push changes and add tests or test instructions. Or create a PR branching out of this one if that helps as a "follow up reminder".

Copilot

Pull request overview

This PR deprecates the classic Admin initialization in the Forms package by removing the Admin::init() call from Util::init() and migrating the Google Drive export functionality to the Contact_Form_Plugin class. The changes improve code organization by centralizing export functionality and fix a bug in Google Drive export where array indices weren't checked before access.

Key changes:

Removed Admin::init() call from Util::init() to stop initializing deprecated classic admin functionality
Migrated export_to_gdrive() method from Admin class to Contact_Form_Plugin with improved array handling
Added comprehensive test coverage validating the deprecation and migration

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
projects/packages/forms/src/contact-form/class-util.php	Removes the conditional call to `Admin::init()` to stop initializing classic admin functionality
projects/packages/forms/src/contact-form/class-admin.php	Marks `init()` and `export_to_gdrive()` as deprecated with delegation to new implementation; removes AJAX handler registrations for export functions
projects/packages/forms/src/contact-form/class-contact-form-plugin.php	Adds `export_to_gdrive()` method with improved array index checking and registers AJAX handler for Google Drive export
projects/packages/forms/src/contact-form/class-editor-view.php	Removes unnecessary removal of Admin media button action since Admin is no longer initialized
projects/packages/forms/tests/php/contact-form/Util_Test.php	Adds comprehensive tests for Admin deprecation, hook registration validation, export delegation, and security checks
projects/packages/forms/.phan/baseline.php	Updates Phan baseline to reflect deprecated function usage in tests and removed type mismatch suppression
projects/packages/forms/changelog/remove-forms-old-admin	Adds changelog entry for Forms package marking change as major/removed
projects/plugins/jetpack/changelog/remove-forms-old-admin	Adds changelog entry for Jetpack plugin marking change as major/bugfix

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

projects/packages/forms/src/contact-form/class-admin.php

projects/packages/forms/src/contact-form/class-contact-form-plugin.php

Co-authored-by: Copilot <[email protected]>

Copilot

Pull request overview

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

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-12-10T18:25:36Z

projects/packages/forms/src/contact-form/class-admin.php


 		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
 		add_action( 'admin_footer-edit.php', array( $this, 'print_export_modal' ) );
-
-		add_action( 'wp_ajax_grunion_export_to_gdrive', array( $this, 'export_to_gdrive' ) );
-		add_action( 'wp_ajax_grunion_gdrive_connection', array( $this, 'test_gdrive_connection' ) );
 	}


The removal of the wp_ajax_grunion_gdrive_connection action registration breaks the Google Drive connection polling functionality. The JavaScript code in grunion-admin.js (line 219) still calls this AJAX action via startPollingConnection(), but the endpoint is no longer registered.

This action handler should be migrated to Contact_Form_Plugin class (similar to how export_to_gdrive was migrated), and the test_gdrive_connection method should either be migrated or deprecated with delegation.

@CGastrell - I'm curious about this too. Do/will we still need the logic and hook for test_gdrive_connection?

…p 7.2/3/4 seem to be failing at it

edanzer · 2025-12-10T22:29:57Z

projects/packages/forms/src/contact-form/class-admin.php

-			),
-			200,
-			JSON_UNESCAPED_SLASHES
-		);


Test results:

Sanity check that menu items and dashboard work as expected

Confirm CSV exports work

Confirm Google Drive exports work

Confirm that if I add code to call Admin::init() directly, I do get deprecation notices in debug.log

Confirm tests pass

Notes:

The PR description says "Fixes issue with CSV column array building to handle empty values properly by checking if array index exists before accessing", but I don't think the PR actually makes any changes for this?

The testing instructions say go to Dashboard → Feedback → Select a form... but we don't load a Feedback menu item or page anymore. If I try to load that page directly, I'm just redirected to our new forms dashboard. Also, when on our forms dashboard, you can't select a form when on the Jetpack > Forms page. So I wasn't quite sure what this was asking?

CGastrell self-assigned this Dec 10, 2025

CGastrell added the [Type] Janitorial label Dec 10, 2025

github-actions bot added [Feature] Contact Form [Tests] Includes Tests labels Dec 10, 2025

github-actions bot added [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. and removed [Status] Needs Review This PR is ready for review. labels Dec 10, 2025

CGastrell added [Status] Needs Review This PR is ready for review. and removed [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. labels Dec 10, 2025

CGastrell mentioned this pull request Dec 10, 2025

Remove contact form legacy admin files #46255

Open

3 tasks

edanzer reviewed Dec 10, 2025

View reviewed changes

CGastrell force-pushed the remove/forms-old-admin-2 branch from b02867b to 5e3b45a Compare December 10, 2025 16:50

CGastrell requested a review from Copilot December 10, 2025 16:50

Copilot started reviewing on behalf of CGastrell December 10, 2025 16:51 View session

Copilot AI reviewed Dec 10, 2025

View reviewed changes

projects/packages/forms/src/contact-form/class-admin.php Show resolved Hide resolved

projects/packages/forms/src/contact-form/class-contact-form-plugin.php Show resolved Hide resolved

enejb and others added 8 commits December 10, 2025 15:17

Forms: Depreacte Classic Admin

2efd4ca

changelog

75423ad

move gdrive export to plugin class

2cd7387

We don't need to move this method.

d0b67b2

Deprecate the method.

a9e2ff7

Fixes for phan

b1bc9b9

Update phan baseline

c777be5

Code clean up

d61b1fc

CGastrell and others added 7 commits December 10, 2025 15:17

add tests and phan baseline to allow deprecated function call

4f6e184

add tests for export_to_gdrive delegation

11296d4

Apply suggestion from @Copilot

c2eb35d

Co-authored-by: Copilot <[email protected]>

reinstate csv column array building even on empty values

91eeaa9

fix after rebase

3cdf870

update phan baseline

dc9401f

esc values going into the sheet, fix json encode flag requirement

88d3d32

CGastrell force-pushed the remove/forms-old-admin-2 branch from 5f9f218 to 88d3d32 Compare December 10, 2025 18:17

CGastrell requested a review from Copilot December 10, 2025 18:19

Copilot started reviewing on behalf of CGastrell December 10, 2025 18:20 View session

Copilot AI reviewed Dec 10, 2025

View reviewed changes

CGastrell force-pushed the remove/forms-old-admin-2 branch 2 times, most recently from a602e8e to 88d3d32 Compare December 10, 2025 19:04

try a different approach for the test for validating gdrive nonce, ph…

de0af73

…p 7.2/3/4 seem to be failing at it

edanzer reviewed Dec 10, 2025

View reviewed changes

edanzer approved these changes Dec 10, 2025

View reviewed changes

CGastrell merged commit 56181cc into trunk Dec 11, 2025
69 of 70 checks passed

CGastrell deleted the remove/forms-old-admin-2 branch December 11, 2025 12:37

github-actions bot added this to the jetpack/15.4 milestone Dec 11, 2025

github-actions bot removed the [Status] Needs Review This PR is ready for review. label Dec 11, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Forms: Remove classic Admin initialization and migrate functionality #46254

Forms: Remove classic Admin initialization and migrate functionality #46254

Uh oh!

CGastrell commented Dec 10, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Dec 10, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Dec 10, 2025 •

edited

Loading

Uh oh!

jp-launch-control bot commented Dec 10, 2025 •

edited

Loading

Uh oh!

edanzer Dec 10, 2025

Uh oh!

CGastrell Dec 10, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Dec 10, 2025

Uh oh!

edanzer Dec 10, 2025

Uh oh!

edanzer Dec 10, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Forms: Remove classic Admin initialization and migrate functionality #46254

Forms: Remove classic Admin initialization and migrate functionality #46254

Uh oh!

Conversation

CGastrell commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes:

Other information:

Does this pull request change what data or activity we track or use?

Testing instructions:

Test that Forms functionality still works:

Test that deprecated code triggers warnings (optional):

Test that classic admin is no longer initialized:

Uh oh!

github-actions bot commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jp-launch-control bot commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Coverage Summary

Uh oh!

edanzer Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

CGastrell Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

edanzer Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

edanzer Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

CGastrell commented Dec 10, 2025 •

edited

Loading

github-actions bot commented Dec 10, 2025 •

edited

Loading

github-actions bot commented Dec 10, 2025 •

edited

Loading

jp-launch-control bot commented Dec 10, 2025 •

edited

Loading