@openeventkit/event-site 2.1.25 → 2.1.26

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.1.25",
+  "version": "2.1.26",
   "author": "Tipit LLC",
   "dependencies": {
     "@emotion/server": "^11.11.0",
@@ -125,7 +125,7 @@
     "rehype-mdx-import-media": "^1.2.0",
     "remark-gfm": "^4.0.1",
     "sass": "^1.49.9",
-    "schedule-filter-widget": "3.0.6",
+    "schedule-filter-widget": "3.0.7",
     "simple-chat-widget": "^1.0.31",
     "simple-oauth2": "^4.1.0",
     "slick-carousel": "^1.8.1",

package/src/actions/user-actions.js

@@ -678,8 +678,9 @@ export const rejectInvitation = (token) => async (dispatch) => {
 
 export const getRSVPInvitation = (token, eventId) => async (dispatch) => {
   let params = {
-    fields: "status,event_id",
-    relations: "none"
+    fields: "status,event.id,event.rsvp_capacity",
+    expand: "event",
+    relations: "none,event.none"
   };
 
   return getRequest(

package/src/i18n/locales/en.json

@@ -14,6 +14,8 @@
     "invite_message": "You have been invited to RSVP {{event}}",
     "decline_message": "You have declined your invitation.",
     "confirm_message": "Your attendance to this event is confirmed.",
+    "waitlist_message": "This activity is currently full, but you have been added to the wait list and will be automatically confirmed should space become available.",
+    "full_message": "This activity is full.",
     "speakers": "Speakers",
     "accept_button": "YES, I will attend.",
     "decline_button": "NO, I will not attend."

package/src/pages/a/overflow-player.js

@@ -1,11 +1,11 @@
 import React, { useEffect, useState } from "react";
-import { useParams } from "react-router-dom";
 import { connect } from "react-redux";
 import { useTranslation } from "react-i18next";
 import { getOverflowEventByKey } from "../../actions/event-actions";
 import { Container, Box, CircularProgress, Typography, Fade } from "@mui/material";
 import VideoComponent from "../../components/VideoComponent";
 import ErrorMessage from "../../components/ErrorMessage";
+import withRealTimeUpdates from "../../utils/real_time_updates/withRealTimeUpdates";
 import "../../i18n";
 
 const OverflowPlayerPage = ({
@@ -25,7 +25,7 @@ const OverflowPlayerPage = ({
     if (overflowStreamKey) {
       fetchOverflowEvent(overflowStreamKey);
     }
-  }, [overflowStreamKey, fetchOverflowEvent]);
+  }, [overflowStreamKey, fetchOverflowEvent, event?.overflow_streaming_url]);
 
   useEffect(() => {
     if (event && !loading && !error) {
@@ -146,4 +146,4 @@ const mapDispatchToProps = (dispatch) => ({
   fetchOverflowEvent: (streamKey) => dispatch(getOverflowEventByKey(streamKey))
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(OverflowPlayerPage);
+export default connect(mapStateToProps, mapDispatchToProps)(withRealTimeUpdates(OverflowPlayerPage));

package/src/reducers/user-reducer.js

@@ -144,7 +144,9 @@ const userReducer = (state = DEFAULT_STATE, action) => {
       return { ...state, rsvpInvitation: null }
     }
     case RECEIVE_RSVP_INVITATION: {
-      return { ...state, rsvpInvitation: payload.response }
+      let invitation = payload.response;
+      invitation.event_id = invitation.event.id;
+      return { ...state, rsvpInvitation: invitation }
     }
     case RSVP_INVITATION_ERROR: {
       const { errorMessage } = payload;

package/src/templates/rsvp-page.js

@@ -7,7 +7,7 @@ import Layout from "../components/Layout";
 import { acceptRSVPInvitation, declineRSVPInvitation, getRSVPInvitation } from "../actions/user-actions";
 import { getEventById } from "../actions/event-actions";
 import styles from "../styles/rsvp-page.module.scss"
-import { RSVP_STATUS } from "@utils/rsvpConstants";
+import { RSVP_STATUS, RSVP_CAPACITY } from "@utils/rsvpConstants";
 import { Badge } from "react-bootstrap";
 import "../i18n";
 
@@ -96,15 +96,18 @@ const RSVPPage = ({ location, rsvpInvitation, event, getRSVPInvitation, acceptRS
               }
               <div className={styles.buttonWrapper}>
                 {errorMessage && (
-                    <h3 dangerouslySetInnerHTML={{ __html: errorMessage }} />
+                  <h3 dangerouslySetInnerHTML={{ __html: errorMessage }} />
                 )}
                 {rsvpInvitation?.status === RSVP_STATUS.rejected && (
                   <h4>{t("rsvp_page.decline_message")} </h4>
                 )}
                 {rsvpInvitation?.status === RSVP_STATUS.accepted && (
-                  <h4>{t("rsvp_page.confirm_message")} </h4>
+                  rsvpInvitation?.rsvp?.seat_type === RSVP_CAPACITY.waitlist ?
+                    <h4>{t("rsvp_page.waitlist_message")} </h4>
+                    :
+                    <h4>{t("rsvp_page.confirm_message")} </h4>
                 )}
-                {rsvpInvitation?.status === RSVP_STATUS.pending && (
+                {rsvpInvitation?.status === RSVP_STATUS.pending && rsvpInvitation?.event?.rsvp_capacity !== RSVP_CAPACITY.full && (
                   <>
                     <button className="button is-large" onClick={() => handleConfirmRSVP(true)}>
                       {t("rsvp_page.accept_button")}
@@ -113,13 +116,18 @@ const RSVPPage = ({ location, rsvpInvitation, event, getRSVPInvitation, acceptRS
                       {t("rsvp_page.decline_button")}
                     </button>
                   </>
-                )}
+                )
+                }
+                {rsvpInvitation?.status === RSVP_STATUS.pending && rsvpInvitation?.event?.rsvp_capacity === RSVP_CAPACITY.full && (
+                  <h4>{t("rsvp_page.full_message")} </h4>
+                )
+                }
               </div>
             </>)
             :
             (
               <>
-                  <h3>Activity not found.</h3>
+                <h3>Activity not found.</h3>
               </>
             )
           }

package/src/utils/rsvpConstants.js

@@ -4,4 +4,10 @@ const RSVP_STATUS = {
   rejected: "Rejected"
 };
 
-export { RSVP_STATUS };
+const RSVP_CAPACITY = {
+  regular: "Regular",
+  waitlist: "WaitList",
+  full: "Full",
+};
+
+export { RSVP_STATUS, RSVP_CAPACITY };