Rsvp form token field #522

jmarx · 2024-01-29T21:20:45Z

Description of the Change

Administrators can now add/remove attendees to events.

Closes #485

How to test the Change

Changelog Entry

Added - New feature

Credits

Props @linusx @jmarx @mauteri

Checklist:

I agree to follow this project's Code of Conduct.
I have updated the documentation accordingly.
I have added tests to cover my change(pending).
All new and existing tests pass(pending).

…event to respond to changes

…php side

jmarx · 2024-01-29T21:22:49Z

@mauteri I am throwing this pr up here as this is as far as I got. It includes most of the heavy lifting we need to do here. I have a tight week and off to AZ for a week. So I figured maybe someone could work on it in case I can't get back to it until I return next week.

mauteri · 2024-02-03T20:07:03Z

includes/core/classes/class-rest-api.php

@@ -251,7 +251,7 @@ protected function events_list_route(): array {
 	 * @return bool True if the parameter is a valid RSVP status, false otherwise.
 	 */
 	public function validate_rsvp_status( $param ): bool {
-		return ( 'attend' === $param || 'attending' === $param || 'not_attending' === $param );
+		return ( 'attend' === $param || 'attending' === $param || 'not_attending' === $param || 'remove' === $param );


I was thinking of remove when I was working on anonymous feature. I ended up just going with attend so we don't have to add another status. This can be confusing though for removal.

I think we can update things a bit and remove attend and remove and replace it with no_status. I think that word can be used in both cases without confusion.

PR to update this #525

mauteri · 2024-02-03T21:53:04Z

includes/core/classes/class-rest-api.php

@@ -646,6 +647,10 @@ public function update_rsvp( WP_REST_Request $request ): WP_REST_Response {
 			}
 		}

+		if ( $status === 'remove') {
+			$event->rsvp->remove( $user_id, $responses );


This can be just $event->rsvp->remove( $user_id ); In the database user id and post id are the 2 unique fields to remove an RSVP. When the RSVP class is instantiated here, it is done so by an event, so you have that in the object that you can use. This will also be faster so you don't need to loop through the responses.

mauteri · 2024-02-03T21:53:54Z

includes/core/classes/class-rsvp.php

+ 	 * @param int $user_id The ID of the user to remove the RSVP for.
+ 	 * @param array $responses Array of RSVP responses containing the entry to remove.
+ 	 */
+	public function remove( int $user_id, array $responses ) {


See comments above. Remove responses. Let's have this return boolean based on success.

public function remove( int $user_id ): bool {

mauteri · 2024-02-03T21:56:14Z

includes/core/classes/class-rsvp.php

+ 	 */
+	public function remove( int $user_id, array $responses ) {
+		if ( ! current_user_can( 'edit_posts' ) ) {
+			return $responses;


return false;

mauteri · 2024-02-03T21:58:23Z

includes/core/classes/class-rsvp.php

+					$result = $wpdb->delete( $table, array( 'user_id' => $value['id'] ) );
+				}
+		}
+		return $responses;


Lines 143 to 150 can simply be something like...

global $wpdb; $table = sprintf( static::TABLE_FORMAT, $wpdb->prefix ); return $wpdb->delete( $table, array( 'post_id' => $this->event->ID, 'user_id' => $user_id ) );

@mauteri wpdb->delete will return an int on success, not boolean. Might have to check the $result if false, otherwise return true. Also, this is in a loop of responses. So adding a return in here will kill the loop.

@linusx Missed this response earlier. You don't need a loop as you have the post ID. With that and the user ID, you just add those to your where and delete.

If it returns 1 then we just need to force bool on that return then so it matches type.

(cc @jmarx)

mauteri · 2024-02-04T03:19:54Z

src/blocks/rsvp-response/edit.js

+				<BlockControls>
+					<ToolbarGroup>
+						<ToolbarButton
+							label="Edit Attendees"


Change to just Edit. Make sure to add to translation function. {__('Edit', 'gatherpress')}. Super important we do this. We already have the plugin translated to 3 languages and we'll need to update when this feature goes out to ensure text is translated.

mauteri · 2024-02-04T03:20:15Z

src/blocks/rsvp-response/edit.js

+							label="Edit Attendees"
+							text={
+								editMode
+									? 'Preview Attendees'


Change to Preview. Add translation function.

mauteri · 2024-02-04T03:20:27Z

src/blocks/rsvp-response/edit.js

+							text={
+								editMode
+									? 'Preview Attendees'
+									: 'Edit Attendees'


Change to Edit. Add translation function.

mauteri · 2024-02-04T03:23:36Z

src/components/RsvpResponse.js

-	if (!items.some((item) => item.value === rsvpStatus)) {
-		setRsvpStatus(defaultStatus);
-	}
-


Looks like this file got messed up. These changes should remain. Think something happened when you updated from main after I pushed code. Looks like the file can just be reverted to what's on main.

mauteri · 2024-02-06T17:14:32Z

includes/core/classes/class-rsvp.php

+ 	 * @param array $responses Array of RSVP responses containing the entry to remove.
+	 * @return bool True if the RSVP was removed, false otherwise.
+ 	 */
+	public function remove( int $user_id, array $responses ): bool {


Don't need to pass $responses just pass $user_id. The only 2 pieces of data you need to remove someone is their user ID and the post ID. The object knows the post ID.

mauteri · 2024-02-06T17:16:15Z

includes/core/classes/class-rest-api.php

@@ -620,6 +620,7 @@ public function update_rsvp( WP_REST_Request $request ): WP_REST_Response {
 		$guests          = intval( $params['guests'] );
 		$anonymous       = intval( $params['anonymous'] );
 		$event           = new Event( $post_id );
+		$responses       = $event->rsvp->responses();


don't need $responses can remove this.

mauteri · 2024-02-06T17:17:11Z

includes/core/classes/class-rest-api.php

@@ -641,7 +642,7 @@ public function update_rsvp( WP_REST_Request $request ): WP_REST_Response {
 		if (
 			$user_id &&
 			is_user_member_of_blog( $user_id ) &&
-			! $event->has_event_past()
+			! $event->has_event_past() && ( 'remove' !== $status )


change remove to no_status

mauteri · 2024-02-06T17:17:25Z

includes/core/classes/class-rest-api.php

@@ -650,6 +651,10 @@ public function update_rsvp( WP_REST_Request $request ): WP_REST_Response {
 			}
 		}

+		if ( 'remove' !== $status ) {


change remove to no_status

mauteri · 2024-02-06T17:19:14Z

includes/core/classes/class-rsvp.php

+					$result = $wpdb->delete( $table, array( 'user_id' => $value['id'] ) );
+				}
+		}
+		return true;


lines 144-151 can just be

global $wpdb; $table = sprintf( static::TABLE_FORMAT, $wpdb->prefix ); return $wpdb->delete( $table, array( 'post_id' => $this->event->ID, 'user_id' => $user_id ) );

@mauteri I just removed the remove function and wrapped it all in with the save function.

mauteri · 2024-02-06T17:22:24Z

includes/core/classes/class-rsvp.php

+					$result = $wpdb->delete( $table, array( 'user_id' => $value['id'] ) );
+				}
+		}
+		return $responses;


@linusx Missed this response earlier. You don't need a loop as you have the post ID. With that and the user ID, you just add those to your where and delete.

If it returns 1 then we just need to force bool on that return then so it matches type.

(cc @jmarx)

jmarx added 11 commits January 26, 2024 08:32

WIP: Add ability to edit attendees

c26459a

Use formtoken field to pull in current attendees. And set up a click …

62edc43

…event to respond to changes

WIP: Backend logic works for removing user

2d7f92c

Document method and return responses

1926d9b

Merge branch 'main' into rsvp-form-token-field

192031c

Put back status mistakenly removed

6dd618c

Use state to update tokens

6e06149

Correctly filter user id from passed tokens

34c40a2

Refactor js to avoid multiple uses of camel case; Add permissions to …

e158845

…php side

Another refactor to simplify code

4a40e34

Put back code mistakenly removed

4105144

linusx and others added 3 commits January 30, 2024 17:11

added ability to update rsvp in the block

86790a8

Add permission check to edit button

06d4117

Fix some lint issues

64acbca

mauteri reviewed Feb 3, 2024

View reviewed changes

mauteri requested changes Feb 3, 2024

View reviewed changes

mauteri requested changes Feb 4, 2024

View reviewed changes

updating from comments and lint

c36656b

jmarx requested a review from mauteri February 5, 2024 22:46

mauteri and others added 6 commits February 6, 2024 12:07

Update branch with main and fix conflicts.

ed04cdb

Update removal with global object changes

d23e784

Update tabs

af4b0ee

More linter crap

f2a3335

foreach space

8d4c2a2

Add ignore line

1d9fc04

mauteri requested changes Feb 6, 2024

View reviewed changes

jmarx added 3 commits February 6, 2024 18:48

One more ignore line for no caching

9d3d444

Remove remove method and wrap it in with the save method

64df19f

Remove whitespace

dd240f9

Removed unnecessary code; fixed UI; other small updates.

5862100

mauteri marked this pull request as ready for review February 7, 2024 01:34

mauteri approved these changes Feb 7, 2024

View reviewed changes

mauteri changed the title ~~WIP: Rsvp form token field~~ Rsvp form token field Feb 7, 2024

mauteri merged commit 6e5022b into GatherPress:main Feb 7, 2024
10 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rsvp form token field #522

Rsvp form token field #522

jmarx commented Jan 29, 2024 •

edited by mauteri

Loading

jmarx commented Jan 29, 2024

mauteri Feb 3, 2024 •

edited

Loading

mauteri Feb 3, 2024

mauteri Feb 3, 2024

mauteri Feb 3, 2024

mauteri Feb 3, 2024

mauteri Feb 3, 2024

linusx Feb 5, 2024 •

edited

Loading

mauteri Feb 6, 2024

mauteri Feb 4, 2024

mauteri Feb 4, 2024

mauteri Feb 4, 2024

mauteri Feb 4, 2024

mauteri Feb 6, 2024

mauteri Feb 6, 2024

mauteri Feb 6, 2024

mauteri Feb 6, 2024

mauteri Feb 6, 2024

jmarx Feb 7, 2024

mauteri Feb 6, 2024

Rsvp form token field #522

Rsvp form token field #522

Conversation

jmarx commented Jan 29, 2024 • edited by mauteri Loading

Description of the Change

How to test the Change

Changelog Entry

Credits

Checklist:

jmarx commented Jan 29, 2024

mauteri Feb 3, 2024 • 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

linusx Feb 5, 2024 • 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

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

jmarx commented Jan 29, 2024 •

edited by mauteri

Loading

mauteri Feb 3, 2024 •

edited

Loading

linusx Feb 5, 2024 •

edited

Loading