@openeventkit/event-site 2.0.93 → 2.0.94

package/package.json

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

package/src/actions/user-actions.js

@@ -93,7 +93,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(

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/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/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);
 };