@openeventkit/event-site 2.0.104 → 2.0.105

package/gatsby-node.js

@@ -87,7 +87,8 @@ const SSR_getEvents = async (baseUrl, summitId, accessToken) => {
     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, current_attendance, groups, rsvp_template, tags",
+    expand: "slides,links,videos,media_uploads,type,track,track.subtracks,track.allowed_access_levels,location,location.venue,location.floor,speakers,moderator,sponsors,current_attendance,groups,rsvp_template,tags",
+    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",
   }
 
   return await axios.get(endpoint, { params }).then(async ({data}) => {
@@ -155,6 +156,7 @@ const SSR_getSpeakers = async (baseUrl, summitId, accessToken, filter = null) =>
     access_token: accessToken,
     per_page: 30,
     page: 1,
+    relations: 'badge_features,affiliations,languages,other_presentation_links,areas_of_expertise,travel_preferences,organizational_roles,all_presentations,all_moderated_presentations',
   };
 
   const endpoint = `${baseUrl}/api/v1/summits/${summitId}/speakers/on-schedule`;
@@ -180,7 +182,7 @@ const SSR_getSpeakers = async (baseUrl, summitId, accessToken, filter = null) =>
 const SSR_getSummit = async (baseUrl, summitId) => {
 
   const params = {
-    expand: "event_types,tracks, tracks.subtracks,track_groups,presentation_levels,locations.rooms,locations.floors,order_extra_questions.values,schedule_settings,schedule_settings.filters,schedule_settings.pre_filters",
+    expand: "event_types,tracks,tracks.subtracks,track_groups,presentation_levels,locations.rooms,locations.floors,order_extra_questions.values,schedule_settings,schedule_settings.filters,schedule_settings.pre_filters",
     t: Date.now()
   };
 
@@ -201,7 +203,7 @@ const SSR_getVoteablePresentations = async (baseUrl, summitId, accessToken) => {
     per_page: 50,
     page: 1,
     filter: "published==1",
-    expand: "slides, links, videos, media_uploads, type, track, track.allowed_access_levels, location, location.venue, location.floor, speakers, moderator, sponsors, current_attendance, groups, rsvp_template, tags",
+    expand: "slides,links,videos,media_uploads,type,track,track.allowed_access_levels,location,location.venue,location.floor,speakers,moderator,sponsors,current_attendance,groups,rsvp_template,tags",
   };
 
   return await axios.get(endpoint,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.104",
+  "version": "2.0.105",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -36,7 +36,6 @@
     "core-js": "^2.6.11",
     "cross-env": "^7.0.3",
     "crypto-js": "^4.1.1",
-    "data-guardian": "^1.1.2",
     "disqus-react": "1.0.10",
     "dotenv": "^8.2.0",
     "dropzone": "^5.7.2",
@@ -79,7 +78,7 @@
     "moment-timezone": "^0.5.31",
     "netlify-cms-app": "^2.15.72",
     "netlify-cms-lib-widgets": "^1.8.0",
-    "openstack-uicore-foundation": "4.1.65",
+    "openstack-uicore-foundation": "4.1.76",
     "path-browserify": "^1.0.1",
     "prop-types": "^15.6.0",
     "react": "^18.2.0",
@@ -123,7 +122,7 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "5.0.25",
+    "summit-registration-lite": "5.0.26",
     "superagent": "8.0.9",
     "sweetalert2": "^9.17.0",
     "upcoming-events-widget": "3.0.5",
@@ -150,12 +149,58 @@
     "build": "NODE_ENV=production NODE_OPTIONS=--max-old-space-size=10240 cross-env node --trace-warnings node_modules/.bin/gatsby build --log-pages",
     "develop": "NODE_OPTIONS=--max-old-space-size=8192 npm run gatsby-clean && node --trace-warnings node_modules/.bin/gatsby develop --S -H 0.0.0.0",
     "format": "prettier --trailing-comma es5 --no-semi --single-quote --write \"{gatsby-*.js,src/**/*.js}\"",
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "jest",
     "update-libs": "yarn upgrade live-event-widget openstack-uicore-foundation schedule-lite simple-chat-widget speakers-widget attendee-to-attendee-widget"
   },
   "devDependencies": {
+    "@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",
     "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-transform-stub": "^2.0.0",
+    "js-yaml": "^4.1.0",
+    "js-yaml-loader": "^1.2.2",
     "prettier": "^2.0.5"
+  },
+  "jest": {
+    "collectCoverageFrom": [
+      "src/**/*.{js,jsx,mjs}"
+    ],
+    "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"
+    },
+    "testMatch": [
+      "<rootDir>/src/**/__tests__/**/*.{js,jsx,mjs}",
+      "<rootDir>/src/**/?(*.)(spec|test).{js,jsx,mjs}"
+    ],
+    "transform": {
+      "\\.[jt]sx?$": "babel-jest",
+      ".+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$": "jest-transform-stub"
+    },
+    "moduleDirectories": [
+      "node_modules",
+      "src"
+    ],
+    "moduleFileExtensions": [
+      "web.js",
+      "js",
+      "json",
+      "web.jsx",
+      "jsx",
+      "node",
+      "mjs"
+    ],
+    "globals": {
+      "window": {},
+      "console": {}
+    },
+    "testEnvironment": "jsdom"
   }
 }

