Forms: add field file as paid with custom setup #43177

CGastrell · 2025-04-21T19:40:24Z

Closes #41677
Closes JETPACK-335

Proposed changes:

The changes include a combination of:

register block as plan supported feature (wpcomsh)
register block as plan supported by Jetpack
use default upgrade nudge for dotcom and AT
use wrapped upgrade nudge for self-hosted
customize upgrade nudge looks for self-hosted (debatable)

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)?

Jetpack product discussion

peKye1-1vf-p2

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

No

Testing instructions:

On all cases, test the upgrade flow works and lands on the right plans (for now, personal and above for dotcom, Complete on Jetpack).

Locally:

Build packages/plans, packages/forms, plugins/wpcomsh and plugins/jetpack.
Open the editor, add a form and then insert a File Upload field block. Test with and without add_filter( 'jetpack_block_editor_enable_upgrade_nudge', '__return_true' );

Without the filter (custom styled nudge):

With the filter (as will likely look on dotcom):

Use the PR links to test on sandbox and simple/business sites, you need to checkout 181551-ghe-Automattic/wpcom

Test on AT sites.

github-actions · 2025-04-21T19:41:16Z

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 or WordPress.com Site Helper), and enable the add/field-file-custom-paid-block branch.
To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack add/field-file-custom-paid-block

bin/jetpack-downloader test jetpack-mu-wpcom-plugin add/field-file-custom-paid-block

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-04-21T19:41:29Z

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: May 6, 2025
- Code freeze: May 5, 2025

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

Wpcomsh plugin:

Next scheduled release: Atomic deploys happen twice daily on weekdays (p9o2xV-2EN-p2)

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

jp-launch-control · 2025-04-21T19:52:45Z

Code Coverage Summary

Coverage changed in 3 files.

File	Coverage	Δ%	Δ Uncovered
projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php	95/195 (48.72%)	-1.81%	7 💔
projects/packages/forms/src/blocks/contact-form/components/jetpack-field-file/index.js	0/17 (0.00%)	0.00%	7 💔
projects/packages/forms/src/contact-form/class-contact-form-plugin.php	290/849 (34.16%)	-0.08%	2 ❤️‍🩹

1 file is newly checked for coverage.

File	Coverage
projects/packages/forms/src/blocks/contact-form/components/upsell-nudge/index.js	0/3 (0.00%) 💔

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
.}

projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php

enejb · 2025-04-25T17:14:30Z

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

