Skip to content

Commit 1c28354

Browse files
committed
fixed bug on embedded-schedule: when clicking talk, nothing was happening
1 parent 6502a92 commit 1c28354

File tree

2 files changed

+35
-12
lines changed

2 files changed

+35
-12
lines changed

mobile/src/views/event/EmbeddedSchedulePage.vue

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<ion-page v-themed-event-styles="confDescriptor">
3-
<schedule-page :hide-header="true" :hide-watch-later="true"></schedule-page>
3+
<schedule-page :hide-header="true" :hide-watch-later="true" :emit-event-on-talk-clicked="true" @talk-clicked="openTalk"></schedule-page>
44
<ion-footer>
55
<em>
66
{{ LL.Open_full_version_of_the_schedule() }}
@@ -13,11 +13,16 @@
1313
</template>
1414
<script setup lang="ts">
1515
import {SchedulePage} from "@/router/preloaded-pages";
16-
import {IonFooter} from "@ionic/vue";
16+
import {IonFooter, useIonRouter} from "@ionic/vue";
1717
import {useSharedConferenceDescriptor} from "@/state/useConferenceDescriptor";
1818
import {typesafeI18n} from "@/i18n/i18n-vue";
19-
import {getResolvedEventRootPathFromSpacedEventIdRef, useCurrentSpaceEventIdRef} from "@/services/Spaces";
19+
import {
20+
getResolvedEventRootPath,
21+
getResolvedEventRootPathFromSpacedEventIdRef,
22+
useCurrentSpaceEventIdRef
23+
} from "@/services/Spaces";
2024
import {computed} from "vue";
25+
import {VoxxrinTalk} from "@/models/VoxxrinTalk";
2126
2227
const appBaseUrl = import.meta.env.VITE_WHITE_LABEL_PUBLIC_URL;
2328
const appBaseUrlWithoutTrailingSlash = appBaseUrl.substring(0, appBaseUrl.length - (appBaseUrl[appBaseUrl.length-1]==='/'?1:0));
@@ -26,11 +31,16 @@ const spacedEventIdRef = useCurrentSpaceEventIdRef()
2631
const {conferenceDescriptor: confDescriptor} = useSharedConferenceDescriptor(spacedEventIdRef);
2732
2833
const fullScheduleUrl = computed(() => {
29-
return `${appBaseUrlWithoutTrailingSlash}/${getResolvedEventRootPathFromSpacedEventIdRef(spacedEventIdRef)}`
34+
return `${appBaseUrlWithoutTrailingSlash}${getResolvedEventRootPathFromSpacedEventIdRef(spacedEventIdRef)}`
3035
})
3136
3237
const { LL } = typesafeI18n()
38+
const spaceEventIdRef = useCurrentSpaceEventIdRef();
39+
const router = useIonRouter();
3340
41+
const openTalk = (talk: VoxxrinTalk) => {
42+
router.push(`${getResolvedEventRootPath(spaceEventIdRef.value.eventId, spaceEventIdRef.value.spaceToken)}/talks/${talk.id.value}/details`)
43+
}
3444
</script>
3545
<style scoped lang="scss">
3646
ion-footer {

mobile/src/views/event/SchedulePage.vue

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,18 @@ const props = defineProps({
165165
require: false,
166166
type: Boolean,
167167
default: false
168+
},
169+
emitEventOnTalkClicked: {
170+
required: false,
171+
type: Boolean,
172+
default: false,
168173
}
169174
})
170175
176+
const emits = defineEmits<{
177+
(event: 'talk-clicked', talk: VoxxrinTalk): void,
178+
}>()
179+
171180
const spacedEventId = useCurrentSpaceEventIdRef()
172181
const {conferenceDescriptor: confDescriptor} = useSharedConferenceDescriptor(spacedEventId);
173182
@@ -241,14 +250,18 @@ async function navigateToTalkRatingScreenFor(talk: VoxxrinTalk) {
241250
242251
async function openTalkDetails(talk: VoxxrinTalk) {
243252
if(talk) {
244-
// TODO: Re-enable this once *tabbed* talk details as feedback viewer routing has been fixed
245-
// const talkFeedbackViewerToken = toValue(talkFeedbackViewerTokensRef)?.find(t => t.talkId.isSameThan(talk.id));
246-
// const url = talkFeedbackViewerToken
247-
// ?`/events/${eventId.value.value}/talks/${talk.id.value}/asFeedbackViewer/${talkFeedbackViewerToken.secretToken}/details`
248-
// :`/events/${eventId.value.value}/talks/${talk.id.value}/details`
249-
const url = `${getResolvedEventRootPathFromSpacedEventIdRef(spacedEventId)}/talks/${talk.id.value}/details`
250-
251-
triggerTabbedPageNavigate(url, "forward", "push");
253+
if(props.emitEventOnTalkClicked) {
254+
emits('talk-clicked', talk);
255+
} else {
256+
// TODO: Re-enable this once *tabbed* talk details as feedback viewer routing has been fixed
257+
// const talkFeedbackViewerToken = toValue(talkFeedbackViewerTokensRef)?.find(t => t.talkId.isSameThan(talk.id));
258+
// const url = talkFeedbackViewerToken
259+
// ?`/events/${eventId.value.value}/talks/${talk.id.value}/asFeedbackViewer/${talkFeedbackViewerToken.secretToken}/details`
260+
// :`/events/${eventId.value.value}/talks/${talk.id.value}/details`
261+
const url = `${getResolvedEventRootPathFromSpacedEventIdRef(spacedEventId)}/talks/${talk.id.value}/details`
262+
263+
triggerTabbedPageNavigate(url, "forward", "push");
264+
}
252265
}
253266
}
254267

0 commit comments

Comments
 (0)