@openeventkit/event-site 2.0.94 → 2.0.96

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.94",
+  "version": "2.0.96",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -121,7 +121,7 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "5.0.21",
+    "summit-registration-lite": "5.0.22",
     "superagent": "8.0.9",
     "sweetalert2": "^9.17.0",
     "upcoming-events-widget": "3.0.5",

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';
@@ -586,7 +587,6 @@ export const doVirtualCheckIn = (attendee) => async (dispatch, getState) => {
   });
 };
 
-
 /**
  * Get invitation by token to allow reject
  * @param token
@@ -594,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()));
 }
@@ -611,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/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/styles/colors.scss

@@ -24,6 +24,8 @@ $color_horizontal_rule_dark: #7B7B7B;
 $color_horizontal_rule_light: #E5E5E5;
 $color_text_input_hints_light:#7B7B7B;
 $color_text_input_hints_dark:#7B7B7B;
+$color_button_background_color:#ffffff;
+$color_button_color:#000000;
 
 :root {
   --color_primary: #{$color_primary};
@@ -45,6 +47,8 @@ $color_text_input_hints_dark:#7B7B7B;
   --color_text_input_hints: #{$color_text_input_hints_light};
   --color_horizontal_rule: #{$color_horizontal_rule_light};
   --color_icon_light: #{$color_icon_light};
+  --color_button_background_color: #{$color_button_background_color};
+  --color_button_color: #{$color_button_color};
 }
 
 html[data-theme="DARK"] {
@@ -61,4 +65,4 @@ html[data-theme="DARK"] {
   --color_input_border_color: #{$color_input_border_color_dark} !important;
   --color_text_input_hints: #{$color_text_input_hints_dark} !important;
   --color_horizontal_rule: #{$color_horizontal_rule_dark};
-}
+}

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}`}>