@@ -530,6 +531,11 @@ public static function gutenblock_render_field_consent( $atts, $content ) {
 	 * @return string HTML for the file upload field.
 	 */
 	public static function gutenblock_render_field_file( $atts, $content ) {
+		if ( apply_filters( 'jetpack_unauth_file_upload_plan_check', true ) && ! Plan::supports( 'field-file' ) ) {


Is this filter just to help with testing?

Testing and development. Setting it to false will allow you to add the block without having to get the upgrade.

We can consider removing the filter entirely once we're done with the development? It's comfy though

enejb

I left a few comments :)

enejb · 2025-04-25T17:17:20Z

projects/plugins/wpcomsh/wpcom-features/class-wpcom-features.php

@@ -704,6 +705,10 @@ class WPCOM_Features {
 			self::WPCOM_BUSINESS_AND_HIGHER_PLANS,
 			self::WPCOM_PRO_PLANS,
 		),
+		self::FIELD_FILE                        => array(
+			self::WPCOM_PERSONAL_AND_HIGHER_PLANS,


I think we should exclude the WOO trial from this.
This way we don't worry about folks that are not paying us and us storing info for free for them.

enejb · 2025-04-25T17:21:25Z

projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php

+			'jetpack_register_gutenberg_extensions',
+			function () {
+				if ( ! apply_filters( 'jetpack_unauth_file_upload_plan_check', true ) ) {
+					\Jetpack_Gutenberg::set_extension_available( 'field-file' );


Instead of having set_extension_available on the Jetpack_Gutenberg here and creating a Jetpack plugin depenency. It would be good to move it to blocks package. Which we already include.
This way we avoid this dependency.

Mmm... I see what you mean, but Blocks depends on Jetpack_Gutenberg. Maybe we can add some set_extension_available on Blocks class, but it feels like duped code and actually out of its scope?

enejb · 2025-04-25T17:23:19Z

projects/packages/forms/src/blocks/contact-form/editor.scss

@@ -50,6 +50,10 @@
 		flex-direction: row;
 		gap: var(--wp--style--block-gap, 1.5rem);

+		& > div {


This rule seems really generic. Should it really apply to all the divs?

It is, it was the only way to make the nudge coexist with our flexbox layout. I could narrow it a bit with:

& > div:first-child

EDIT: scratch that, doesn't work. I was looking at the wrong div. Agreed it is generic, feel free to try alternatives when the nudge is showing, I couldn't think of any other option.

In my testing it doesn't seem to make a difference. What theme are you using? What exactly is the difference?

Without the change:

After change included in this PR:

enejb · 2025-04-25T17:24:45Z

projects/packages/plans/src/class-current-plan.php

@@ -79,6 +79,7 @@ class Current_Plan {
 				'akismet',
 				'payments',
 				'videopress',
+				'field-file', // Forms


Do we need to specific this both places? Once in wpcom_features and here?

I think this takes care of providing the minimum required plan when you are self-hosted or not connected.

I don't think we have a personal plan anymore just complete. See https://cloud.jetpack.com/pricing

Yeah, I think we'll be better off just pointing at complete for now.

enejb · 2025-04-25T19:11:02Z

On my jetpack site the nudge takes me to.

Is this expected? I don't see anything telling about the file upload field. Also I thought I only need to buy Jetpack complete.
The URL end up being - https://wordpress.com/plans/enejdev.jurassic.tube?compare_plans=jetpack_personal,jetpack_backup_t1_yearly,jetpack_anti_spam

enejb · 2025-04-25T19:24:13Z

projects/plugins/jetpack/extensions/index.json

@@ -81,7 +81,8 @@
 		"videopress/video-chapters",
 		"ai-assistant-backend-prompts",
 		"ai-list-to-table-transform",
-		"ai-use-chrome-ai-sometimes"
+		"ai-use-chrome-ai-sometimes",
+		"field-file"


Do we need this here? Since the field-file is not part of the jetpack/extensions package at all.

If we remove it, the process no longer registers the block as intended and there's no plan check, meaning the block appears as free and no nudge is shown. Unsure if there's another way, but all the other plan_check blocks are there (send-a-message, calendly, opentable, simple-payments, etc)

simison · 2025-04-25T20:36:11Z

On my jetpack site the nudge takes me to.

We can make the Dotcom side work first and focus on Jetpack side flows separately.

CGastrell · 2025-04-28T17:53:03Z

On my jetpack site the nudge takes me to.

Is this expected? I don't see anything telling about the file upload field. Also I thought I only need to buy Jetpack complete. The URL end up being - https://wordpress.com/plans/enejdev.jurassic.tube?compare_plans=jetpack_personal,jetpack_backup_t1_yearly,jetpack_anti_spam

After removing the support from Personal plan, the upgrade flow now takes you straight to Complete checkout.

CGastrell requested a review from a team April 21, 2025 19:40

CGastrell self-assigned this Apr 21, 2025

github-actions bot added [Block] Contact Form Form block (also see Contact Form label) [Feature] Contact Form labels Apr 21, 2025

CGastrell added the [Type] Feature Development of a new feature label Apr 22, 2025

CGastrell force-pushed the add/field-file-custom-paid-block branch 2 times, most recently from 0bd1c60 to e208d8c Compare April 24, 2025 16:49

github-actions bot added the [Plugin] Wpcomsh label Apr 24, 2025

CGastrell force-pushed the add/field-file-custom-paid-block branch from e24793e to d807a98 Compare April 24, 2025 19:04

CGastrell added 12 commits April 25, 2025 11:17

Forms: register File Upload field with plan_check

5e7b47c

whitespace fix

0276fb5

use custom paywall for the field-file block

b75bd78

use filter to check if we should check for plan/feature

d6018e9

split code for upgrade nudge, use shared component with tweaked css

1624c9e

implement nudges depending on upgrade_nudge filter

a1877fe

changelog

05b294e

try to fix phan complains

a858877

adding plans composer dependency, trying to fix phan checks

bee9a47

add jetpack-gutenberg class parser for phan

9ba24c3

updating monorepo composer lock file

4807def

rebase and merge conflicts for composer lock

46d67e4

use filter to determine if plan_check should be true

141cdc3

CGastrell force-pushed the add/field-file-custom-paid-block branch from bf9f993 to 141cdc3 Compare April 25, 2025 14:18

enejb reviewed Apr 25, 2025

View reviewed changes

projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php Outdated Show resolved Hide resolved

enejb reviewed Apr 25, 2025

View reviewed changes

CGastrell added 3 commits April 25, 2025 14:31

add some context on features file

05e5977

do not use anonymous functions

7f83305

remove box-shadow for is-beta-extension

aeec2a6

enejb reviewed Apr 25, 2025

View reviewed changes

remove field-file support from personal plan

3a45d9b

CGastrell requested a review from enejb April 28, 2025 17:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Forms: add field file as paid with custom setup #43177

Forms: add field file as paid with custom setup #43177

CGastrell commented Apr 21, 2025 •

edited

Loading

github-actions bot commented Apr 21, 2025 •

edited

Loading

github-actions bot commented Apr 21, 2025 •

edited

Loading

jp-launch-control bot commented Apr 21, 2025 •

edited

Loading

enejb Apr 25, 2025

CGastrell Apr 25, 2025 •

edited

Loading

CGastrell Apr 25, 2025

enejb left a comment

enejb Apr 25, 2025

enejb Apr 25, 2025

CGastrell Apr 25, 2025

enejb Apr 25, 2025

CGastrell Apr 25, 2025 •

edited

Loading

enejb Apr 25, 2025

CGastrell Apr 25, 2025

enejb Apr 25, 2025

CGastrell Apr 25, 2025

enejb Apr 25, 2025

CGastrell Apr 25, 2025

enejb commented Apr 25, 2025

enejb Apr 25, 2025

CGastrell Apr 25, 2025

simison commented Apr 25, 2025

CGastrell commented Apr 28, 2025

Forms: add field file as paid with custom setup #43177

Are you sure you want to change the base?

Forms: add field file as paid with custom setup #43177

Conversation

CGastrell commented Apr 21, 2025 • edited Loading

Proposed changes:

Other information:

Jetpack product discussion

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

Testing instructions:

github-actions bot commented Apr 21, 2025 • edited Loading

github-actions bot commented Apr 21, 2025 • edited Loading

jp-launch-control bot commented Apr 21, 2025 • edited Loading

Code Coverage Summary

Choose a reason for hiding this comment

CGastrell Apr 25, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

enejb left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CGastrell Apr 25, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

enejb commented Apr 25, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

simison commented Apr 25, 2025

CGastrell commented Apr 28, 2025

CGastrell commented Apr 21, 2025 •

edited

Loading

github-actions bot commented Apr 21, 2025 •

edited

Loading

github-actions bot commented Apr 21, 2025 •

edited

Loading

jp-launch-control bot commented Apr 21, 2025 •

edited

Loading

CGastrell Apr 25, 2025 •

edited

Loading

CGastrell Apr 25, 2025 •

edited

Loading