@openeventkit/event-site 2.0.93 → 2.0.95

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.93",
+  "version": "2.0.95",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",

package/src/actions/user-actions.js

@@ -22,6 +22,7 @@ import axios from "axios";
 import { navigate } from 'gatsby';
 import { customErrorHandler, customBadgeHandler, voidErrorHandler } from '../utils/customErrorHandler';
 import { getEnvVariable, SUMMIT_API_BASE_URL, SUMMIT_ID } from "../utils/envVariables";
+import expiredToken from "../utils/expiredToken";
 
 export const GET_DISQUS_SSO = 'GET_DISQUS_SSO';
 export const GET_USER_PROFILE = 'GET_USER_PROFILE';
@@ -93,7 +94,11 @@ export const getUserProfile = () => async (dispatch) => {
 
   let params = {
     access_token: accessToken,
-    expand: 'groups,summit_tickets,summit_tickets.owner,summit_tickets.owner.presentation_votes,summit_tickets.owner.extra_questions,summit_tickets.badge,summit_tickets.badge.features,summit_tickets.badge.type, summit_tickets.badge.type.access_levels,summit_tickets.badge.type.features,favorite_summit_events,feedback,schedule_summit_events,rsvp,rsvp.answers'
+    expand:
+      'groups,summit_tickets,summit_tickets.ticket_type,summit_tickets.owner,summit_tickets.owner.presentation_votes,' +
+      'summit_tickets.owner.extra_questions,summit_tickets.badge,summit_tickets.badge.features,summit_tickets.badge.type,' +
+      'summit_tickets.badge.type.access_levels,summit_tickets.badge.type.features,favorite_summit_events,feedback,' +
+      'schedule_summit_events,rsvp,rsvp.answers'
   };
 
   return getRequest(
@@ -582,7 +587,6 @@ export const doVirtualCheckIn = (attendee) => async (dispatch, getState) => {
   });
 };
 
-
 /**
  * Get invitation by token to allow reject
  * @param token
@@ -590,12 +594,11 @@ export const doVirtualCheckIn = (attendee) => async (dispatch, getState) => {
  */
 export const getInvitation = (token) => async (dispatch) => {
   dispatch(startLoading());
-
   return getRequest(
     createAction(REQUEST_INVITATION),
     createAction(RECEIVE_INVITATION),
     `${window.API_BASE_URL}/api/public/v1/summits/${window.SUMMIT_ID}/registration-invitations/${token}`,
-    customErrorHandler
+    null
   )({})(dispatch)
     .finally(() => dispatch(stopLoading()));
 }
@@ -607,17 +610,13 @@ export const getInvitation = (token) => async (dispatch) => {
  */
 export const rejectInvitation = (token) => async (dispatch) => {
   dispatch(startLoading());
-
   return deleteRequest(
     null,
     createAction(REJECT_INVITATION),
     `${window.API_BASE_URL}/api/public/v1/summits/${window.SUMMIT_ID}/registration-invitations/${token}/reject`,
     {},
-    customErrorHandler
+    null
   )({})(dispatch)
-    .then(() => {
-      //redirect ?
-    })
     .finally(() => dispatch(stopLoading()));
 }
 

package/src/cms/config/collections/defaultPagesCollection/invitationsRejectPage/index.js

@@ -38,8 +38,19 @@ const invitationsRejectPage = {
       required: false,
       default: "Reject Invitation"
     }),
+    stringField({
+      label: "Already Accepted Invitation Error",
+      name: "alreadyAcceptedInvitationError",
+      required: false,
+      default: "This invitation has already been accepted. Please contact the event organizer if you feel this is an error."
+    }),
+    stringField({
+      label: "Already Rejected Invitation Error",
+      name: "alreadyRejectedInvitationError",
+      required: false,
+      default: "This invitation has already been declined. Please contact the event organizer if you feel this is an error."
+    }),
   ]
 };
 
 export default invitationsRejectPage;
-  

package/src/cms/config/collections/defaultPagesCollection/invitationsRejectPage/typeDefs.js

