@openeventkit/event-site 2.0.48 → 2.0.50

package/gatsby-node.js

@@ -225,7 +225,7 @@ exports.onPreBootstrap = async () => {
 
   const summitId = process.env.GATSBY_SUMMIT_ID;
   const summitApiBaseUrl = process.env.GATSBY_SUMMIT_API_BASE_URL;
-  const marketingSettings = await SSR_getMarketingSettings(process.env.GATSBY_MARKETING_API_BASE_URL, summitId);
+  let   marketingSettings = await SSR_getMarketingSettings(process.env.GATSBY_MARKETING_API_BASE_URL, summitId);
   const colorSettings = fs.existsSync(COLORS_FILE_PATH) ? JSON.parse(fs.readFileSync(COLORS_FILE_PATH)) : require(`./${DEFAULT_COLORS_FILE_PATH}`);
   const globalSettings = fs.existsSync(SITE_SETTINGS_FILE_PATH) ? JSON.parse(fs.readFileSync(SITE_SETTINGS_FILE_PATH)) : {};
   const lobbyPageSettings = fs.existsSync(LOBBY_PAGE_FILE_PATH) ? JSON.parse(fs.readFileSync(LOBBY_PAGE_FILE_PATH)) : {};
@@ -247,9 +247,12 @@ exports.onPreBootstrap = async () => {
 
   const accessToken = await getAccessToken(config, process.env.GATSBY_BUILD_SCOPES).then(({ token }) => token.access_token);
 
+  const FileType = 'FILE';
   // extract colors from marketing settings
-  marketingSettings.map(({ key, value }) => {
-    if (key.startsWith("color_")) colorSettings[key] = value;
+  marketingSettings = marketingSettings.map( entry => {
+    if (entry.key.startsWith("color_")) colorSettings[entry.key] = entry.value;
+    if(entry.type === FileType) return {...entry, value: entry.file};
+    return {...entry};
   });
 
   // create required directories

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.48",
+  "version": "2.0.50",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -42,7 +42,7 @@
     "font-awesome": "^4.7.0",
     "formik": "^2.2.9",
     "fs-extra": "^9.0.1",
-    "full-schedule-widget": "3.0.1",
+    "full-schedule-widget": "3.0.2",
     "gatsby": "^5.8.1",
     "gatsby-alias-imports": "^1.0.6",
     "gatsby-plugin-image": "^3.8.0",
@@ -117,7 +117,7 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "5.0.5",
+    "summit-registration-lite": "5.0.6",
     "superagent": "8.0.9",
     "sweetalert2": "^9.17.0",
     "upcoming-events-widget": "3.0.4",

package/src/components/FullSchedule.js

@@ -28,6 +28,7 @@ const FullSchedule = ({
 }) => {
   const { getSettingByKey } = useMarketingSettings();
   const defaultImage = getSettingByKey(MARKETING_SETTINGS_KEYS.schedultDefaultImage);
+  const summitLogoPrint = getSettingByKey(MARKETING_SETTINGS_KEYS.fullScheduleSummitLogoPrint);
   const componentProps = {
     title: "Schedule",
     summit,
@@ -35,6 +36,7 @@ const FullSchedule = ({
     userProfile,
     withThumbs: false,
     defaultImage: defaultImage,
+    summitLogoPrint: summitLogoPrint ? summitLogoPrint : null,
     showSendEmail: false,
     onStartChat: null,
     shareLink: getShareLink(filters, view),

package/src/components/RegistrationLiteComponent.js

@@ -111,7 +111,6 @@ const RegistrationLiteComponent = ({
 
     const inPersonDisclaimer = getSettingByKey(MARKETING_SETTINGS_KEYS.registrationInPersonDisclaimer);
     const allowPromoCodes = !!Number(getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteAllowPromoCodes));
-    const companyInputPlaceholder = getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteCompanyInputPlaceholder);
     const companyDDLPlaceholder = getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteCompanyDDLPlaceholder);
     const initialOrderComplete1stParagraph = getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteInitialOrderComplete1stParagraph)
     const initialOrderComplete2ndParagraph = getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteInitialOrderComplete2ndParagraph)
@@ -178,7 +177,6 @@ const RegistrationLiteComponent = ({
             });
         },
         allowPromoCodes: allowPromoCodes,
-        companyInputPlaceholder: companyInputPlaceholder,
         companyDDLPlaceholder: companyDDLPlaceholder,
         supportEmail: getEnvVariable(SUPPORT_EMAIL),
         initialOrderComplete1stParagraph: initialOrderComplete1stParagraph,

package/src/components/summit-my-orders-tickets/components/MyOrdersTickets.js

@@ -6,7 +6,6 @@ import { AjaxLoader } from "openstack-uicore-foundation/lib/components";
 import { getUserOrders } from '../store/actions/order-actions';
 import { getUserTickets } from '../store/actions/ticket-actions';
 import { OrderList } from './OrderList/OrderList';
-import { OrderListContextProvider } from './OrderList/OrderList.helpers';
 import { TicketList } from './TicketList/TicketList';
 
 export const MyOrdersTickets = ({ className }) => {
@@ -63,10 +62,8 @@ export const MyOrdersTickets = ({ className }) => {
             )}
 
             <div className={classNames('my-orders-tickets', className)}>
-                {hasOrders && (
-                    <OrderListContextProvider>
-                        <OrderList />
-                    </OrderListContextProvider>
+                {hasOrders && (                    
+                    <OrderList />
                 )}
 
                 {(hasOrders && hasTickets) && (

package/src/components/summit-my-orders-tickets/components/OrderDetails/OrderDetails.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from "react"
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { useTranslation } from "react-i18next";
 import classNames from 'classnames';
 import { getNow } from "../../store/actions/timer-actions";
@@ -11,7 +11,7 @@ import {
     getSummitFormattedDate,
     formatCurrency
 } from "../../util";
-import { useOrderListContext } from "../OrderList/OrderList.helpers";
+import { setActiveOrderId } from "../../store/actions/order-actions";
 
 import './order-details.scss';
 
@@ -20,16 +20,21 @@ export const OrderDetails = ({ order, summit, className }) => {
 
     const { t } = useTranslation();
     const dispatch = useDispatch();
-    const { state, actions } = useOrderListContext();
+
+    const {
+        activeOrderId
+    } = useSelector(state => state.orderState || {});
 
     const isSummitPast = checkSummitPast(summit, dispatch(getNow()));
     const statusData = getOrderStatusData(order, isSummitPast);
-    const isActive = state.activeOrderId === order.id;
+    const isActive = activeOrderId === order.id;
+
+    const handleSetOrderActive = (orderId) => dispatch(setActiveOrderId( orderId ));
 
     const handleClick = (event) => {
-        if (isActive) return actions.setActiveOrderId(null);
+        if (isActive) return handleSetOrderActive(null);
 
-        actions.setActiveOrderId(order.id);
+        handleSetOrderActive(order.id);
 
         setTimeout(() => {
             const offset = getDocumentOffset(elementRef.current);
@@ -42,7 +47,7 @@ export const OrderDetails = ({ order, summit, className }) => {
     };
 
     // Clear active order on unmount (i.e., when page pagination changes)
-    useEffect(() => () => actions.setActiveOrderId(null), []);
+    useEffect(() => () => setActiveOrderId(null), []);
 
     return (
         <div

package/src/components/summit-my-orders-tickets/components/OrderList/OrderList.js

@@ -6,7 +6,6 @@ import classNames from 'classnames';
 import { getUserOrders } from "../../store/actions/order-actions";
 import { getTicketsByOrder } from "../../store/actions/ticket-actions";
 import { OrderListItem } from './OrderListItem';
-import { useOrderListContext } from "./OrderList.helpers";
 
 import './order-list.scss';
 
@@ -19,6 +18,7 @@ export const OrderList = ({ className }) => {
         current_page: currentPage,
         last_page: lastPage,
         per_page: perPage,
+        activeOrderId,
         total
     } = useSelector(state => state.orderState || {});
 
@@ -28,8 +28,6 @@ export const OrderList = ({ className }) => {
         }        
     } = useSelector(state => state.ticketState || {});
 
-    const { state : { activeOrderId } } = useOrderListContext();
-
     const handlePageChange = (page) => dispatch(getUserOrders({ page, perPage }));
 
     const handleTicketPageChange = (orderId, page) => dispatch(getTicketsByOrder({ orderId, page }));

package/src/components/summit-my-orders-tickets/components/OrderList/OrderListItem.js

@@ -5,21 +5,24 @@ import { OrderDetails } from '../OrderDetails/OrderDetails';
 import { OrderSummary } from '../OrderSummary/OrderSummary';
 import { OrderTicketList } from '../OrderTicketList/OrderTicketList';
 import { OrderOptions } from "../OrderOptions/OrderOptions";
-import { useOrderListContext } from "./OrderList.helpers";
 import Pager from "../../../Pager";
 
 export const OrderListItem = ({ order, className, changeTicketsPage }) => {
     const summit = useSelector(state => state.summitState.summit);
-    const { state } = useOrderListContext();
 
     const {
         orderTickets: {
             total, per_page, current_page, last_page, tickets
         },
-        loading
+        loading,
     } = useSelector(state => state.ticketState || {});
 
-    const isActive = state.activeOrderId === order.id;
+    const {
+        activeOrderId,
+        isOrderLoading
+    } = useSelector(state => state.orderState || {});
+
+    const isActive = activeOrderId === order.id;
 
     return (
         <li className={classNames('order-list__item', { 'order-list__item--active': isActive }, className)}>
@@ -27,7 +30,7 @@ export const OrderListItem = ({ order, className, changeTicketsPage }) => {
                 <div className="col-md-8">
                     <OrderDetails order={order} summit={summit} />
 
-                    {isActive && tickets.length > 0 && (
+                    {!isOrderLoading && isActive && tickets.length > 0 && (
                         <>
                             <OrderSummary type="mobile" order={order} summit={summit} tickets={tickets}/>
 

package/src/components/summit-my-orders-tickets/store/actions/order-actions.js

@@ -23,6 +23,7 @@ import history from '../history';
 
 export const GET_USER_ORDERS = 'GET_ORDERS';
 export const REFUND_ORDER = 'REFUND_ORDER';
+export const SET_ACTIVE_ORDER_ID = 'SET_ACTIVE_ORDER_ID';
 
 export const getUserOrders = ({ page = 1, perPage = 5 }) => async (dispatch, getState, { getAccessToken, apiBaseUrl, loginUrl }) => {
     const { summitState: { summit } } = getState();
@@ -81,4 +82,8 @@ export const cancelOrder = ({ order }) => async (dispatch, getState, { getAccess
         dispatch(stopLoading());
         return e;
     });
-};
+};
+
+export const setActiveOrderId = (orderId) => async (dispatch, getState) => {
+    return dispatch(createAction(SET_ACTIVE_ORDER_ID)(orderId));
+}

package/src/components/summit-my-orders-tickets/store/actions/ticket-actions.js

@@ -35,6 +35,7 @@ export const REMOVE_TICKET_ATTENDEE = 'REMOVE_TICKET_ATTENDEE';
 export const REFUND_TICKET = 'REFUND_TICKET';
 export const RESEND_NOTIFICATION = 'RESEND_NOTIFICATION';
 export const GET_TICKETS_BY_ORDER = 'GET_TICKETS_BY_ORDER';
+export const GET_TICKETS_BY_ORDER_ERROR = 'GET_TICKETS_BY_ORDER_ERROR';
 export const GET_ORDER_TICKET_DETAILS = 'GET_ORDER_TICKET_DETAILS';
 export const GET_TICKET_DETAILS = 'GET_TICKET_DETAILS';
 
@@ -148,12 +149,12 @@ export const getTicketById = ({order, ticket}) => async (dispatch, getState, { g
 
 export const getTicketsByOrder = ({ orderId, page = 1, perPage = 5 }) => async (dispatch, getState, { getAccessToken, apiBaseUrl, loginUrl }) => {
     
+    dispatch(startLoading());
+    
     const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
 
     if (!accessToken) return;
 
-    dispatch(startLoading());
-
     const params = {
         access_token: accessToken,        
         expand: 'refund_requests, owner, owner.extra_questions, badge, badge.features',
@@ -171,6 +172,7 @@ export const getTicketsByOrder = ({ orderId, page = 1, perPage = 5 }) => async (
         dispatch(stopLoading());
     }).catch(e => {
         dispatch(stopLoading());
+        dispatch(createAction(GET_TICKETS_BY_ORDER_ERROR));
         return (e);
     });
 }

package/src/components/summit-my-orders-tickets/store/reducers/order-reducer.js

@@ -17,8 +17,10 @@ import { RESET_STATE } from "../actions/base-actions";
 
 import {
     GET_USER_ORDERS,
+    SET_ACTIVE_ORDER_ID,
     REFUND_ORDER,
 } from "../actions/order-actions";
+import { GET_TICKETS_BY_ORDER, GET_TICKETS_BY_ORDER_ERROR } from "../actions/ticket-actions";
 
 const DEFAULT_ENTITY = {
     first_name: '',
@@ -47,6 +49,8 @@ const DEFAULT_STATE = {
     stripeForm: false,
     loaded: false,
     loading: false,
+    activeOrderId: null,
+    isOrderLoading: false,
     current_page: 1,
     last_page: 1,
     per_page: 5,
@@ -69,6 +73,13 @@ const orderReducer = (state = DEFAULT_STATE, action) => {
         case STOP_LOADING:
             return { ...state, loading: false };
             break;
+        case SET_ACTIVE_ORDER_ID: 
+            return { ...state, activeOrderId: payload, isOrderLoading: true };
+            break;
+        case GET_TICKETS_BY_ORDER_ERROR:
+        case GET_TICKETS_BY_ORDER:
+            return { ...state, isOrderLoading: false };
+            break;
         case GET_USER_ORDERS:
             let { data, current_page, total, last_page } = payload.response;
             return { ...state, memberOrders: data, current_page, total, last_page };

package/src/content/site-settings/index.json

@@ -1 +1 @@
-{"widgets":{"chat":{"showQA":false,"showHelp":false,"defaultScope":"page"},"schedule":{"allowClick":true}},"favicons":{"favicon180":"/img/favicon.png","favicon32":"/img/favicon.png","favicon16":"/img/favicon.png"},"staticJsonFilesBuildTime":[{"file":"src/data/summit.json","build_time":1692900122710},{"file":"src/data/events.json","build_time":1692900127255},{"file":"src/data/events.idx.json","build_time":1692900127260},{"file":"src/data/speakers.json","build_time":1692900131183},{"file":"src/data/speakers.idx.json","build_time":1692900131185},{"file":"src/content/sponsors.json","build_time":1692900134268},{"file":"src/data/voteable-presentations.json","build_time":1692900134602}],"lastBuild":1692900134603}
+{"widgets":{"chat":{"showQA":false,"showHelp":false,"defaultScope":"page"},"schedule":{"allowClick":true}},"favicons":{"favicon180":"/img/favicon.png","favicon32":"/img/favicon.png","favicon16":"/img/favicon.png"},"staticJsonFilesBuildTime":[{"file":"src/data/summit.json","build_time":1692922259099},{"file":"src/data/events.json","build_time":1692922264079},{"file":"src/data/events.idx.json","build_time":1692922264084},{"file":"src/data/speakers.json","build_time":1692922268263},{"file":"src/data/speakers.idx.json","build_time":1692922268264},{"file":"src/content/sponsors.json","build_time":1692922271753},{"file":"src/data/voteable-presentations.json","build_time":1692922272661}],"lastBuild":1692922272663}

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

@@ -435,7 +435,7 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up
                             <br />
                             <label className={styles.checkbox}>
                                 <input type="checkbox" checked={allowChatWithMe} onChange={e => setAllowChatWithMe(e.target.checked)} />
-                                Allow people to chat with me ?
+                                Allow people to chat with me?
                             </label>
                             <div className={`columns is-mobile ${styles.buttons}`}>
                                 <div className={`column is-half`}>

package/src/utils/useMarketingSettings.js

@@ -7,10 +7,10 @@ export const MARKETING_SETTINGS_KEYS = {
   disqusExcludeTracks: "disqus_exclude_tracks",
   registrationInPersonDisclaimer: "registration_in_person_disclaimer",
   scheduleDefaultImage: "schedule_default_image",
+  fullScheduleSummitLogoPrint: "FULL_SCHEDULE_SUMMIT_LOGO_PRINT",
   summitDeltaStartTime: "summit_delta_start_time",
   activityCtaText: "ACTIVITY_CTA_TEXT",
   regLiteAllowPromoCodes: "REG_LITE_ALLOW_PROMO_CODES",
-  regLiteCompanyInputPlaceholder: "REG_LITE_COMPANY_INPUT_PLACEHOLDER",
   regLiteCompanyDDLPlaceholder: "REG_LITE_COMPANY_DDL_PLACEHOLDER",
   regLiteInitialOrderComplete1stParagraph: "REG_LITE_INITIAL_ORDER_COMPLETE_STEP_1ST_PARAGRAPH",
   regLiteInitialOrderComplete2ndParagraph: "REG_LITE_INITIAL_ORDER_COMPLETE_STEP_2ND_PARAGRAPH",
@@ -21,6 +21,7 @@ export const MARKETING_SETTINGS_KEYS = {
   regLiteNoAllowedTicketsMessage: "REG_LITE_NO_ALLOWED_TICKETS_MESSAGE",
 }
 
+
 const marketingSettingsQuery = graphql`
   query {
     allMarketingSettingsJson {
@@ -35,7 +36,7 @@ const marketingSettingsQuery = graphql`
 const useMarketingSettings = () => {
   const { allMarketingSettingsJson } = useStaticQuery(marketingSettingsQuery);
   const getSettingByKey = (key) =>
-    allMarketingSettingsJson.nodes.find(setting => setting.key === key)?.value;
+      allMarketingSettingsJson.nodes.find(setting => setting.key === key)?.value;
   return { getSettingByKey };
 };
 

package/src/components/summit-my-orders-tickets/components/OrderList/OrderList.helpers.js

@@ -1,36 +0,0 @@
-import React, { createContext, useContext, useReducer } from "react";
-import { createReducer } from '../../util/helpers/createReducer';
-
-const initialState = {
-    activeOrderId: null,
-};
-
-const actions = ({ state, dispatch }) => ({
-    setActiveOrderId: (orderId) => dispatch({ type: 'setActiveOrderId', payload: orderId }),
-});
-
-const actionHandlers = {
-    setActiveOrderId: (state, orderId) => ({ ...state, activeOrderId: orderId })
-};
-
-const reducer = createReducer({ actionHandlers });
-
-export const OrderListContext = createContext(null);
-
-export const OrderListContextProvider = ({ children }) => {
-    const [state, dispatch] = useReducer(reducer, {}, () => initialState);
-
-    return (
-        <OrderListContext.Provider value={{ state, dispatch }}>
-            {children}
-        </OrderListContext.Provider>
-    )
-};
-
-export const useOrderListContext = () => {
-    const context = useContext(OrderListContext);
-
-    if (!context) throw new Error('useOrderListContext must be used within a OrderListContextProvider');
-
-    return { ...context, actions: actions(context) };
-};

package/src/components/summit-my-orders-tickets/context/OrdersTicketsContext.js

@@ -1,38 +0,0 @@
-import React, { createContext, useContext, useReducer } from 'react';
-import { createReducer } from '../util/helpers/createReducer';
-
-const initialState = {
-    orders: []
-};
-
-const actions = ({ state, dispatch }) => ({
-    setOrders: (orders) => dispatch({ type: 'setOrders', payload: orders }),
-    setLoading: (loading) => dispatch({ type: 'setLoading', payload: loading })
-});
-
-const actionHandlers = {
-    setOrders: (state, orders) => ({ ...state, orders }),
-    setLoading: (state, loading) => ({ ...state, loading })
-};
-
-const reducer = createReducer({ actionHandlers });
-
-export const OrdersTicketsContext = createContext(null);
-
-export const OrdersTicketsProvider = ({ children }) => {
-    const [state, dispatch] = useReducer(reducer, {}, () => initialState);
-
-    return (
-        <OrdersTicketsContext.Provider value={{ state, dispatch }}>
-            {children}
-        </OrdersTicketsContext.Provider>
-    );
-};
-
-export const useOrdersTicketsContext = () => {
-    const context = useContext(OrdersTicketsContext);
-
-    if (!context) throw new Error('useOrdersTicketsContext must be used within a OrdersTicketsProvider');
-
-    return { ...context, actions: actions(context) };
-};