@openeventkit/event-site 2.0.130 → 2.0.131

package/gatsby-node.js

@@ -92,12 +92,16 @@ 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 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,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",
+    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: `speakers.${speakers_fields.join(",speakers.")},current_attendance.${current_attendance_fields.join(',current_attendance.')}`,
   }
 
   return await axios.get(endpoint, { params }).then(async ({data}) => {
@@ -161,11 +165,27 @@ 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 params = {
     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',
+    relations: speakers_relations.join(','),
+    fields: speakers_fields.join(',')
   };
 
   const endpoint = `${baseUrl}/api/v1/summits/${summitId}/speakers/on-schedule`;
@@ -273,11 +293,11 @@ exports.onPreBootstrap = async () => {
   // write colors json used to set runtime colors in gatsby-browser
   fs.writeFileSync(COLORS_FILE_PATH, JSON.stringify(colors), "utf8");
 
-  // generate and write colors SCSS file used by built styles 
+  // generate and write colors SCSS file used by built styles
   generateAndWriteScssFile(generateColorsScssFile, colors, COLORS_SCSS_FILE_PATH);
 
-  if (siteSettings.siteFont) {    
-    // generate and write font SCSS file used by built styles 
+  if (siteSettings.siteFont) {
+    // generate and write font SCSS file used by built styles
     generateAndWriteScssFile(generateFontScssFile, siteSettings.siteFont, FONTS_SCSS_FILE_PATH);
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.130",
+  "version": "2.0.131",
   "author": "Tipit LLC",
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -126,7 +126,7 @@
     "slick-carousel": "^1.8.1",
     "smoothscroll-polyfill": "^0.4.4",
     "socket.io-client": "^4.5.2",
-    "speakers-widget": "4.0.1",
+    "speakers-widget": "4.0.2",
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",

package/src/actions/event-actions.js

@@ -43,6 +43,8 @@ export const getEventById = (
     if (event) {
         dispatch(stopLoading());
         dispatch(createAction(GET_EVENT_DATA)({event}));
+        const res = { response: event, err: null };
+        return Promise.resolve(res);
     }
     // then refresh from api
 

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

@@ -6,6 +6,7 @@ import URI from "urijs";
  * @param accessToken
  * @returns {Promise<Response>}
  */
+
 export const fetchEventById = async (summitId, eventId, accessToken = null) => {
 
     let apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/public/v1/summits/${summitId}/events/${eventId}/published`);
@@ -14,10 +15,13 @@ export const fetchEventById = async (summitId, eventId, accessToken = null) => {
         apiUrl.addQuery('access_token', accessToken);
     }
 
+    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'];
+
     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");
-
+    apiUrl.addQuery('fields', `speakers.${speakers_fields.join(",speakers.")},current_attendance.${current_attendance_fields.join(',current_attendance.')}`);
     return fetch(apiUrl.toString(), {
         method: 'GET'
     }).then(async (response) => {
@@ -53,7 +57,6 @@ export const fetchEventTypeById = async (summitId, eventTypeId, accessToken = nu
     });
 }
 
-
 /**
  *
  * @param summitId
@@ -101,8 +104,24 @@ 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');
+    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'];
+
     apiUrl.addQuery('evict_cache', 1);
+    apiUrl.addQuery('relations', speakers_relations.join(','));
+    apiUrl.addQuery('fields', speakers_fields.join(','));
 
     return fetch(apiUrl.toString(), {
         method: 'GET'