@@ -6,5 +6,7 @@ module.exports = `
     rejectedText: String
     rejectText: String
     rejectCTALabel: String
+    alreadyAcceptedInvitationError: String
+    alreadyRejectedInvitationError: String
   }
-`;
+`;

package/src/components/LiteScheduleComponent.js

@@ -21,16 +21,19 @@ const LiteScheduleComponent = ({
    page,
    addToSchedule,
    removeFromSchedule,
-   allScheduleEvents,
+   schedules,
    summit,
+   schedKey = 'schedule-main',
    ...rest
 }) => {
   const wrapperClass = page === 'marketing-site' ? 'schedule-container-marketing' : 'schedule-container';
   const { getSettingByKey } = useMarketingSettings();
   const defaultImage = getSettingByKey(MARKETING_SETTINGS_KEYS.schedultDefaultImage);
+  const scheduleState = schedules?.find( s => s.key === schedKey);
+
   const componentProps = {
     defaultImage: defaultImage,
-    eventsData: allScheduleEvents,
+    eventsData: scheduleState?.allEvents || [],
     summitData: summit,
     marketingData: colorSettings,
     userProfile: userProfile,
@@ -60,7 +63,7 @@ const LiteScheduleComponent = ({
 
 const mapStateToProps = ({userState, summitState, allSchedulesState, settingState}) => ({
   userProfile: userState.userProfile,
-  allScheduleEvents: allSchedulesState.allScheduleEvents,
+  schedules: allSchedulesState.schedules,
   summit: summitState.summit,
   colorSettings: settingState.colorSettings
 });

package/src/components/LiveEventWidgetComponent.js

@@ -13,7 +13,7 @@ import useMarketingSettings, { MARKETING_SETTINGS_KEYS } from "@utils/useMarketi
 import { SentryFallbackFunction } from "./SentryErrorComponent";
 
 const LiveEventWidgetComponent = ({
-  allEvents,
+  schedules,
   summit,
   colorSettings,
   className = "live-event-container",
@@ -21,10 +21,12 @@ const LiveEventWidgetComponent = ({
 }) => {
   const { getSettingByKey } = useMarketingSettings();
   const defaultImage = getSettingByKey(MARKETING_SETTINGS_KEYS.schedultDefaultImage);
+  const scheduleState = schedules?.find( s => s.key === 'schedule-main');
+
   const widgetProps = {
     title: "",
     defaultImage: defaultImage,
-    eventsData: allEvents,
+    eventsData: scheduleState?.allEvents || [],
     summitData: summit,
     marketingData: colorSettings,
     ...rest
@@ -41,7 +43,7 @@ const LiveEventWidgetComponent = ({
 
 const mapStateToProps = ({ summitState, allSchedulesState, settingState }) => ({
   summit: summitState.summit,
-  allEvents: allSchedulesState.allEvents,
+  schedules: allSchedulesState.schedules,
   colorSettings: settingState.colorSettings
 });
 

package/src/components/SpeakersWidgetComponent.js

@@ -9,12 +9,14 @@ import 'speakers-widget/dist/index.css';
 
 import { SentryFallbackFunction } from "./SentryErrorComponent";
 
-const SpeakersWidgetComponent = ({now, colorSettings, allEvents, speakers, ...props}) => {
+const SpeakersWidgetComponent = ({now, colorSettings, allEvents, speakers, schedules, ...props}) => {
+    const scheduleState = schedules?.find( s => s.key === 'schedule-main');
+
     const widgetProps = {
         date: now,
         // featured: true,
         speakersData: speakers,
-        eventsData: allEvents,
+        eventsData: scheduleState?.allEvents || [],
         marketingData: colorSettings,
         ...props
     };
@@ -30,10 +32,10 @@ const SpeakersWidgetComponent = ({now, colorSettings, allEvents, speakers, ...pr
     )
 }
 
-const mapStateToProps = ({ clockState, summitState, allSchedulesState, speakerState, settingState }) => ({
+const mapStateToProps = ({ clockState, allSchedulesState, speakerState, settingState }) => ({
     now: clockState.nowUtc,
     colorSettings: settingState.colorSettings,
-    allEvents: allSchedulesState.allEvents,
+    schedules: allSchedulesState.schedules,
     speakers: speakerState.speakers
 });
 

package/src/components/UpcomingEventsComponent.js

@@ -21,16 +21,18 @@ const UpcomingEventsComponent = ({
   addToSchedule,
   removeFromSchedule,
   colorSettings,
-  allEvents,
+  schedules,
   summit,
   ...rest
 }) => {
   const wrapperClass = page === "marketing-site" ? "schedule-container-marketing" : "schedule-container";
   const { getSettingByKey } = useMarketingSettings();
   const defaultImage = getSettingByKey(MARKETING_SETTINGS_KEYS.schedultDefaultImage);
+  const scheduleState = schedules?.find( s => s.key === 'schedule-main');
+
   const componentProps = {
     defaultImage: defaultImage,
-    eventsData: allEvents,
+    eventsData: scheduleState?.allEvents || [],
     summitData: summit,
     marketingData: colorSettings,
     userProfile: userProfile,
@@ -62,7 +64,7 @@ const mapStateToProps = ({ userState, summitState, allSchedulesState, settingSta
   userProfile: userState.userProfile,
   colorSettings: settingState.colorSettings,
   summit: summitState.summit,
-  allEvents: allSchedulesState.allEvents,
+  schedules: allSchedulesState.schedules,
 });
 
 export default connect(mapStateToProps, {

package/src/content/invitations-reject-page/index.json

@@ -1,7 +1,7 @@
 {
-  "title": "Invitation rejection",
-  "notFoundText": "Invitation not found.",
-  "rejectedText": "You have rejected your invitation. ",
-  "rejectText": "Be certain.  This is your last chance to purchase this ticket...",
-  "rejectCTALabel": "Reject"
-}
+  "title": "Decline Invitation",
+  "notFoundText": "Sorry, we cannot locate your invitation. Please email for additional assistance.",
+  "rejectedText": "Thank you. You have declined this invitation.",
+  "rejectText": "Are you sure? Last chance to get your ticket!",
+  "rejectCTALabel": "Decline"
+}

package/src/pages/a/[...].js

@@ -30,6 +30,8 @@ export const appQuery = graphql`
       rejectedText
       rejectText
       rejectCTALabel
