@openeventkit/event-site 2.1.12 → 2.1.14

package/.github/workflows/jest.yml

@@ -0,0 +1,15 @@
+name: jest
+
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - run: yarn install
+      - run: yarn test

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.1.12",
+  "version": "2.1.14",
   "author": "Tipit LLC",
   "dependencies": {
     "@emotion/server": "^11.11.0",
@@ -37,13 +37,13 @@
     "autoprefixer": "10.4.14",
     "awesome-bootstrap-checkbox": "^1.0.1",
     "axios": "^0.19.2",
-    "babel-preset-gatsby": "^3.13.2",
+    "babel-preset-gatsby": "^3.14.0",
     "browser-tabs-lock": "^1.2.15",
     "buffer": "^6.0.3",
     "bulma": "^0.9.0",
     "chain-function": "^1.0.1",
     "classnames": "^2.3.1",
-    "core-js": "^2.6.11",
+    "core-js": "^3.44.0",
     "cross-env": "^7.0.3",
     "crypto-js": "^4.1.1",
     "decap-cms-app": "^3.1.10",
@@ -56,7 +56,7 @@
     "font-awesome": "^4.7.0",
     "formik": "^2.4.6",
     "fs-extra": "^11.3.0",
-    "full-schedule-widget": "3.0.10",
+    "full-schedule-widget": "3.0.11",
     "gatsby": "^5.13.5",
     "gatsby-alias-imports": "^1.0.6",
     "gatsby-plugin-decap-cms": "^4.0.4",

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

@@ -1 +1 @@
-{"favicon":{"asset":"icon.png"},"widgets":{"chat":{"enabled":true,"showQA":false,"showHelp":false,"defaultScope":"page"},"schedule":{"allowClick":true}},"identityProviderButtons":[{"buttonColor":"#082238","providerLabel":"Continue with FNid","providerLogo":"logo_fn.svg","providerLogoSize":27},{"buttonColor":"#0A66C2","providerLabel":"Sign in with LinkedIn","providerParam":"linkedin","providerLogo":"logo_linkedin.svg","providerLogoSize":18},{"buttonColor":"#000000","providerLabel":"Sign in with Apple","providerParam":"apple","providerLogoSize":17,"providerLogo":"logo_apple.svg"},{"buttonColor":"#1877F2","providerLabel":"Login with Facebook","providerParam":"facebook","providerLogo":"logo_facebook.svg","providerLogoSize":20}],"maintenanceMode":{"enabled":false,"title":"Site under maintenance","subtitle":"Please reload page shortly"},"staticJsonFilesBuildTime":[{"file":"src/data/summit.json","build_time":1748026605601},{"file":"src/data/events.json","build_time":1748026626928},{"file":"src/data/events.idx.json","build_time":1748026626985},{"file":"src/data/speakers.json","build_time":1748026634015},{"file":"src/data/speakers.idx.json","build_time":1748026634022},{"file":"src/content/sponsors.json","build_time":1748026637386},{"file":"src/data/voteable-presentations.json","build_time":1748026638342}],"lastBuild":1748026638342}
+{"favicon":{"asset":"icon.png"},"widgets":{"chat":{"enabled":true,"showQA":false,"showHelp":false,"defaultScope":"page"},"schedule":{"allowClick":true}},"identityProviderButtons":[{"buttonColor":"#082238","providerLabel":"Continue with FNid","providerLogo":"logo_fn.svg","providerLogoSize":27},{"buttonColor":"#0A66C2","providerLabel":"Sign in with LinkedIn","providerParam":"linkedin","providerLogo":"logo_linkedin.svg","providerLogoSize":18},{"buttonColor":"#000000","providerLabel":"Sign in with Apple","providerParam":"apple","providerLogoSize":17,"providerLogo":"logo_apple.svg"},{"buttonColor":"#1877F2","providerLabel":"Login with Facebook","providerParam":"facebook","providerLogo":"logo_facebook.svg","providerLogoSize":20}],"maintenanceMode":{"enabled":false,"title":"Site under maintenance","subtitle":"Please reload page shortly"},"staticJsonFilesBuildTime":[{"file":"src/data/summit.json","build_time":1753889474771},{"file":"src/data/events.json","build_time":1753889479166},{"file":"src/data/events.idx.json","build_time":1753889479169},{"file":"src/data/speakers.json","build_time":1753889480006},{"file":"src/data/speakers.idx.json","build_time":1753889480006},{"file":"src/content/sponsors.json","build_time":1753889480726},{"file":"src/data/voteable-presentations.json","build_time":1753889481772}],"lastBuild":1753889481773}

package/src/content/sponsors.json

@@ -1 +1 @@
-[{"id":360,"created":1741369599,"last_edited":1741369599,"order":2,"summit_id":63,"is_published":true,"side_image":null,"header_image":null,"header_image_mobile":null,"carousel_advertise_image":null,"marquee":"","intro":"","external_link":"","video_link":"","chat_link":"","featured_event_id":0,"header_image_alt_text":"","side_image_alt_text":"","header_image_mobile_alt_text":"","carousel_advertise_image_alt_text":"","show_logo_in_event_page":true,"lead_report_setting_id":null,"extra_questions":[541],"members":[96743,29308],"company":{"id":3496,"created":1654774567,"last_edited":1654774567,"name":"Tipit","url":null,"url_segment":null,"city":null,"state":null,"country":null,"description":null,"industry":null,"contributions":null,"member_level":null,"overview":null,"products":null,"commitment":null,"commitment_author":null,"logo":null,"big_logo":null,"color":"#f0f0ee","display_on_site":false,"featured":false,"contact_email":null,"admin_email":null,"sponsorships":[],"project_sponsorships":[]},"sponsorship":{"id":2065,"widget_title":"Test Widget Title","lobby_template":"big-images","expo_hall_template":"big-images","sponsor_page_template":"small-header","event_page_template":"small-images","sponsor_page_use_disqus_widget":false,"sponsor_page_use_live_event_widget":false,"sponsor_page_use_schedule_widget":false,"sponsor_page_use_banner_widget":false,"badge_image":"https://summit-api-dev-assets.nyc3.digitaloceanspaces.com/summits/63/summit_sponsorship_types/2065/shopping.png","badge_image_alt_text":"","summit_id":63,"order":2,"should_display_on_expo_hall_page":false,"should_display_on_lobby_page":false,"type":{"id":8,"created":1603223268,"last_edited":1603223268,"name":"Featured","label":"Featured","order":8,"size":"Large"}},"ads":[],"materials":[],"social_networks":[]}]
+[]

package/src/reducers/__tests__/scheduleReducer.test.js

@@ -0,0 +1,201 @@
+jest.mock('data/summit.json', () => ({
+    time_zone_id: 'America/New_York'
+}), { virtual: true });
+
+import scheduleReducer from '../schedule-reducer';
+import { getFilteredEvents } from '../../utils/schedule';
+/**
+ * We want to verify that your scheduleReducer properly handles the action:
+ * { type: 'SCHED_CLEAR_FILTERS' }
+ * That means:
+ * - filters are reset to baseFilters
+ * - baseFilters is not mutated
+ * - A new list of events is generated by calling getFilteredEvents(...)
+ */
+
+
+/*
+    mock getFilteredEvents
+    we are not testing that function , we want to test if the reducer calls it correctly.
+ */
+jest.mock('../../utils/schedule', () => {
+    const originalModule = jest.requireActual('../../utils/schedule');
+    return {
+        ...originalModule,
+        preFilterEvents: jest.fn(() => ['event-1', 'event-2']),
+        getFilteredEvents: jest.fn(() => ['filtered-event-1', 'filtered-event-2']),
+        syncFilters: jest.fn((newF, _) => newF)
+    };
+});
+
+describe('scheduleReducer - SCHED_CLEAR_FILTERS', () => {
+    /*
+     define a mock state for a schedule, simulating:
+     - 2 filters (track, level) with current selections
+     - baseFilters representing the "original empty state"
+     - 2 allEvents, and 1 already filtered event
+     */
+    const initialState = {
+        allEvents: ['event1', 'event2'],
+        filters: {
+            track: { label: 'Track', order: 1, values: ['Dev'], options: ['Dev', 'Ops'] },
+            level: { label: 'Level', order: 2, values: ['Advanced'], options: ['Beginner', 'Advanced'] }
+        },
+        baseFilters: {
+            track: { label: 'Track', order: 1, values: [], options: ['Dev', 'Ops'] },
+            level: { label: 'Level', order: 2, values: [], options: ['Beginner', 'Advanced'] }
+        },
+        events: ['some-event'],
+        hide_past_events_with_show_always_on_schedule: false
+    };
+
+    it('should reset filters to baseFilters with cleared values', () => {
+        // dispatch action SCHED_CLEAR_FILTERS
+        const action = { type: 'SCHED_CLEAR_FILTERS' };
+        const newState = scheduleReducer(initialState, action);
+
+        // filters match baseFilters
+        expect(newState.filters).toEqual({
+            track: { label: 'Track', order: 1, values: [], options: ['Dev', 'Ops'] },
+            level: { label: 'Level', order: 2, values: [], options: ['Beginner', 'Advanced'] }
+        });
+
+        // getFilteredEvents was called with correct arguments
+        expect(getFilteredEvents).toHaveBeenCalledWith(
+            initialState.allEvents,
+            newState.filters,
+            expect.any(String), // summitTimeZoneId
+            false
+        );
+        // events were updated from its return value
+        expect(newState.events).toEqual(['filtered-event-1', 'filtered-event-2']);
+    });
+
+    it('should not mutate baseFilters object', () => {
+        const baseClone = JSON.parse(JSON.stringify(initialState.baseFilters));
+        scheduleReducer(initialState, { type: 'SCHED_CLEAR_FILTERS' });
+
+        expect(initialState.baseFilters).toEqual(baseClone); // ensure not mutated
+    });
+
+});
+
+
+
+describe('scheduleReducer - SCHED_UPDATE_FILTER', () => {
+    const initialState = {
+        allEvents: ['event1', 'event2'],
+        filters: {
+            track: { label: 'Track', order: 1, values: ['Dev'], options: ['Dev', 'Ops'] },
+            level: { label: 'Level', order: 2, values: ['Advanced'], options: ['Beginner', 'Advanced'] }
+        },
+        baseFilters: {
+            track: { label: 'Track', order: 1, values: [], options: ['Dev', 'Ops'] },
+            level: { label: 'Level', order: 2, values: [], options: ['Beginner', 'Advanced'] }
+        },
+        events: [],
+        hide_past_events_with_show_always_on_schedule: false
+    };
+
+    it('should update a single filter on SCHED_UPDATE_FILTER', () => {
+        const action = {
+            type: 'SCHED_UPDATE_FILTER',
+            payload: {
+                type: 'track',
+                values: ['Ops'],
+                hide_past_events_with_show_always_on_schedule: false
+            }
+        };
+
+        const state = scheduleReducer(initialState, action);
+
+        expect(state.filters.track.values).toEqual(['Ops']);
+        expect(state.filters.level.values).toEqual(['Advanced']); // unchanged
+        expect(getFilteredEvents).toHaveBeenCalled();
+        expect(state.events).toEqual(['filtered-event-1', 'filtered-event-2']);
+    });
+
+    it('should replace filters and view on SCHED_UPDATE_FILTERS', () => {
+        const action = {
+            type: 'SCHED_UPDATE_FILTERS',
+            payload: {
+                view: 'list',
+                filters: {
+                    topic: { label: 'Topic', values: ['AI'], options: ['AI', 'ML'] }
+                }
+            }
+        };
+
+        const state = scheduleReducer(initialState, action);
+
+        expect(state.view).toBe('list');
+        expect(state.filters.topic.values).toEqual(['AI']);
+        expect(state.events).toEqual(['filtered-event-1', 'filtered-event-2']);
+    });
+
+    it('should return the same state on unknown action', () => {
+        const action = { type: 'UNKNOWN_ACTION' };
+        const state = scheduleReducer(initialState, action);
+        expect(state).toBe(initialState);
+    });
+});
+
+
+describe('scheduleReducer - SCHED_RELOAD_SCHED_DATA', () => {
+    // mock initial state
+    const initialState = {
+        filters: {},
+        baseFilters: {},
+        allEvents: [],
+        events: [],
+        timeFormat: '12h',
+        hide_past_events_with_show_always_on_schedule: false
+    };
+
+    // mock action
+    const action = {
+        type: 'SCHED_RELOAD_SCHED_DATA',
+        payload: {
+            color_source: 'Track',
+            pre_filters: { topic: { values: ['Dev'] } },
+            all_events: ['raw-event-1', 'raw-event-2'],
+            filters: {
+                topic: {
+                    label: 'Topic',
+                    values: [],
+                    options: ['Dev', 'Ops'],
+                    order: 1
+                }
+            },
+            baseFilters: {
+                topic: {
+                    label: 'Topic',
+                    values: [],
+                    options: ['Dev', 'Ops'],
+                    order: 1
+                }
+            },
+            only_events_with_attendee_access: true,
+            hide_past_events_with_show_always_on_schedule: true,
+            is_my_schedule: true,
+            isLoggedUser: true,
+            userProfile: { id: 123 },
+            time_format: '24h'
+        }
+    };
+
+    it('should reload schedule data and compute new filtered events', () => {
+
+        // dispatch action
+        const newState = scheduleReducer(initialState, action);
+
+        expect(newState.allEvents).toEqual(['event-1', 'event-2']);
+        expect(newState.colorSource).toBe('track');
+        expect(newState.filters).toEqual(action.payload.filters);
+        expect(newState.baseFilters).toEqual(action.payload.baseFilters);
+        expect(newState.events).toEqual(['filtered-event-1', 'filtered-event-2']);
+        // This confirms that state.timeFormat is preserved from the previous state if already defined,
+        // even though 24h is in the payload.
+        expect(newState.timeFormat).toBe('12h'); // keeps existing unless null
+    });
+});

package/src/reducers/schedule-reducer.js

@@ -4,7 +4,7 @@ import {
     preFilterEvents,
     syncFilters
 } from "../utils/schedule";
-
+import cloneDeep from 'lodash/cloneDeep';
 import summitData from "data/summit.json";
 
 const summitTimeZoneId = summitData.time_zone_id;  // TODO use reducer data
@@ -59,7 +59,8 @@ const scheduleReducer = (state = INITIAL_STATE, action) => {
             return {
                 ...state,
                 allEvents: allFilteredEvents,
-                baseFilters,
+                // baseFilters is immutable
+                baseFilters: cloneDeep(baseFilters),
                 filters: newFilters,
                 colorSource: color_source.toLowerCase(),
                 events,

package/src/styles/colors.scss

@@ -1,4 +1,4 @@
-$color_accent: #00B189;
+$color_accent: #ff5e32;
 $color_alerts: #ff0000;
 $color_background_light: #ffffff;
 $color_background_dark: #000000;
@@ -19,13 +19,13 @@ $color_input_text_color_light: #363636;
 $color_input_text_color_dark: #ffffff;
 $color_input_text_color_disabled_light: #ffffff;
 $color_input_text_color_disabled_dark: #ffffff;
-$color_primary: #8DC63F;
-$color_primary_contrast: #FFFFFF;
-$color_secondary: #5e5f62;
-$color_secondary_contrast: #005870;
+$color_primary: #6d6e71;
+$color_primary_contrast: #f1f2f2;
+$color_secondary: #00cec4;
+$color_secondary_contrast: #ff5e32;
 $color_text_light: #ffffff;
 $color_text_med: #828282;
-$color_text_dark: #5e5f62;
+$color_text_dark: #333333;
 $color_text_input_hints_light: #7b7b7b;
 $color_text_input_hints_dark: #7b7b7b;
 $color_text_input_hints: #c4c4c4;

package/src/utils/__test__/syncFilters.test.js

@@ -0,0 +1,46 @@
+import { syncFilters } from '../schedule';
+
+describe('syncFilters', () => {
+
+    const originalNewFilters = {
+        track: { label: 'Track', order: 1, values: ['A'], options: ['A'] },
+        level: { label: 'Level', order: 2, values: ['Beginner'], options: ['Beginner'] }
+    };
+
+    const currentFilters = {
+        track: { values: ['Dev'], options: ['Dev', 'Ops'] },
+        level: { values: ['Intermediate'], options: ['Beginner', 'Advanced'] }
+    };
+
+    it('should return new filters with values/options copied from current filters', () => {
+        const newFilters = JSON.parse(JSON.stringify(originalNewFilters)); // deep clone
+
+        const result = syncFilters(newFilters, currentFilters);
+
+        expect(result.track.values).toEqual(['Dev']);
+        expect(result.track.options).toEqual(['Dev', 'Ops']);
+        expect(result.level.values).toEqual(['Intermediate']);
+        expect(result.level.options).toEqual(['Beginner', 'Advanced']);
+    });
+
+    it('should not mutate original newFilters object', () => {
+        const newFilters = JSON.parse(JSON.stringify(originalNewFilters)); // deep clone
+
+        syncFilters(newFilters, currentFilters);
+
+        expect(newFilters.track.values).toEqual(['A']);
+        expect(newFilters.track.options).toEqual(['A']);
+        expect(newFilters.level.values).toEqual(['Beginner']);
+        expect(newFilters.level.options).toEqual(['Beginner']);
+    });
+
+    it('should produce a result that does not share references with currentFilters', () => {
+        const newFilters = JSON.parse(JSON.stringify(originalNewFilters));
+
+        const result = syncFilters(newFilters, currentFilters);
+
+        expect(result.track.values).not.toBe(currentFilters.track.values);
+        expect(result.track.options).not.toBe(currentFilters.track.options);
+    });
+
+});

package/src/utils/schedule.js

@@ -191,21 +191,21 @@ export const getFilteredEvents = (events, filters, summitTimezone, hidePast) =>
 };
 
 export const syncFilters = (newFilters, currentFilters) => {
-  // new filters are the source of truth
+  /*
+   new filters are the source of truth
+   returns a clone
+   */
+  const synced = {};
+
   Object.entries(newFilters).forEach(([key, value]) => {
-    value.values = [];
-    value.options = [];
-
-    if(currentFilters.hasOwnProperty(key)) {
-      // copy over values and options if they exists
-      const filter = currentFilters[key];
-      if(filter.hasOwnProperty("values"))
-        value.values = filter.values;
-      if(filter.hasOwnProperty("options"))
-        value.options = filter.options;
-    }
+    const existing = currentFilters[key] || {};
+    synced[key] = {
+      ...value,
+      values: Array.isArray(existing.values) ? [...existing.values] : [],
+      options: Array.isArray(existing.options) ? [...existing.options] : []
+    };
   });
-  return newFilters;
+  return synced;
 }
 
 export const savePendingAction = (action) => {