feat(membership-plans): improvements by adekbadek · Pull Request #110 · Automattic/newspack-network

adekbadek · 2024-07-08T08:21:43Z

All Submissions:

Have you followed the Newspack Contributing guideline?
Does your code follow the WordPress' coding standards and VIP Go coding standards?
Have you checked to ensure there aren't other open Pull Requests for the same update/change?

Changes proposed in this Pull Request:

Some tweaks to the Membership Plans table:

Wording changes (e.g. "Active Members" -> "Active Memberships")
Adds an "Active Subscriptions" column:

Enables table sorting by Network ID
Removes "Links" column in favour of linking with the plan name

(Note: this is a part of integrating the changes from the data-integrity-improvements branch (#89))

How to test the changes in this Pull Request:

Set NEWSPACK_NETWORK_EXPERIMENTAL_AUDITING_FEATURES env variable to true
Visit the "Membership Plans" view on the Hub site and observe the changes listed above

Other information:

Have you added an explanation of what your changes do and why you'd like us to include them?
Have you written new tests for your changes, as applicable?
Have you successfully ran tests with your changes locally?

chickenn00dle

I tried following the testing steps but was only able to confirm the second two points. I am not seeing the Active Memberships or Active Subscriptions columns though:

Am I missing a step to test this?

adekbadek · 2024-07-15T06:55:59Z

Yes, sorry! I've update the testing step. What's missing is the NEWSPACK_NETWORK_EXPERIMENTAL_AUDITING_FEATURES env variable.

chickenn00dle

Thanks @adekbadek!

Tested again and it looks to be working as expected 👍

I left a few small bits of feedback and questions, then this should be good to go.

chickenn00dle · 2024-07-16T16:53:36Z

includes/woocommerce-memberships/class-admin.php

+	public static function add_data_to_wc_user_membership_response( $response, $user, $request ) {
+		if ( $request && isset( $request->get_headers()['x_np_network_signature'] ) ) {
+			// Add network plan ID to the response.
+			$plan = wc_memberships_get_membership_plan( $response->data['plan_id'] );


Looks like wc_memberships_get_membership_plan can return false, so we will probably need to check the value of $plan before adding to response data.

Fixed in a4ab6df

chickenn00dle · 2024-07-16T16:59:53Z

includes/hub/admin/class-membership-plans.php

+				$query_args['include_active_members_emails'] = 1;
+			}
+			$node_plans = self::fetch_collection_from_api( $node, 'wc/v2/memberships/plans', 'membership-plans', $query_args );
 			foreach ( $node_plans as $plan ) {


Getting the following warning on this line:

PHP Warning: foreach() argument must be of type array|object, null given in /Users/raz/Sites/newspack/network/includes/hub/admin/class-membership-plans.php on line 129

Fixed in a4ab6df

chickenn00dle · 2024-07-16T17:01:06Z

includes/hub/admin/class-membership-plans.php

 			$endpoint,
 			[
 				'headers' => $node->get_authorization_headers( 'get-woo-' . $collection_endpoint_id ),
+				'timeout' => 60, // phpcs:ignore


nonblocking nit: Does the default not work here?

What do you mean? Default timeout is 5.

Ah. Whoops. For some reason I thought this was 30. Nevermind!

chickenn00dle · 2024-07-16T17:05:46Z

includes/hub/admin/class-membership-plans-table.php

+		$order = $_REQUEST['order'] ?? false; // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+		$orderby = $_REQUEST['orderby'] ?? false; // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized


Can we sanitize these to address the WordPress.Security.ValidatedSanitizedInput.InputNotSanitized warning?

Done in a4ab6df

# [1.10.0-alpha.1](v1.9.2...v1.10.0-alpha.1) (2024-07-19) ### Features * **membership-plans:** improvements ([#110](#110)) ([f994478](f994478)) * user discrepancies display ([#100](#100)) ([a054967](a054967)) * **users:** bulk user network sync ([d1e9533](d1e9533))

matticbot · 2024-07-19T14:09:34Z

🎉 This PR is included in version 1.10.0-alpha.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

# [1.10.0](v1.9.2...v1.10.0) (2024-07-30) ### Features * **membership-plans:** improvements ([#110](#110)) ([f994478](f994478)) * user discrepancies display ([#100](#100)) ([a054967](a054967)) * **users:** bulk user network sync ([d1e9533](d1e9533))

matticbot · 2024-07-30T07:44:37Z

🎉 This PR is included in version 1.10.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

feat(memberships-view): display discrepancies; UX improvements

e7f74cf

adekbadek added the [Status] Needs Review label Jul 8, 2024

adekbadek requested a review from a team as a code owner July 8, 2024 08:21

adekbadek changed the title ~~feat(memberships-view): display discrepancies; UX improvements~~ feat(membership-plans): improvements Jul 8, 2024

chickenn00dle reviewed Jul 12, 2024

View reviewed changes

adekbadek requested a review from chickenn00dle July 15, 2024 06:56

chickenn00dle requested changes Jul 16, 2024

View reviewed changes

fix: assorted fixes

a4ab6df

adekbadek requested a review from chickenn00dle July 17, 2024 07:56

chickenn00dle approved these changes Jul 17, 2024

View reviewed changes

adekbadek merged commit f994478 into trunk Jul 17, 2024

adekbadek deleted the feat/membership-discrepancies-tweaks branch July 17, 2024 17:44

matticbot added the released on @alpha label Jul 19, 2024

matticbot added the released label Jul 30, 2024

		$order = $_REQUEST['order'] ?? false; // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
		$orderby = $_REQUEST['orderby'] ?? false; // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized

Conversation

adekbadek commented Jul 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

All Submissions:

Changes proposed in this Pull Request:

How to test the changes in this Pull Request:

Other information:

Uh oh!

chickenn00dle left a comment

Choose a reason for hiding this comment

Uh oh!

adekbadek commented Jul 15, 2024

Uh oh!

chickenn00dle left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

matticbot commented Jul 19, 2024

Uh oh!

matticbot commented Jul 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

adekbadek commented Jul 8, 2024 •

edited

Loading