+      alreadyAcceptedInvitationError
+      alreadyRejectedInvitationError
     }
   }
 `;

package/src/templates/full-profile-page.js

@@ -586,6 +586,7 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up
                             yourSchedule={true}
                             showNav={true}
                             eventCount={10}
+                            schedKey="my-schedule-main"
                         />
                     </div>
                 </div>

package/src/templates/invitations-reject-page.js

@@ -1,4 +1,4 @@
-import React, {useEffect, useState, useCallback, useRef} from "react";
+import React, {useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import {connect} from "react-redux";
 import Layout from "../components/Layout";
@@ -10,72 +10,102 @@ import styles from "../styles/invitation-reject.module.scss";
 
 const InvitationsRejectPage = ({data, location, invitationToken, invitation, loading, ...props}) => {
   const [loaded, setLoaded] = useState(false);
+  const [error, setError] = useState(null);
   const [rejecting, setRejecting] = useState(false);
-  const {invitationsRejectPageJson: {title, notFoundText, rejectedText, rejectText, rejectCTALabel}} = data;
+  const {invitationsRejectPageJson: {title, notFoundText, rejectedText, rejectText, rejectCTALabel, alreadyAcceptedInvitationError, alreadyRejectedInvitationError}} = data;
   const titleStr = title || "Reject invitation"
   const rejectStr = rejectText || "To reject please click on the button below."
   const rejectCTA = rejectCTALabel || "Reject"
   const notFoundStr = notFoundText || "Invitation not found."
   const rejectedStr = rejectedText || "Invitation has already been rejected."
 
+  const invitationErrorhandler = (e) => {
+    const { res } = e;
+    let code = res.status;
+    switch(code){
+        case 404:
+            setError(notFoundStr)
+            break;
+        case 412: {
+            const response = res?.body;
+            let apiErrors = '';
+            response.errors.forEach(val => apiErrors += val + '\n');
+            switch (response.code) {
+                case 1:
+                    apiErrors = alreadyAcceptedInvitationError || apiErrors;
+                    break;
+                case 2:
+                    apiErrors = alreadyRejectedInvitationError || apiErrors;
+                    break;
+            }
+            setError(apiErrors);
+        }
+        break;
+    }
+  }
+
   useEffect(() => {
     setLoaded(false);
     if (invitationToken) {
       props.getInvitation(invitationToken)
-        .finally(() => {
-          setLoaded(true)
-        });
+          .catch(invitationErrorhandler)
+          .finally(() => {
+            setLoaded(true)
+          });
     }
   }, []);
 
   const rejectInvitation = () => {
     setRejecting(true);
     props.rejectInvitation(invitationToken)
-      .finally(() => {
-        setRejecting(false);
-      });
+        .catch(invitationErrorhandler)
+        .finally(() => {
+            setRejecting(false);
+        });
   }
 
   const getMessage = () => {
-    if (!invitationToken) {
-      return (
-        <>
-          <div>Missing token.</div>
-        </>
-      );
-    }
-    else if (loaded) {
+
+      if (!invitationToken) {
+          return (
+              <>
+                  <div>Missing token.</div>
+              </>
+          );
+      }
+
+      if (!loaded) return null;
+
       if (!invitation) {
-        return (
-          <>
-            <div>{notFoundStr}</div>
-          </>
-        );
-      } else {
-        if (invitation.status === 'Rejected') {
           return (
             <>
-              <div>{rejectedStr}</div>
+                <div>{error}</div>
             </>
-          )
-        } else {
+          );
+      }
+
+      if (invitation.status === 'Rejected') {
           return (
-            <>
-              <div>{rejectStr}</div>
-              <button className="button is-large" onClick={rejectInvitation} disabled={rejecting}>
-                {rejectCTA}
-              </button>
-            </>
+              <>
+                  <div>{rejectedStr}</div>
+              </>
           )
-        }
+      }
 
+      if (invitation.status === 'Pending') {
+          return (
+              <>
+                  <div>{rejectStr}</div>
+                  <button className="button is-large" onClick={rejectInvitation} disabled={rejecting}>
+                      {rejectCTA}
+                  </button>
+              </>
+          )
       }
-    } else {
+
       return null;
-    }
   }
 
-
   return (
     <Layout location={location}>
       <div className={`container ${styles.container}`}>

package/src/templates/lobby-page.js

@@ -131,6 +131,7 @@ export const LobbyPageTemplate = class extends React.Component {
                 yourSchedule={true}
                 showNav={true}
                 eventCount={10}
+                schedKey="my-schedule-main"
               />
               <AdvertiseComponent section="lobby" column="right"/>
             </div>

package/src/utils/schedule.js

@@ -4,6 +4,7 @@ import { epochToMomentTimeZone , getFromLocalStorage, putOnLocalStorage }
 import { isString } from "lodash";
 import { getEnvVariable, SCHEDULE_EXCLUDING_TAGS } from "./envVariables";
 import {getUserAccessLevelIds, isAuthorizedUser} from './authorizedGroups';
+import {uniq} from "lodash";
 
 const groupByDay = (events) => {
   let groupedEvents = [];
@@ -58,6 +59,19 @@ export const filterEventsByTags = (events) => {
       : events;
 };
 
+export const filterEventsByTicket = (events, user) => {
+  const assignedTickets = user?.summit_tickets || [];
+  const ticketTypeIds = uniq(assignedTickets.map(t => t.ticket_type?.id));
+
+  return events.filter(ev => {
+    const hasEventRestriction = ev.allowed_ticket_types.length > 0;
+    const typeAllowed = ev.type.allowed_ticket_types.length === 0 || ev.type.allowed_ticket_types.some(att => ticketTypeIds.includes(att));
+    const eventAllowed = !hasEventRestriction || ev.allowed_ticket_types.some(att => ticketTypeIds.includes(att));
+
+    return hasEventRestriction ? eventAllowed : typeAllowed;
+  });
+};
+
 const filterMyEvents = (myEvents, events) => {
   const myEventsIds = myEvents?.map(ev => ev.id) || [];
   return events.filter(ev =>  myEventsIds.includes(ev.id));
@@ -75,6 +89,8 @@ export const preFilterEvents = (events, filters, summitTimezone, userProfile, fi
     result = filterEventsByAccessLevel(result, userProfile);
   }
 
+  result = filterEventsByTicket(result, userProfile);
+
   return getFilteredEvents(result, filters, summitTimezone, hidePast);
 };