@openeventkit/event-site 2.0.118 → 2.0.120

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.118",
+  "version": "2.0.120",
   "author": "Tipit LLC",
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -50,7 +50,7 @@
     "final-form": "4.20.7",
     "font-awesome": "^4.7.0",
     "formik": "^2.2.9",
-    "full-schedule-widget": "3.0.5",
+    "full-schedule-widget": "3.0.9",
     "gatsby": "^5.13.5",
     "gatsby-alias-imports": "^1.0.6",
     "gatsby-plugin-decap-cms": "^4.0.4",

package/src/actions/schedule-actions.js

@@ -8,6 +8,7 @@ export const UPDATE_FILTERS = "UPDATE_FILTERS";
 export const CLEAR_FILTERS = "CLEAR_FILTERS";
 export const CHANGE_VIEW = "CHANGE_VIEW";
 export const CHANGE_TIMEZONE = "CHANGE_TIMEZONE";
+export const CHANGE_TIME_FORMAT = "CHANGE_TIME_FORMAT";
 
 /**
  * This action is defined to just reinitialize the allScheduleReducer state
@@ -97,7 +98,7 @@ export const updateFiltersFromHash =
     Object.keys(filters).forEach((key) => {
       newFilters[key] = { ...filters[key] }; // copy label and rest of props
 
-      if (key === "title") {
+      if (key === "title" || key === "abstract") {
         newFilters[key].values = normalizedFilters[key]
           ? decodeURIComponent(normalizedFilters[key])
           : "";

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

@@ -6,6 +6,7 @@ import marketingPage from "./marketingPage";
 import lobbyPage from "./lobbyPage";
 import expoHallPage from "./expoHallPage";
 import invitationsRejectPage from "./invitationsRejectPage";
+import mySchedulePage from "./mySchedulePage";
 
 const defaultPagesCollection = {
   ...collectionDefaults({
@@ -16,7 +17,8 @@ const defaultPagesCollection = {
     marketingPage,
     lobbyPage,
     expoHallPage,
-    invitationsRejectPage
+    invitationsRejectPage,
+    mySchedulePage
   ]
 };
 

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

@@ -0,0 +1,36 @@
+import {
+  booleanField,
+  stringField
+} from "../../../fields";
+
+import {
+  MY_SCHEDULE_PAGE_FILE_PATH
+} from "@utils/filePath";
+
+const mySchedulePage = {
+  label: "My Schedule Page",
+  name: "my-schedule-page",
+  file: MY_SCHEDULE_PAGE_FILE_PATH,
+  fields: [
+    stringField({
+      label: "Title",
+      name: "title",
+      default: "My Schedule",
+      required: true
+    }),
+    stringField({
+      label: "Key",
+      name: "key",
+      default: "my-schedule-main",
+      required: true
+    }),
+    booleanField({
+      label: "Needs Ticket Permission?",
+      name: "needsTicketAuthz",
+      required: true,
+      default: false
+    })
+  ]
+};
+
+export default mySchedulePage;

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

@@ -0,0 +1,8 @@
+
+module.exports = `
+  type mySchedulePageJson implements Node {
+    title: String
+    key: String
+    needsTicketAuthz: Boolean
+  }
+`;

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

@@ -2,10 +2,12 @@ const marketingPageTypeDefs = require("./marketingPage/typeDefs");
 const lobbyPageTypeDefs = require("./lobbyPage/typeDefs");
 const expoHallPageTypeDefs = require("./expoHallPage/typeDefs");
 const invitationsRejectPageTypeDefs = require("./invitationsRejectPage/typeDefs");
+const mySchedulePageTypeDefs = require("./mySchedulePage/typeDefs");
 
 module.exports = [
   marketingPageTypeDefs,
   lobbyPageTypeDefs,
   expoHallPageTypeDefs,
-  invitationsRejectPageTypeDefs
+  invitationsRejectPageTypeDefs,
+  mySchedulePageTypeDefs
 ].join("");

package/src/content/my-schedule-page/index.json

@@ -0,0 +1,5 @@
+{
+  "title": "My Schedule",
+  "key": "my-schedule-main",
+  "needsTicketAuthz": true
+}

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

@@ -22,6 +22,24 @@ import Link from "../../components/Link";
 import { titleFromPathname } from "../../utils/urlFormating";
 import {graphql} from "gatsby";
 
+const mySchedulePage = ({ location, summitPhase,isLoggedUser, user, allowClick, title, key }) => {
+  return  <SchedulePage
+    path="/my-schedule"
+    location={location}
+    summitPhase={summitPhase}
+    isLoggedIn={isLoggedUser}
+    user={user}
+    scheduleProps={{
+      title: title,
+      showSync: true,
+      showShare: false,             
+      subtitle: <Link to={"/a/schedule"}>Show Schedule</Link>
+    }}
+    schedKey={key}
+    allowClick={allowClick}
+  />;
+}
+
 export const appQuery = graphql`
   query {
     invitationsRejectPageJson {
@@ -33,10 +51,19 @@ export const appQuery = graphql`
       alreadyAcceptedInvitationError
       alreadyRejectedInvitationError
     }
+    mySchedulePageJson {
+      title
+      key
+      needsTicketAuthz
+    }
   }
 `;
 
+
 const App = ({ isLoggedUser, user, summitPhase, allowClick = true, data }) => {
+
+  const { mySchedulePageJson } = data;
+
   return (
     <Location>
       {({ location }) => (
@@ -55,24 +82,12 @@ const App = ({ isLoggedUser, user, summitPhase, allowClick = true, data }) => {
             <MyTicketsPage path="/my-tickets" isLoggedIn={isLoggedUser} user={user} location={location} />
             <FullProfilePage path="/profile" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location} />
             <ExtraQuestionsPage path="/extra-questions" isLoggedIn={isLoggedUser} user={user} location={location} />
+            { !mySchedulePageJson.needsTicketAuthz && mySchedulePage({location, summitPhase,isLoggedUser, user, allowClick, title:mySchedulePageJson.title, key: mySchedulePageJson.key }) }
             <WithAuthzRoute path="/" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location}>
                 <PostersPage path="/posters" trackGroupId={0} location={location} />
                 <PostersPage path="/posters/:trackGroupId" location={location} />
                 <PosterDetailPage path="/poster/:presentationId/" isLoggedIn={isLoggedUser} user={user} location={location} />
-                <SchedulePage
-                  path="/my-schedule"
-                  location={location}
-                  summitPhase={summitPhase}
-                  isLoggedIn={isLoggedUser}
-                  user={user}
-                  scheduleProps={{
-                    title: "My Schedule",
-                    showSync: true,
-                    subtitle: <Link to={"/a/schedule"}>Show Schedule</Link>
-                  }}
-                  schedKey="my-schedule-main"
-                  allowClick={allowClick}
-                />
+                { mySchedulePageJson.needsTicketAuthz && mySchedulePage({location, summitPhase,isLoggedUser, user, allowClick, title: mySchedulePageJson.title, key: mySchedulePageJson.key }) }
                 <ShowOpenRoute path="/" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location}>
                   <WithBadgeRoute path="/event/:eventId" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location}>
                     <EventPage path="/" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location} />

package/src/reducers/all-schedules-reducer.js

@@ -1,7 +1,7 @@
 import scheduleReducer from './schedule-reducer';
 import {filterEventsByTags} from '../utils/schedule';
 import {LOGOUT_USER} from "openstack-uicore-foundation/lib/security/actions";
-import {CLEAR_FILTERS, UPDATE_FILTER, UPDATE_FILTERS, CHANGE_VIEW, CHANGE_TIMEZONE, RELOAD_SCHED_DATA , RELOAD_USER_PROFILE} from '../actions/schedule-actions'
+import {CLEAR_FILTERS, UPDATE_FILTER, UPDATE_FILTERS, CHANGE_VIEW, CHANGE_TIMEZONE, CHANGE_TIME_FORMAT, RELOAD_SCHED_DATA , RELOAD_USER_PROFILE} from '../actions/schedule-actions'
 import {RESET_STATE, SYNC_DATA} from "../actions/base-actions-definitions";
 import {GET_EVENT_DATA} from '../actions/event-actions-definitions';
 import {ADD_TO_SCHEDULE, REMOVE_FROM_SCHEDULE, GET_USER_PROFILE} from "../actions/user-actions";
@@ -97,6 +97,7 @@ const allSchedulesReducer = (state = DEFAULT_STATE, action) => {
             }
             return {...state, allEvents: updatedEvents};
         }
+        case CHANGE_TIME_FORMAT:
         case CHANGE_TIMEZONE:
         case CHANGE_VIEW:
         case CLEAR_FILTERS:

package/src/reducers/schedule-reducer.js

@@ -15,6 +15,7 @@ const INITIAL_STATE = {
     baseFilters: [],
     view: 'calendar',
     timezone: 'show',
+    timeFormat: null,
     colorSource: 'track',
     is_my_schedule: false,
     only_events_with_attendee_access: false,
@@ -45,7 +46,8 @@ const scheduleReducer = (state = INITIAL_STATE, action) => {
                 hide_past_events_with_show_always_on_schedule,
                 is_my_schedule,
                 userProfile,
-                isLoggedUser
+                isLoggedUser,
+                time_format
             } = payload; // data from JSON
 
             const filterByAccessLevel = only_events_with_attendee_access && isLoggedUser;
@@ -63,7 +65,8 @@ const scheduleReducer = (state = INITIAL_STATE, action) => {
                 events,
                 is_my_schedule,
                 only_events_with_attendee_access,
-                hide_past_events_with_show_always_on_schedule
+                hide_past_events_with_show_always_on_schedule,
+                timeFormat: state.timeFormat || time_format || '12h'
             };
         }
         case `SCHED_UPDATE_FILTER`: {
@@ -109,6 +112,10 @@ const scheduleReducer = (state = INITIAL_STATE, action) => {
             const {timezone} = payload;
             return {...state, timezone}
         }
+        case `SCHED_CHANGE_TIME_FORMAT`: {
+            const {timeFormat} = payload;
+            return {...state, timeFormat}
+        }
         case `SCHED_ADD_TO_SCHEDULE`: {
             const event = payload;
             const {allEvents, filters, hide_past_events_with_show_always_on_schedule} = state;

package/src/templates/schedule-page.js

@@ -19,7 +19,7 @@ const SchedulePage = ({ summit, scheduleState, summitPhase, isLoggedUser, locati
 
   const [showFilters, setShowfilters] = useState(false);
   const filtersWrapperRef = useRef(null);
-  const { key, events, allEvents, filters, view, timezone, colorSource } = scheduleState || {};
+  const { key, events, allEvents, filters, view, timezone, timeFormat, colorSource } = scheduleState || {};
 
   useEffect(() => {
     if (scheduleState && !!events?.length) {
@@ -71,6 +71,7 @@ const SchedulePage = ({ summit, scheduleState, summitPhase, isLoggedUser, locati
     filters,
     view,
     timezone,
+    timeFormat,
     colorSource,
     schedKey,
     modalSyncText: `Use the link below to add your saved sessions (found in My Schedule) to your personal 

package/src/utils/filePath.js

@@ -44,6 +44,8 @@ const CMS_FONT_FILE_PATH = "/static/fonts/"
 const PAYMENTS_FILE_PATH = `${STATIC_CONTENT_DIR_PATH}/payments.json`;
 const APPLE_PAY_DOMAIN_FILE_PATH = `/static/.well-known/`
 const APPLE_PAY_DOMAIN_FILE_NAME = `apple-developer-merchantid-domain-association`;
+const MY_SCHEDULE_PAGE_DIR_PATH = `${STATIC_CONTENT_DIR_PATH}/my-schedule-page`;
+const MY_SCHEDULE_PAGE_FILE_PATH = `${MY_SCHEDULE_PAGE_DIR_PATH}/index.json`;
 
 exports.REQUIRED_DIR_PATHS = [
   DATA_DIR_PATH,
@@ -55,8 +57,10 @@ exports.REQUIRED_DIR_PATHS = [
   LOBBY_PAGE_DIR_PATH,
   INVITATIONS_REJECT_PAGE_FILE_PATH,
   NAVBAR_DIR_PATH,
-  FOOTER_DIR_PATH
+  FOOTER_DIR_PATH,
+  MY_SCHEDULE_PAGE_FILE_PATH
 ];
+
 exports.STATIC_CONTENT_DIR_PATH = STATIC_CONTENT_DIR_PATH;
 exports.PAGES_DIR_PATH = PAGES_DIR_PATH;
 exports.CONTENT_PAGES_PATH_NAME = CONTENT_PAGES_PATH_NAME;
@@ -95,3 +99,4 @@ exports.CMS_FONT_FILE_PATH = CMS_FONT_FILE_PATH;
 exports.PAYMENTS_FILE_PATH = PAYMENTS_FILE_PATH;
 exports.APPLE_PAY_DOMAIN_FILE_PATH = APPLE_PAY_DOMAIN_FILE_PATH;
 exports.APPLE_PAY_DOMAIN_FILE_NAME = APPLE_PAY_DOMAIN_FILE_NAME;
+exports.MY_SCHEDULE_PAGE_FILE_PATH = MY_SCHEDULE_PAGE_FILE_PATH;

package/src/utils/withScheduleData.js

@@ -1,6 +1,7 @@
 import React, {useEffect, useState} from "react";
 import { connect } from "react-redux";
 import {compose} from "redux";
+import { useLocation } from '@reach/router';
 import HeroComponent from "../components/HeroComponent";
 import {clearFilters, callAction, updateFilter, updateFiltersFromHash} from "../actions/schedule-actions";
 import { reloadScheduleData } from '../actions/base-actions';
@@ -12,13 +13,14 @@ const componentWrapper = (WrappedComponent) => ({schedules, ...props}) => {
   const { updateFiltersFromHash, reloadScheduleData, schedKey, summit, staticJsonFilesBuildTime } = props;
   const scheduleState = schedules?.find( s => s.key === schedKey);
   const { key, filters, view } = scheduleState || {};
+  const location = useLocation();
 
   useEffect(() => {
     if (schedules.length > 0) {
       updateFiltersFromHash(schedKey, filters, view);
       setLoaded(true);
     }
-  }, [key]);
+  }, [key, location.hash]);
 
   if (!loaded)
     return <HeroComponent title="Loading schedule data" />;