@openeventkit/event-site 2.0.119 → 2.0.121

package/gatsby-browser.js

@@ -6,6 +6,7 @@ import KlaroProvider from "./src/utils/cookies/providers/KlaroProvider";
 import cookieServices from "./src/utils/cookies/services";
 import TagManager from "./src/utils/tag-manager/TagManager";
 import GoogleTagManagerProvider from "./src/utils/tag-manager/providers/GoogleTagManagerProvider";
+import { getEnvVariable, GOOGLE_TAGMANAGER_ID } from "@utils/envVariables";
 import smoothscroll from "smoothscroll-polyfill";
 import "what-input";
 
@@ -25,17 +26,19 @@ export const onClientEntry = () => {
   // smooth scroll polyfill needed for Safari
   smoothscroll.polyfill();
 
-  // Initialize TagManager and add GoogleTagManagerProvider
-  const tagManager = new TagManager();
-  const googleTagManagerProvider = new GoogleTagManagerProvider();
-  tagManager.addProvider(googleTagManagerProvider);
+  // show cookie consent only if google tag manager was deferred loaded
+  // see gatsby-google-tag-manager-plugin in gatsby-config
+  if (getEnvVariable(GOOGLE_TAGMANAGER_ID)) {
+    const tagManager = new TagManager();
+    const googleTagManagerProvider = new GoogleTagManagerProvider();
+    tagManager.addProvider(googleTagManagerProvider);
 
-  // Initialize Cookie Manager with Klaro provider
-  const klaroProvider = new KlaroProvider();
-  const cookieManager = new CookieManager(klaroProvider, cookieServices);
-  cookieManager.show();
+    const klaroProvider = new KlaroProvider();
+    const cookieManager = new CookieManager(klaroProvider, cookieServices);
+    cookieManager.show();
+  }
 
-  // Apply colors
+  // apply colors
   Object.entries(colors).forEach(([key, value]) => {
     document.documentElement.style.setProperty(`--${key}`, value);
     document.documentElement.style.setProperty(`--${key}50`, `${value}50`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.119",
+  "version": "2.0.121",
   "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",
@@ -128,7 +128,7 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "5.0.36",
+    "summit-registration-lite": "5.0.37",
     "superagent": "8.0.9",
     "sweetalert2": "^9.17.0",
     "upcoming-events-widget": "3.0.5",

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/pages/a/[...].js

@@ -32,6 +32,7 @@ const mySchedulePage = ({ location, summitPhase,isLoggedUser, user, allowClick,
     scheduleProps={{
       title: title,
       showSync: true,
+      showShare: false,             
       subtitle: <Link to={"/a/schedule"}>Show Schedule</Link>
     }}
     schedKey={key}
@@ -86,7 +87,7 @@ const App = ({ isLoggedUser, user, summitPhase, allowClick = true, data }) => {
                 <PostersPage path="/posters" trackGroupId={0} location={location} />
                 <PostersPage path="/posters/:trackGroupId" location={location} />
                 <PosterDetailPage path="/poster/:presentationId/" isLoggedIn={isLoggedUser} user={user} location={location} />
-              { mySchedulePageJson.needsTicketAuthz && mySchedulePage({location, summitPhase,isLoggedUser, user, allowClick, title: mySchedulePageJson.title, key: mySchedulePageJson.key }) }
+                { 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/cookies/providers/KlaroProvider.js

@@ -32,8 +32,11 @@ class KlaroProvider extends CookieManagerProvider {
         },
         consentNotice: {
           description:
-            "Hi! Could we please enable cookies for anonymous {purposes} to improve your user experience?"
+            "Hi! We use cookies to give you the best online experience and analyze our website's performance by collecting anonymous user data, but only if you accept.",
+          learnMore: "Customize"
         },
+        decline: "No thanks",
+        ok: "Sure"
       }
     },
     services: services.map(service => ({

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" />;