@openeventkit/event-site 2.1.18 → 2.1.21

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

@@ -1,4 +1,7 @@
 import URI from "urijs";
+import SummitAPIRequest from "../utils/build-json/SummitAPIRequest";
+import EventAPIRequest from "../utils/build-json/EventsAPIRequest";
+import SpeakersAPIRequest from "../utils/build-json/SpeakersAPIRequest";
 
 /**
  * @param summitId
@@ -9,45 +12,16 @@ import URI from "urijs";
 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`);
-    if(accessToken){
+    if (accessToken) {
         apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/v1/summits/${summitId}/events/${eventId}/published`);
         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'];
-    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",
-    ];
-    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('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', `${first_level_fields.join(",")},speakers.${speakers_fields.join(",speakers.")},current_attendance.${current_attendance_fields.join(',current_attendance.')}`);
-    return fetch(apiUrl.toString(), {
-        method: 'GET'
+    const apiUrlWithParams = EventAPIRequest.build(apiUrl);
+
+    return fetch(apiUrlWithParams, {
+        method: 'GET',
+        cache: "no-store",
     }).then(async (response) => {
         if (response.status === 200) {
             return await response.json();
@@ -66,7 +40,8 @@ export const fetchStreamingInfoByEventId = async (summitId, eventId, accessToken
     const apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/v1/summits/${summitId}/events/${eventId}/published/streaming-info`);
     apiUrl.addQuery('access_token', accessToken);
     return fetch(apiUrl.toString(), {
-        method: 'GET'
+        method: 'GET',
+        cache: "no-store",
     }).then(async (response) => {
         if (response.status === 200) {
             return await response.json();
@@ -84,13 +59,14 @@ export const fetchStreamingInfoByEventId = async (summitId, eventId, accessToken
 export const fetchEventTypeById = async (summitId, eventTypeId, accessToken = null) => {
 
     let apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/public/v1/summits/${summitId}/event-types/${eventTypeId}`);
-    if(accessToken){
+    if (accessToken) {
         apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/v1/summits/${summitId}/event-types/${eventTypeId}`);
         apiUrl.addQuery('access_token', accessToken);
     }
 
     return fetch(apiUrl.toString(), {
-        method: 'GET'
+        method: 'GET',
+        cache: "no-store",
     }).then(async (response) => {
         if (response.status === 200) {
             return await response.json();
@@ -107,19 +83,20 @@ export const fetchEventTypeById = async (summitId, eventTypeId, accessToken = nu
  * @param accessToken
  * @returns {Promise<Response>}
  */
-export const fetchLocationById = async(summitId, locationId, expand, accessToken = null) => {
+export const fetchLocationById = async (summitId, locationId, expand, accessToken = null) => {
 
     let apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/public/v1/summits/${summitId}/locations/${locationId}`);
-    if(accessToken){
+    if (accessToken) {
         apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/v1/summits/${summitId}/locations/${locationId}`);
         apiUrl.addQuery('access_token', accessToken);
     }
 
-    if(expand)
+    if (expand)
         apiUrl.addQuery('expand', expand);
 
     return fetch(apiUrl.toString(), {
-        method: 'GET'
+        method: 'GET',
+        cache: "no-store",
     }).then(async (response) => {
         if (response.status === 200) {
             return await response.json();
@@ -135,34 +112,18 @@ export const fetchLocationById = async(summitId, locationId, expand, accessToken
  * @param accessToken
  * @returns {Promise<Response>}
  */
-export const fetchSpeakerById = async(summitId, speakerId, accessToken = null) => {
+export const fetchSpeakerById = async (summitId, speakerId, accessToken = null) => {
 
     let apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/public/v1/summits/${summitId}/speakers/${speakerId}`);
 
-    if(accessToken){
+    if (accessToken) {
         apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/v1/summits/${summitId}/speakers/${speakerId}`);
         apiUrl.addQuery('access_token', accessToken);
     }
 
-    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 apiUrlWithParams = SpeakersAPIRequest.build(apiUrl);
 
-    apiUrl.addQuery('relations', speakers_relations.join(','));
-    apiUrl.addQuery('fields', speakers_fields.join(','));
-
-    return fetch(apiUrl.toString(), {
+    return fetch(apiUrlWithParams, {
         method: 'GET',
         cache: "no-store",
     }).then(async (response) => {
@@ -179,29 +140,19 @@ export const fetchSpeakerById = async(summitId, speakerId, accessToken = null) =
  * @param accessToken
  * @returns {Promise<Response>}
  */
-export const fetchSummitById =  async(summitId, accessToken = null) => {
+export const fetchSummitById = async (summitId, accessToken = null) => {
     let apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/public/v1/summits/${summitId}`);
-    const 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",
-    ]
 
-    apiUrl.addQuery('expand', expand.join(','));
+    if (accessToken) {
+        apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/v1/summits/${summitId}`);
+        apiUrl.addQuery('access_token', accessToken);
+    }
 
-    return fetch(apiUrl.toString(), {
-        method: 'GET'
+    const apiUrlWithParams = SummitAPIRequest.build(apiUrl);
+
+    return fetch(apiUrlWithParams, {
+        method: 'GET',
+        cache: "no-store",
     }).then(async (response) => {
         if (response.status === 200) {
             return await response.json();
@@ -216,17 +167,24 @@ export const fetchSummitById =  async(summitId, accessToken = null) => {
  * @param accessToken
  * @returns {Promise<* | null>}
  */
-export const fetchTrackById = async(summitId, trackId, accessToken = null) => {
+export const fetchTrackById = async (summitId, trackId, accessToken = null) => {
     let apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/public/v1/summits/${summitId}/tracks/${trackId}`);
 
-    const expand = [
-        'subtracks',
-    ]
+    const fields = [
+        "id", "name", "code", "order", "parent_id", "color","text_color",
+        "subtracks.id", "subtracks.name", "subtracks.code", "subtracks.order",
+        "subtracks.parent_id", "subtracks.color", "subtracks.text_color",
+    ];
+    const relations = ['subtracks','subtracks.none'];
+    const expand = ['subtracks']
 
+    apiUrl.addQuery('fields', fields.join(','));
+    apiUrl.addQuery('relations', relations.join(','));
     apiUrl.addQuery('expand', expand.join(','));
 
     return fetch(apiUrl.toString(), {
-        method: 'GET'
+        method: 'GET',
+        cache: "no-store",
     }).then(async (response) => {
         if (response.status === 200) {
             return await response.json();

package/src/actions/update-data-actions.js

@@ -243,10 +243,10 @@ export const synchEntityData = (
     if (entity && entity_type === 'PresentationSpeaker' && entity_operator === 'UPDATE' && event &&
       (
         // current loaded event is a presentation on where speakers is a presenter
-        (entity.all_presentations && entity.all_presentations.find(id => id == event?.id))
+        (entity?.presentations && entity.presentations.find(id => id == event?.id))
           ||
         // current loaded event is a presentation on where speakers is a moderator
-        (entity.all_moderated_presentations && entity.all_moderated_presentations.find(id => id == event?.id))
+        (entity?.moderated_presentations && entity.moderated_presentations.find(id => id == event?.id))
       )
     )
     {