RSVP new expected changes

adobecom · Oct 9, 2024 · 2c37c3d · 2c37c3d
1 parent 5808dbe
commit 2c37c3d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/events/blocks/events-form/events-form.js b/events/blocks/events-form/events-form.js
@@ -127,12 +127,14 @@ function showSuccessMsgFirstScreen(bp) {
   bp.form.classList.add('hidden');
   bp.eventHero.classList.add('hidden');
 
-  if (rsvpData?.espProvider?.waitlisted) {
+  const registrationStatus = rsvpData?.espProvider?.registrationStatus;
+
+  if (registrationStatus === 'waitlisted') {
     bp.waitlistSuccessScreen.classList.remove('hidden');
     bp.waitlistSuccessScreen.querySelector('.first-screen')?.classList.remove('hidden');
   }
 
-  if (rsvpData?.espProvider?.registered) {
+  if (registrationStatus === 'registered') {
     bp.rsvpSuccessScreen.classList.remove('hidden');
     bp.rsvpSuccessScreen.querySelector('.first-screen')?.classList.remove('hidden');
   }
@@ -390,15 +392,15 @@ function decorateSuccessScreen(screen) {
           if (cta.classList.contains('cancel-button')) {
             const resp = await deleteAttendeeFromEvent(getMetadata('event-id'));
             if (!resp.ok) return;
-    
+
             const { data } = resp;
-    
+
             cta.classList.remove('loading');
             if (data?.espProvider?.status !== 204) {
-              buildErrorMsg(bp.successMsg);
+              buildErrorMsg(screen);
               return;
             }
-    
+
             if (data?.espProvider?.attendeeDeleted) BlockMediator.set('rsvpData', null);
 
             firstScreen.classList.add('hidden');
@@ -564,26 +566,24 @@ async function buildEventform(bp, formData) {
 }
 
 function initFormBasedOnRSVPData(bp) {
+  const validRegistrationStatus = ['registered', 'waitlisted'];
   const { block } = bp;
   const profile = BlockMediator.get('imsProfile');
   const rsvpData = BlockMediator.get('rsvpData');
-  if (rsvpData?.espProvider?.registered
-    || rsvpData?.espProvider?.waitlisted
-    || rsvpData?.externalAttendeeId) {
+  if (validRegistrationStatus.includes(rsvpData.espProvider.registrationStatus)) {
     showSuccessMsgFirstScreen(bp);
     eventFormSendAnalytics(bp, 'Confirmation Modal View');
   } else {
     personalizeForm(block, profile);
   }
 
   BlockMediator.subscribe('rsvpData', ({ newValue }) => {
-    if (newValue?.espProvider?.registered
-      || newValue?.espProvider?.waitlisted
-      || newValue?.externalAttendeeId) {
+    if (validRegistrationStatus.includes(newValue?.espProvider.registrationStatus)) {
       showSuccessMsgFirstScreen(bp);
       eventFormSendAnalytics(bp, 'Confirmation Modal View');
     }
   });
+
   if (bp.block.querySelector('.form-success-msg.hidden')) {
     eventFormSendAnalytics(bp, 'Form View');
   }

diff --git a/events/scripts/content-update.js b/events/scripts/content-update.js
@@ -161,9 +161,9 @@ async function updateRSVPButtonState(rsvpBtn, miloLibs, eventInfo) {
       defaultState();
     }
   // RSVP data changed by register submission || rsvp data received on page load
-  } else if (rsvpData.espProvider?.registered || rsvpData.attendeeStatus === 'registered') {
+  } else if (rsvpData.espProvider?.registrationStatus === 'registered' || rsvpData.attendeeStatus === 'registered') {
     await registeredState();
-  } else if (rsvpData.espProvider?.waitlisted || rsvpData.attendeeStatus === 'waitlisted') {
+  } else if (rsvpData.espProvider?.registrationStatus === 'waitlisted' || rsvpData.attendeeStatus === 'waitlisted') {
     await waitlistedState();
   } else if (!rsvpData.ok) {
     // FIXME: temporary solution for ESL returning 500 on ESP 400 response