package/src/__mocks__/fileMock.js

@@ -0,0 +1 @@
+module.exports = {};

package/src/actions/fetch-entities-actions.js

@@ -16,6 +16,8 @@ export const fetchEventById = async (summitId, eventId, accessToken = null) => {
 
     apiUrl.addQuery('expand', 'slides, links, videos, media_uploads, type, track, track.allowed_access_levels, location, location.venue, location.floor, speakers, moderator, sponsors, current_attendance, groups, rsvp_template, tags');
     apiUrl.addQuery('evict_cache', 1);
+    apiUrl.addQuery('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");
+
     return fetch(apiUrl.toString(), {
         method: 'GET'
     }).then(async (response) => {
@@ -73,6 +75,7 @@ export const fetchSpeakerById = async(summitId, speakerId, accessToken = null) =
         apiUrl.addQuery('access_token', accessToken);
     }
 
+    apiUrl.addQuery('relations', 'badge_features,affiliations,languages,other_presentation_links,areas_of_expertise,travel_preferences,organizational_roles,all_presentations,all_moderated_presentations');
     apiUrl.addQuery('evict_cache', 1);
 
     return fetch(apiUrl.toString(), {

package/src/cms/config/collections/configurationsCollection/siteSettings/index.js

@@ -176,6 +176,27 @@ const siteSettings = {
         }),
       ]
     }),
+    objectField({
+      label: "IDP Logo",
+      name: "idpLogo",
+      fields: [
+        imageField({
+          label: "Logo Dark",
+          name: "idpLogoDark",
+          required: false
+        }),
+        imageField({
+          label: "Logo Light",
+          name: "idpLogoLight",
+          required: false
+        }),
+        stringField({
+          label: "Logo Alt",
+          name: "idpLogoAlt",
+          required: false
+        }),
+      ]
+    }),
     listField({
       label: "Identity Provider Buttons",
       name: "identityProviderButtons",

package/src/cms/config/collections/configurationsCollection/siteSettings/typeDefs.js

@@ -21,6 +21,11 @@ module.exports = `
     schedule: Schedule
     chat: Chat
   }
+  type IdpLogo {
+    idpLogoDark: File @fileByRelativePath
+    idpLogoLight: File @fileByRelativePath
+    idpLogoAlt: String
+  }
   type IdentityProviderButton {
     buttonColor: String
     buttonBorderColor: String
@@ -33,6 +38,7 @@ module.exports = `
     siteMetadata: SiteMetadata
     favicon: Favicon
     widgets: Widgets
+    idpLogo: IdpLogo
     identityProviderButtons: [IdentityProviderButton]
   }
 `;

package/src/components/AuthComponent.js

@@ -143,7 +143,7 @@ const AuthComponent = ({
         allowsOtpAuth: allowsOtpAuth,
         initialEmailValue: initialEmailValue,
         title: 'Sign in using the email associated with your account:',
-        summitData: summit
+        summitData: summit,
     };
 
     const passwordlessLoginProps = {
@@ -158,6 +158,9 @@ const AuthComponent = ({
         codeError: otpError,
         goToLogin: () => setOtpLogin(false),
         getLoginCode: (email) => sendCode(email),
+        idpLogoLight: siteSettings?.idpLogo?.idpLogoLight?.publicURL,
+        idpLogoDark: siteSettings?.idpLogo?.idpLogoDark?.publicURL,
+        idpLogoAlt: siteSettings?.idpLogo?.idpLogoAlt
     }
 
     const { loginButton } = marketingPageSettings.hero.buttons;
@@ -242,4 +245,4 @@ AuthComponent.defaultProps = {
 AuthComponent.propTypes = {
     location: PropTypes.object.isRequired,
     ignoreAutoOpen: PropTypes.bool,
-}
+}

package/src/components/RegistrationLiteComponent.js

@@ -195,6 +195,9 @@ const RegistrationLiteComponent = ({
         noAllowedTicketsMessage: noAllowedTicketsMessage,
         showCompanyInput: showCompanyInput,
         showCompanyInputDefaultOptions: showCompanyInputDefaultOptions,
+        idpLogoLight: siteSettings?.idpLogo?.idpLogoLight?.publicURL,
+        idpLogoDark: siteSettings?.idpLogo?.idpLogoDark?.publicURL,
+        idpLogoAlt: siteSettings?.idpLogo?.idpLogoAlt
     };
 
     const { registerButton } = marketingPageSettings.hero.buttons;

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

@@ -13,6 +13,11 @@
   "favicon": {
     "asset": "icon.png"
   },
+  "idpLogo": {
+    "idpLogoDark": "",
+    "idpLogoLight": "",
+    "idpLogoAlt": ""
+  },
   "identityProviderButtons": [
     {
       "buttonColor": "#082238",

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

@@ -0,0 +1,163 @@
+/**
+ * @jest-environment jsdom
+ */
+import React from "react";
+import { normalizeData } from "../dataNormalization";
+
+const testOrder = {
+  "id": 43545,
+  "created": 1713391444,
+  "last_edited": 1713391444,
+  "number": "ORDER_2023OCPGLOBALSUMMIT2023_662047548D72D773046574",
+  "status": "Paid",
+  "payment_method": "Online",
+  "owner_first_name": "Sebastian",
+  "owner_last_name": "Marcet",
+  "owner_email": "test@gmail.com",
+  "owner_company": "Tipit",
+  "owner_company_id": 3496,
+  "owner_id": 26391,
+  "summit_id": 50,
+  "currency": "USD",
+  "currency_symbol": "$",
+  "extra_questions": [],
+  "tickets": [{
+    "id": 50175,
+    "created": 1713391444,
+    "last_edited": 1713409486,
+    "number": "TICKET_2023OCPGLOBALSUMMIT2023_6620475493A78111038846",
+    "status": "Paid",
+    "external_order_id": null,
+    "external_attendee_id": null,
+    "bought_date": 1713391485,
+    "order_id": 43545,
+    "promo_code_id": 0,
+    "raw_cost": 900,
+    "net_selling_cost": 900,
+    "raw_cost_in_cents": 90000,
+    "final_amount": 900,
+    "final_amount_in_cents": 90000,
+    "discount": 0,
+    "discount_rate": 0,
+    "discount_in_cents": 0,
+    "refunded_amount": 0,
+    "refunded_amount_in_cents": 0,
+    "total_refunded_amount": 0,
+    "total_refunded_amount_in_cents": 0,
+    "currency": "USD",
+    "currency_symbol": "$",
+    "taxes_amount": 0,
+    "taxes_amount_in_cents": 0,
+    "is_active": true,
+    "qr_code": "TICKET_2023OCPGLOBALSUMMIT2023|TICKET_2023OCPGLOBALSUMMIT2023_6620475493A78111038846|smarcet@gmail.com",
+    "owner": {
+      "id": 28608,
+      "created": 1685574339,
+      "last_edited": 1713409445,
+      "summit_hall_checked_in": false,
+      "summit_hall_checked_in_date": null,
+      "summit_virtual_checked_in_date": null,
+      "shared_contact_info": false,
+      "member_id": 26391,
+      "summit_id": 50,
+      "first_name": "Sebastian",
+      "last_name": "Marcet",
+      "email": "test@gmail.com",
+      "company": "Tipit",
+      "company_id": 3496,
+      "disclaimer_accepted_date": null,
+      "disclaimer_accepted": false,
+      "status": "Incomplete",
+      "tickets": [50175],
+      "presentation_votes": [],
+      "votes_count": 0,
+      "ticket_types": [{"type_id": 109, "qty": 1, "type_name": "Standard Ticket"}],
+      "allowed_access_levels": [149],
+      "allowed_features": [],
+      "tags": [],
+      "extra_questions": []
+    },
+    "badge": {
+      "id": 50183,
+      "created": 1713391444,
+      "last_edited": 1713391444,
+      "print_date": null,
+      "qr_code": null,
+      "is_void": false,
+      "ticket_id": 50175,
+      "printed_times": 0,
+      "features": [],
+      "print_excerpt": [],
+      "type": {
+        "id": 112,
+        "created": 1685036153,
+        "last_edited": 1685036153,
+        "name": "General Attendee",
+        "description": "This is for all in-person general attendees.  This Badge Type can have various Badge Features (icons/titles).  Badge Features may be dictated by promo codes or can be added manually by Admins. The badge needs a QR code for LR.  This badge needs T-Shirt Size Indicator from extra question answer (dots/dashes) on the design.",
+        "template_content": "",
+        "is_default": true,
+        "summit_id": 50,
+        "badge_features": [],
+        "allowed_view_types": [49],
+        "access_levels": [{
+          "id": 149,
+          "created": 1683216137,
+          "last_edited": 1683216137,
+          "name": "IN_PERSON",
+          "description": "Allows in person show access.",
+          "template_content": "",
+          "is_default": true,
+          "summit_id": 50
+        }]
+      }
+    },
+    "ticket_type": {
+      "id": 109,
+      "created": 1685036568,
+      "last_edited": 1713391444,
+      "name": "Standard Ticket",
+      "description": "This is for general admission.  Needs QR Code on Badge.  Symposium included (first come, first served until capacity is met).  Early bird pricing ended 7/31/23.  In-Person Ticket: Standard, is on sale 8/1/23- 10/15/23",
+      "external_id": null,
+      "summit_id": 50,
+      "cost": 900,
+      "currency": "USD",
+      "currency_symbol": "$",
+      "quantity_2_sell": 10000,
+      "max_quantity_per_order": 100,
+      "sales_start_date": 1690873200,
+      "sales_end_date": 1722581940,
+      "badge_type_id": 112,
+      "quantity_sold": 3289,
+      "audience": "All",
+      "applied_taxes": [],
+      "sub_type": "Regular"
+    },
+    "applied_taxes": [],
+    "refund_requests": []
+  }]
+};
+
+const testArrayOrderData = [testOrder];
+
+describe("data normalization", () => {
+  test("remove email from order data", () => {
+    expect(testOrder.hasOwnProperty("owner_email")).toBeTruthy();
+    expect(testOrder.tickets[0].owner.hasOwnProperty("email") ).toBeTruthy();
+    const data = normalizeData(testOrder);
+    expect(data.hasOwnProperty("owner_email")).toBeFalsy();
+    expect(data.tickets[0].owner.hasOwnProperty("email") ).toBeFalsy();
+  });
+  test("remove qr from order data", () => {
+    expect(testOrder.tickets[0].hasOwnProperty("qr_code") ).toBeTruthy();
+    const data = normalizeData(testOrder);
+    expect(data.tickets[0].hasOwnProperty("qr_code") ).toBeFalsy();
+  });
+  test("remove qr from array of orders", () => {
+    expect(Array.isArray(testArrayOrderData)).toBeTruthy();
+    expect(testArrayOrderData[0].tickets[0].hasOwnProperty("qr_code") ).toBeTruthy();
+    const data = normalizeData(testArrayOrderData);
+    expect(Array.isArray(data)).toBeTruthy();
+    expect(data[0].tickets[0].hasOwnProperty("qr_code") ).toBeFalsy();
+  });
+})
+

package/src/utils/dataNormalization.js

@@ -1,12 +1,36 @@
-import { maskData } from "data-guardian";
+import _ from "lodash";
 
 const FIRST_NAME_KEY = "first_name";
 const LAST_NAME_KEY = "last_name";
+const EMAIL_KEY = "email";
+const OWNER_FIRST_NAME_KEY = `owner_${FIRST_NAME_KEY}`;
+const OWNER_LAST_NAME_KEY = `owner_${LAST_NAME_KEY}`;
+const OWNER_EMAIL_KEY = `owner_${EMAIL_KEY}`;
+const QR_CODE_KEY = "qr_code";
 
-const excludeKeys = [FIRST_NAME_KEY, LAST_NAME_KEY];
+const excludeKeys = [
+  FIRST_NAME_KEY,
+  LAST_NAME_KEY,
+  EMAIL_KEY,
+  OWNER_FIRST_NAME_KEY,
+  OWNER_LAST_NAME_KEY,
+  OWNER_EMAIL_KEY,
+  QR_CODE_KEY,
+];
 
-const maskingConfig = {
-  keyCheck: (key) => excludeKeys.some(excludeKey => key.includes(excludeKey))
-};
+const deepOmit = (obj, keysToOmit) => {
+  let keysToOmitIndex =  _.keyBy(Array.isArray(keysToOmit) ? keysToOmit : [keysToOmit] ); // create an index object of the keys that should be omitted
 
-export const normalizeData = (data) => maskData(data, maskingConfig);
+  const omitFromObject = (obj) => { // the inner function which will be called recursively
+    return _.transform(obj, function(result, value, key) { // transform to a new object
+      if (key in keysToOmitIndex) { // if the key is in the index skip it
+        return;
+      }
+      result[key] = _.isObject(value) ? omitFromObject(value) : value; // if the key is an object run it through the inner function - omitFromObject
+    })
+  }
+
+  return omitFromObject(obj); // return the inner function result
+}
+
+export const normalizeData = (data) => deepOmit(data, excludeKeys);

package/src/utils/useSiteSettings.js

@@ -28,6 +28,15 @@ const siteSettingsQuery = graphql`
           allowClick
         }
       }
+      idpLogo {
+        idpLogoDark {
+          publicURL
+        }
+        idpLogoLight {
+          publicURL
+        }
+        idpLogoAlt
+      }
       identityProviderButtons {
         buttonColor
         buttonBorderColor