feat: Add admin manual CheckInReady toggle #1448

trillium · 2023-07-18T22:59:45Z

Fixes #1447

What changes did you make and why did you make them ?

Create EventsApiService that mimics RecurringApiService
Add section that renders events from /events/ that match the project in the projects page
Adapt the surrounding components to pass needed props

Screenshots of Proposed Changes Of The Website

Visuals before changes side by side

github-actions · 2023-07-18T23:00:15Z

Want to review this pull request? Take a look at this documentation for a step by step guide!

From your project repository, check out a new branch and test the changes.

git checkout -b Spiteless-ts.checkInReady_toggle development
git pull https://github.com/Spiteless/VRMS.git ts.checkInReady_toggle

trillium · 2023-07-18T23:01:52Z

client/src/components/manageProjects/editProject.js

@@ -36,7 +36,7 @@ const EditProject = ({
        recurringEvents
          // eslint-disable-next-line no-underscore-dangle
          .filter((e) => e?.project?._id === projectToEdit._id)
-          .map((item) => readableEvent(item))
+          .map((item) => ({...item, ...readableEvent(item)}))


This change is allows checkInReady to be passed via props

trillium · 2023-07-18T23:05:24Z

client/src/components/manageProjects/editProject.js

+
+  return (
+    <li key={`${event.event_id}`}>
+      <button type="button" onClick={() => {console.log(event);setSelectedEvent(event)}}>


setSelectedEvent designates which event should be editable in the modal rendered by <EditMeetingTimes /> and passes on all the event values.

trillium · 2023-07-18T23:06:31Z

client/src/components/manageProjects/editableMeeting.js

@@ -15,6 +15,7 @@ const EditableMeeting = ({
  handleEventDelete,
  formErrors,
  videoConferenceLink = '',
+  checkInReady,


Ensures checkInReady is destructed off of props

trillium · 2023-07-18T23:08:20Z

client/src/components/manageProjects/editableMeeting.js

+          onClick={handleEventUpdate(eventId, {checkInReady: !checkInReady})}
+        >
+          ToggleCheckIn({!checkInReady ? "Yes" : "No"})
+        </button>


handleEventUpdate() takes an evendId, a values object, and two other props unused here.

The values object is passed an obj with the opposite of checkInReady, and sent to the db updater fuction.

trillium · 2023-07-18T23:09:27Z

client/src/components/manageProjects/editMeetingTimes.js

+          checkInReady: values.checkInReady,
+        };
+      }
+


This section updates handleEventUpdate() in the same style as the original function, allowing minimal change for us to update checkInReady in the db.

MattPereira · 2023-07-19T02:56:25Z

@spiteless your changes do successfully update the associated recurringEvent object in the db, however, it does't show up on the check in page for users who are not logged in because the home page component is making a request to the events endpoint. For anyone who is unfamiliar, the recurringEvents are used to create events via the createRecurringEvents.js worker. So there is theoretically an event object in the db for every single time a meeting happens which results in the 16,095 events records that are in the prod db right now, but there are only 67 recurringEvents which generate all those events

I refactored the home page a few months ago and left it hitting api/events because that's how it was before and didn't want to break anything but maybe swapping it out for api/recurringEvents could be an option to explore?

One thing to keep in mind is that if you manually flip it to checkInReady: true you would also have to manually flip it back to checkInReady: false or the meeting would remain as always check in ready. If you swap the endpoint to /api/recurringEvents?checkInReady=true on your local env you will see about 40 recurringEvents sporting a check in ready true coming from the test db

VRMS/client/src/pages/Home.js

Line 21 in 224433a

const res = await fetch('/api/events?checkInReady=true', {

MattPereira · 2023-07-19T15:19:33Z

maybe swapping it out for api/recurringEvents could be an option to explore?

This might not be a good idea since the workers only automate the open and close of events so changing the endpoint that gets hit by the homepage to /api/recurringEvents?checkInReady=true would also require changing the worker files that open and close the events to target recurringEvents instead

evanyang1 · 2023-07-19T19:26:33Z

client/src/components/manageProjects/editProject.js

@@ -207,4 +198,21 @@ const EditProject = ({
  );
 };

+function RecurringEvent({event, setSelectedEvent}) {
+


Small nit: remove empty line

evanyang1

LGTM! Other perspectives welcome

MattPereira · 2023-07-20T00:50:07Z

@evanyang1 how did you test that users would be able to check into meetings that are manually flipped?

am i misunderstanding the goal for this PR?

bkmorgan3 · 2023-07-20T21:58:31Z

client/src/components/manageProjects/editProject.js

+          {`${event.dayOfTheWeek}, ${event.startTime} - ${event.endTime}; ${event.eventType}`}
+          <div className="edit-icon"><EditIcon /></div>
+        </div>
+        <div className="event-list-description">{`Can uses check into this event now?: ${event.checkInReady ? "Yes" : "No"}`}</div>


check spelling

trillium · 2023-07-23T22:02:05Z

Updated this commit

MattPereira

@spiteless hey man well done figuring this one out! 🍻

The feature works as expected, but in the process of testing I discovered that duplicate events are sneaking into the test db

See screenshot

Luckily, it doesn't appear as though there are duplicate events in the prod db

See screenshot

Therefore, I believe your PR will successfully provide PMs with the ability to manually flip the event to checkInReady: true

trillium commented Jul 18, 2023

View reviewed changes

trillium requested review from bkmorgan3, evanyang1 and jbubar July 18, 2023 23:10

MattPereira self-requested a review July 19, 2023 02:51

evanyang1 reviewed Jul 19, 2023

View reviewed changes

evanyang1 approved these changes Jul 19, 2023

View reviewed changes

bkmorgan3 reviewed Jul 20, 2023

View reviewed changes

trillium added 2 commits July 23, 2023 14:51

feat: Create EventApiService, mimics current code style

f7582e6

feat: Add ability to toggle checkInReady for Admin

ab50a6e

trillium force-pushed the ts.checkInReady_toggle branch from 565ef6e to ab50a6e Compare July 23, 2023 21:53

MattPereira approved these changes Jul 23, 2023

View reviewed changes

trillium merged commit 7c06453 into hackforla:development Jul 23, 2023
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add admin manual CheckInReady toggle #1448

feat: Add admin manual CheckInReady toggle #1448

trillium commented Jul 18, 2023 •

edited

Loading

github-actions bot commented Jul 18, 2023

trillium Jul 18, 2023

trillium Jul 18, 2023 •

edited

Loading

trillium Jul 18, 2023

trillium Jul 18, 2023

trillium Jul 18, 2023

MattPereira commented Jul 19, 2023 •

edited

Loading

MattPereira commented Jul 19, 2023 •

edited

Loading

evanyang1 Jul 19, 2023

evanyang1 left a comment

MattPereira commented Jul 20, 2023

bkmorgan3 Jul 20, 2023

trillium commented Jul 23, 2023

MattPereira left a comment

feat: Add admin manual CheckInReady toggle #1448

feat: Add admin manual CheckInReady toggle #1448

Conversation

trillium commented Jul 18, 2023 • edited Loading

What changes did you make and why did you make them ?

Screenshots of Proposed Changes Of The Website

github-actions bot commented Jul 18, 2023

trillium Jul 18, 2023

Choose a reason for hiding this comment

trillium Jul 18, 2023 • edited Loading

Choose a reason for hiding this comment

trillium Jul 18, 2023

Choose a reason for hiding this comment

trillium Jul 18, 2023

Choose a reason for hiding this comment

trillium Jul 18, 2023

Choose a reason for hiding this comment

MattPereira commented Jul 19, 2023 • edited Loading

MattPereira commented Jul 19, 2023 • edited Loading

evanyang1 Jul 19, 2023

Choose a reason for hiding this comment

evanyang1 left a comment

Choose a reason for hiding this comment

MattPereira commented Jul 20, 2023

bkmorgan3 Jul 20, 2023

Choose a reason for hiding this comment

trillium commented Jul 23, 2023

MattPereira left a comment

Choose a reason for hiding this comment

trillium commented Jul 18, 2023 •

edited

Loading

trillium Jul 18, 2023 •

edited

Loading

MattPereira commented Jul 19, 2023 •

edited

Loading

MattPereira commented Jul 19, 2023 •

edited

Loading