@openeventkit/event-site 2.1.18 → 2.1.20

package/.github/workflows/jest.yml

@@ -10,6 +10,6 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
       - run: yarn install
       - run: yarn test

package/babel.config.json

@@ -1,12 +1,12 @@
 {
   "presets": [
-    [
-      "babel-preset-gatsby",
-      {
-        "targets": {
-          "esmodules": true
-        }
-      }
-    ]
-  ]
+    ["babel-preset-gatsby", { "targets": { "esmodules": true } }]
+  ],
+  "env": {
+    "test": {
+      "presets": [
+        ["babel-preset-gatsby", { "targets": { "node": "current" } }]
+      ]
+    }
+  }
 }

package/gatsby-node.js

@@ -8,6 +8,9 @@ const {
 } = require("gatsby-source-filesystem");
 const SentryWebpackPlugin = require("@sentry/webpack-plugin");
 const { ClientCredentials } = require("simple-oauth2");
+const URI = require("urijs")
+const SummitAPIRequest = require("./src/utils/build-json/SummitAPIRequest");
+const EventAPIRequest = require("./src/utils/build-json/EventsAPIRequest");
 
 const myEnv = require("dotenv").config({
   path: `.env.${process.env.NODE_ENV}`,
@@ -38,6 +41,9 @@ const {
   generateColorsScssFile
 } = require("./src/utils/scssUtils");
 
+const { FIFTY_PER_PAGE } = require("./src/utils/build-json/constants");
+const SpeakersAPIRequest = require("./src/utils/build-json/SpeakersAPIRequest");
+
 const fileBuildTimes = [];
 
 const getAccessToken = async (config, scope) => {
@@ -58,15 +64,16 @@ const SSR_GetRemainingPages = async (endpoint, params, lastPage) => {
   }
 
   let remainingPages = await Promise.all(pages.map(pageIdx => {
-    return axios.get(endpoint ,
-        { params : {
-            ...params,
-            page: pageIdx
-          }
-        }).then(({ data }) => data);
+    return axios.get(endpoint,
+      {
+        params: {
+          ...params,
+          page: pageIdx
+        }
+      }).then(({ data }) => data);
   }));
 
-  return remainingPages.sort((a, b,) =>   a.current_page - b.current_page ).map(p => p.data).flat();
+  return remainingPages.sort((a, b,) => a.current_page - b.current_page).map(p => p.data).flat();
 }
 
 const SSR_getMarketingSettings = async (baseUrl, summitId) => {
@@ -78,7 +85,7 @@ const SSR_getMarketingSettings = async (baseUrl, summitId) => {
     page: 1
   };
 
-  return await axios.get(endpoint, { params }).then(async ({data}) => {
+  return await axios.get(endpoint, { params }).then(async ({ data }) => {
 
     console.log(`SSR_getMarketingSettings then data.current_page ${data.current_page} data.last_page ${data.last_page} total ${data.total}`)
 
@@ -91,52 +98,21 @@ const SSR_getMarketingSettings = async (baseUrl, summitId) => {
 
 const SSR_getEvents = async (baseUrl, summitId, accessToken) => {
 
-  const endpoint = `${baseUrl}/api/v1/summits/${summitId}/events/published`;
-
-  const speakers_fields = ['id', 'first_name', 'last_name', 'title', 'bio','member_id','pic', 'big_pic', 'company'];
-  const current_attendance_fields = ['member_first_name', 'member_last_name', 'member_pic'];
-  const first_level_fields = [
-    "id",
-    "created",
-    "last_edited",
-    "title",
-    "description",
-    "social_description",
-    "start_date",
-    "end_date",
-    "location_id",
-    "class_name",
-    "allow_feedback",
-    "avg_feedback_rate",
-    "published_date",
-    "head_count",
-    "attendance_count",
-    "current_attendance_count",
-    "image",
-    "level" ,
-    "show_sponsors",
-    "duration",
-    "moderator_speaker_id",
-    "problem_addressed",
-    "attendees_expected_learnt",
-    "to_record",
-    "attending_media",
-  ];
-  const fields =  `${first_level_fields.join(",")},speakers.${speakers_fields.join(",speakers.")},current_attendance.${current_attendance_fields.join(',current_attendance.')}`;
-  const params = {
-    access_token: accessToken,
-    per_page: 50,
-    page: 1,
-    expand: 'slides,links,videos,media_uploads,type,track,track.subtracks,track.allowed_access_levels,location,location.venue,location.floor,speakers,moderator,sponsors,groups,rsvp_template,tags,current_attendance',
-    relations: 'speakers.badge_features,speakers.affiliations,speakers.languages,speakers.other_presentation_links,speakers.areas_of_expertise,speakers.travel_preferences,speakers.organizational_roles,speakers.all_presentations,speakers.all_moderated_presentations',
-    fields: fields,
-  }
+  const apiUrl = URI(`${baseUrl}/api/v1/summits/${summitId}/events/published`);
+
+  apiUrl.addQuery('access_token', accessToken);  
+  apiUrl.addQuery('per_page', FIFTY_PER_PAGE);
+  apiUrl.addQuery('page', 1);
 
-  return await axios.get(endpoint, { params }).then(async ({data}) => {
+  const apiUrlWithParams = EventAPIRequest.build(apiUrl);
+
+  const params = EventAPIRequest.getParams(apiUrl);
+
+  return await axios.get(apiUrlWithParams).then(async ({ data }) => {
 
     console.log(`SSR_getEvents then data.current_page ${data.current_page} data.last_page ${data.last_page} total ${data.total}`)
 
-    let remainingPages = await SSR_GetRemainingPages(endpoint, params, data.last_page);
+    let remainingPages = await SSR_GetRemainingPages(apiUrlWithParams, params, data.last_page);
 
     return [...data.data, ...remainingPages];
 
@@ -148,14 +124,14 @@ const SSR_getSponsors = async (baseUrl, summitId, accessToken) => {
   const endpoint = `${baseUrl}/api/v1/summits/${summitId}/sponsors`;
 
   const params = {
-        access_token: accessToken,
-        per_page: 50,
-        page: 1,
-        filter: "is_published==1",
-        expand: 'company,sponsorship,sponsorship.type',
+    access_token: accessToken,
+    per_page: 50,
+    page: 1,
+    filter: "is_published==1",
+    expand: 'company,sponsorship,sponsorship.type',
   }
 
-  return await axios.get(endpoint, { params }).then(async ({data}) => {
+  return await axios.get(endpoint, { params }).then(async ({ data }) => {
 
     console.log(`SSR_getSponsors then data.current_page ${data.current_page} data.last_page ${data.last_page} total ${data.total}`)
 
@@ -169,12 +145,12 @@ const SSR_getSponsors = async (baseUrl, summitId, accessToken) => {
 const SSR_getSponsorCollections = async (allSponsors, baseUrl, summitId, accessToken) => {
 
   const params = {
-        access_token: accessToken,
-        per_page: 50,
-        page: 1,
+    access_token: accessToken,
+    per_page: 50,
+    page: 1,
   }
 
-  const getSponsorCollection = async (endpoint, params) => await axios.get(endpoint, { params }).then(async ({data}) => {
+  const getSponsorCollection = async (endpoint, params) => await axios.get(endpoint, { params }).then(async ({ data }) => {
     console.log(`SSR_getSponsorCollection then data.current_page ${data.current_page} data.last_page ${data.last_page} total ${data.total}`)
     let remainingPages = await SSR_GetRemainingPages(endpoint, params, data.last_page);
     return [...data.data, ...remainingPages];
@@ -185,7 +161,7 @@ const SSR_getSponsorCollections = async (allSponsors, baseUrl, summitId, accessT
     const ads = await getSponsorCollection(`${baseUrl}/api/v1/summits/${summitId}/sponsors/${sponsor.id}/ads`, params);
     const materials = await getSponsorCollection(`${baseUrl}/api/v1/summits/${summitId}/sponsors/${sponsor.id}/materials`, params);
     const social_networks = await getSponsorCollection(`${baseUrl}/api/v1/summits/${summitId}/sponsors/${sponsor.id}/social-networks`, params);
-    return ({...sponsor, ads, materials, social_networks})
+    return ({ ...sponsor, ads, materials, social_networks })
   }));
 
   return sponsorsWithCollections;
@@ -193,72 +169,38 @@ const SSR_getSponsorCollections = async (allSponsors, baseUrl, summitId, accessT
 
 const SSR_getSpeakers = async (baseUrl, summitId, accessToken, filter = null) => {
 
-  const speakers_relations = [
-    'badge_features',
-    'affiliations',
-    'languages',
-    'other_presentation_links',
-    'areas_of_expertise',
-    'travel_preferences',
-    'organizational_roles',
-    'all_presentations',
-    'all_moderated_presentations',
-  ];
-
-  const speakers_fields =
-    ['id', 'first_name', 'last_name', 'title', 'bio','member_id','pic', 'big_pic', 'company'];
+  const apiUrl = URI(`${baseUrl}/api/v1/summits/${summitId}/speakers/on-schedule`);
 
-  const params = {
-    access_token: accessToken,
-    per_page: 30,
-    page: 1,
-    relations: speakers_relations.join(','),
-    fields: speakers_fields.join(',')
-  };
+  apiUrl.addQuery('access_token', accessToken);  
+  apiUrl.addQuery('per_page', 30);
+  apiUrl.addQuery('page', 1);
 
-  const endpoint = `${baseUrl}/api/v1/summits/${summitId}/speakers/on-schedule`;
+  const apiUrlWithParams = SpeakersAPIRequest.build(apiUrl);  
 
-  if (filter) {
-    params["filter[]"] = filter;
-  }
-
-  return await axios.get(
-      endpoint,
-    { params }
-  )
-    .then(async ({data}) => {
+  const params = SpeakersAPIRequest.getParams(apiUrl);
+ 
+  return await axios.get(apiUrlWithParams)
+    .then(async ({ data }) => {
       console.log(`SSR_getSpeakers then data.current_page ${data.current_page} data.last_page ${data.last_page} total ${data.total}`)
 
-      let remainingPages = await SSR_GetRemainingPages(endpoint, params, data.last_page);
+      let remainingPages = await SSR_GetRemainingPages(apiUrlWithParams, params, data.last_page);
 
-      return [ ...data.data, ...remainingPages];
+      return [...data.data, ...remainingPages];
     })
     .catch(e => console.log("ERROR: ", e));
 };
 
-const SSR_getSummit = async (baseUrl, summitId) => {
+const SSR_getSummit = async (baseUrl, summitId, accessToken) => {
 
-  const params = {
-    expand: "event_types," +
-      "tracks," +
-      "tracks.subtracks," +
-      "track_groups," +
-      "presentation_levels," +
-      "locations," +
-      "locations.rooms," +
-      "locations.floors," +
-      "order_extra_questions.values," +
-      "schedule_settings," +
-      "schedule_settings.filters," +
-      "schedule_settings.pre_filters,"+
-      "ticket_types," +
-      "badge_features_types" ,
-    t: Date.now()
-  };
+  let apiUrl = URI(`${baseUrl}/api/v2/summits/${summitId}`);
+
+  apiUrl.addQuery('access_token', accessToken);
+  apiUrl.addQuery('t', Date.now());
+
+  const apiUrlWithParams = SummitAPIRequest.build(apiUrl);
 
   return await axios.get(
-    `${baseUrl}/api/public/v1/summits/${summitId}`,
-    { params }
+    apiUrlWithParams
   )
     .then(({ data }) => data)
     .catch(e => console.log("ERROR: ", e));
@@ -277,14 +219,14 @@ const SSR_getVoteablePresentations = async (baseUrl, summitId, accessToken) => {
   };
 
   return await axios.get(endpoint,
-    { params }).then(async ({data}) => {
+    { params }).then(async ({ data }) => {
 
-    console.log(`SSR_getVoteablePresentations  then data.current_page ${data.current_page} data.last_page ${data.last_page} total ${data.total}`)
+      console.log(`SSR_getVoteablePresentations  then data.current_page ${data.current_page} data.last_page ${data.last_page} total ${data.total}`)
 
-    let remainingPages = await SSR_GetRemainingPages(endpoint, params, data.last_page);
+      let remainingPages = await SSR_GetRemainingPages(endpoint, params, data.last_page);
 
-    return [...data.data, ...remainingPages];
-  })
+      return [...data.data, ...remainingPages];
+    })
     .catch(e => console.log("ERROR: ", e));
 };
 
@@ -294,7 +236,7 @@ exports.onPreBootstrap = async () => {
 
   const summitId = process.env.GATSBY_SUMMIT_ID;
   const summitApiBaseUrl = process.env.GATSBY_SUMMIT_API_BASE_URL;
-  let   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 siteSettings = fs.existsSync(SITE_SETTINGS_FILE_PATH) ? JSON.parse(fs.readFileSync(SITE_SETTINGS_FILE_PATH)) : {};
   const colors = fs.existsSync(COLORS_FILE_PATH) ? JSON.parse(fs.readFileSync(COLORS_FILE_PATH)) : require(`./${DEFAULT_COLORS_FILE_PATH}`);
 
@@ -343,7 +285,7 @@ exports.onPreBootstrap = async () => {
   }
 
   // summit
-  const summit = await SSR_getSummit(summitApiBaseUrl, summitId);
+  const summit = await SSR_getSummit(summitApiBaseUrl, summitId, accessToken);
   fileBuildTimes.push({
     "file": SUMMIT_FILE_PATH,
     "build_time": Date.now()
@@ -390,7 +332,7 @@ exports.onPreBootstrap = async () => {
   // Show Sponsors
   const allSponsors = await SSR_getSponsors(summitApiBaseUrl, summitId, accessToken);
   console.log(`allSponsors ${allSponsors.length}`);
-  const sponsorsWithCollections  = await SSR_getSponsorCollections(allSponsors, summitApiBaseUrl, summitId, accessToken);
+  const sponsorsWithCollections = await SSR_getSponsorCollections(allSponsors, summitApiBaseUrl, summitId, accessToken);
   fileBuildTimes.push({
     "file": SPONSORS_FILE_PATH,
     "build_time": Date.now()
@@ -401,7 +343,7 @@ exports.onPreBootstrap = async () => {
   const allVoteablePresentations = await SSR_getVoteablePresentations(summitApiBaseUrl, summitId, accessToken);
   console.log(`allVoteablePresentations ${allVoteablePresentations.length}`);
   fileBuildTimes.push({
-    "file":VOTEABLE_PRESENTATIONS_FILE_PATH,
+    "file": VOTEABLE_PRESENTATIONS_FILE_PATH,
     "build_time": Date.now()
   });
   fs.writeFileSync(VOTEABLE_PRESENTATIONS_FILE_PATH, JSON.stringify(allVoteablePresentations), "utf8");
@@ -550,7 +492,7 @@ exports.onCreatePage = async ({ page, actions }) => {
   const maintenancePath = `/${MAINTENANCE_PATH_NAME}/`;
 
   const shouldDeletePage = (maintenanceMode.enabled && page.path !== maintenancePath) ||
-                           (!maintenanceMode.enabled && page.path === maintenancePath);
+    (!maintenanceMode.enabled && page.path === maintenancePath);
 
   if (shouldDeletePage) {
     deletePage(page);
@@ -623,7 +565,7 @@ exports.onCreateWebpackConfig = ({
           // Specify the directory containing build artifacts
           include: [
             {
-              paths: ["src","public",".cache"],
+              paths: ["src", "public", ".cache"],
               urlPrefix: "~/",
             },
             {

package/jest.setup.js

@@ -0,0 +1,2 @@
+// jest.setup.js
+import '@testing-library/jest-dom';

package/netlify.toml

@@ -4,7 +4,7 @@
 [context.branch-deploy]
   ignore = "bash ./netlify-build-ignore.sh"
 [build.environment]
-  NODE_VERSION = "18.15.0"
+  NODE_VERSION = "20.19.4"
   YARN_VERSION = "1.22.19"
   YARN_FLAGS = "--no-ignore-optional"
   NODE_OPTIONS = "--max-old-space-size=10240"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.1.18",
+  "version": "2.1.20",
   "author": "Tipit LLC",
   "dependencies": {
     "@emotion/server": "^11.11.0",
@@ -9,8 +9,8 @@
     "@fortawesome/free-brands-svg-icons": "^6.5.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
     "@loadable/component": "^5.16.4",
-    "@mdx-js/react": "^3.0.1",
-    "@mdx-js/runtime": "^1.6.22",
+    "@mdx-js/mdx": "^3",
+    "@mdx-js/react": "^3",
     "@mui/base": "^5.0.0-beta.40",
     "@mui/icons-material": "^5.15.20",
     "@mui/material": "^5.15.20",
@@ -31,12 +31,12 @@
     "@types/markerclustererplus": "^2.1.33",
     "@types/react": "^16.9.42",
     "@vimeo/player": "^2.16.3",
-    "ably": "^1.2.34",
+    "ably": "^2.11.0",
     "assert": "^2.1.0",
     "attendee-to-attendee-widget": "3.3.0",
     "autoprefixer": "10.4.14",
     "awesome-bootstrap-checkbox": "^1.0.1",
-    "axios": "^0.19.2",
+    "axios": "^1.7",
     "babel-preset-gatsby": "^3.13.2",
     "browser-tabs-lock": "^1.2.15",
     "buffer": "^6.0.3",
@@ -55,7 +55,7 @@
     "font-awesome": "^4.7.0",
     "formik": "^2.4.6",
     "fs-extra": "^11.3.0",
-    "full-schedule-widget": "3.0.11",
+    "full-schedule-widget": "3.1.0-beta.10",
     "gatsby": "^5.13.5",
     "gatsby-alias-imports": "^1.0.6",
     "gatsby-plugin-decap-cms": "^4.0.4",
@@ -78,11 +78,10 @@
     "immutability-helper": "2.9.1",
     "immutable": "^5.0.0-beta.5",
     "js-cookie": "^3.0.5",
-    "jsdom": "^24.1.0",
     "klaro": "^0.7.21",
     "lite-schedule-widget": "3.0.3",
     "live-event-widget": "4.0.4",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.21",
     "lz-string": "^1.4.4",
     "markdown-it": "^12.0.0",
     "moment": "^2.27.0",
@@ -123,9 +122,9 @@
     "redux-thunk": "^2.4.1",
     "rehype-external-links": "^3.0.0",
     "rehype-mdx-import-media": "^1.2.0",
-    "remark-gfm": "^4.0.0",
+    "remark-gfm": "^4.0.1",
     "sass": "^1.49.9",
-    "schedule-filter-widget": "3.0.4-beta.2",
+    "schedule-filter-widget": "3.0.5",
     "simple-chat-widget": "^1.0.31",
     "simple-oauth2": "^4.1.0",
     "slick-carousel": "^1.8.1",
@@ -142,7 +141,7 @@
     "urijs": "^1.19.2",
     "use-fit-text": "^2.4.0",
     "uuid": "^7.0.0",
-    "validator": "^9.4.1",
+    "validator": "^13.11.0",
     "video.js": "^7.8.2",
     "videojs-mux": "^3.1.0",
     "videojs-youtube": "^2.6.1",
@@ -167,19 +166,21 @@
     "update-libs": "yarn upgrade live-event-widget openstack-uicore-foundation schedule-lite simple-chat-widget speakers-widget attendee-to-attendee-widget"
   },
   "devDependencies": {
+    "@babel/core": "^7",
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^15.0.2",
     "@testing-library/user-event": "^14.5.2",
-    "babel-jest": "^29.7.0",
+    "babel-jest": "^29",
     "devcert": "1.1.0",
     "gatsby-plugin-webpack-speed-measure": "^0.1.1",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^28.1.0",
-    "jest-environment-jsdom": "^28.1.0",
+    "jest": "^29",
+    "jest-environment-jsdom": "^29",
     "jest-transform-stub": "^2.0.0",
     "js-yaml": "^4.1.0",
     "js-yaml-loader": "^1.2.2",
+    "jsdom": "^24",
     "prettier": "^2.0.5"
   },
   "jest": {
@@ -188,7 +189,11 @@
     ],
     "moduleNameMapper": {
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
-      "\\.(css|scss)$": "identity-obj-proxy"
+      "\\.(css|scss)$": "identity-obj-proxy",
+      "^@mdx-js/mdx$": "<rootDir>/__mocks__/@mdx-js/mdx.js",
+      "^@mdx-js/react$": "<rootDir>/__mocks__/@mdx-js/react.js",
+      "^remark-gfm$": "<rootDir>/__mocks__/remark-gfm.js",
+      "^rehype-external-links$": "<rootDir>/__mocks__/rehype-external-links.js"
     },
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.{js,jsx,mjs}",
@@ -215,6 +220,9 @@
       "window": {},
       "console": {}
     },
-    "testEnvironment": "jsdom"
+    "testEnvironment": "jsdom",
+    "setupFilesAfterEnv": [
+      "<rootDir>/jest.setup.js"
+    ]
   }
 }

package/src/__mocks__/@mdx-js/mdx.js

@@ -0,0 +1,32 @@
+// __mocks__/@mdx-js/mdx.js
+const React = require("react");
+const { useMDXComponents } = require("@mdx-js/react");
+
+// Minimal contract: evaluateSync returns a React component.
+// We also support an error path when the source contains "BAD_MDX".
+function evaluateSync(src /*, opts */) {
+    if (src && src.includes("BAD_MDX")) {
+        // Simulate a compile-time error so your try/catch logs + renders null
+        throw new Error("Mock MDX compile error");
+    }
+
+    function Comp() {
+        // Read provider-injected shortcodes/components (no need to render them)
+        const components = useMDXComponents();
+        const keys = components ? Object.keys(components) : [];
+
+        return React.createElement(
+            React.Fragment,
+            null,
+            React.createElement("div", { "data-testid": "mdx-source" }, src || ""),
+            React.createElement("div", {
+                "data-testid": "mdx-components",
+                "data-components": keys.join(","),
+            })
+        );
+    }
+
+    return { default: Comp };
+}
+
+module.exports = { evaluateSync };

package/src/__mocks__/@mdx-js/react.js

@@ -0,0 +1,15 @@
+// __mocks__/@mdx-js/react.js
+const React = require("react");
+
+const Ctx = React.createContext({});
+
+function MDXProvider({ components = {}, children }) {
+    return React.createElement(Ctx.Provider, { value: components }, children);
+}
+
+function useMDXComponents(local) {
+    const ctx = React.useContext(Ctx);
+    return local || ctx || {};
+}
+
+module.exports = { MDXProvider, useMDXComponents };

package/src/__mocks__/rehype-external-links.js

@@ -0,0 +1,3 @@
+// __mocks__/rehype-external-links.js
+module.exports = function rehypeExternalLinks() { return () => {}; };
+module.exports.default = module.exports;

package/src/__mocks__/remark-gfm.js

@@ -0,0 +1,3 @@
+// __mocks__/remark-gfm.js
+module.exports = function remarkGfm() { return () => {}; };
+module.exports.default = module.exports;