fixed regressions on feedbacks page and rate talk page, where schedule-talk was no longer displayed because of a missing talkNotes (it would be nicer to consider this field as required at component level, but if I do so, I get errors telling me that Undefined is not matching declared type)

Author: fcamblor

mobile/src/views/event/FeedbacksPage.vue

@@ -41,7 +41,11 @@
                     </div>
                   </ion-item>
                   <ion-item v-else-if="feedback.status === 'provided'" class="listTalks-item">
-                    <schedule-talk :talk="findTimeslotTalkMatchingFeedback(timeslot, feedback.userFeedback)!" @talkClicked="toBeImplemented('To be implemented: opening feedback page in EDIT mode')" :is-highlighted="(talk, talkNotes) => talkNotes.isFavorite" :conf-descriptor="confDescriptor">
+                    <schedule-talk :talk="findTimeslotTalkMatchingFeedback(timeslot, feedback.userFeedback)!"
+                                   :talk-notes="userEventTalkNotesRef.get(findTimeslotTalkMatchingFeedback(timeslot, feedback.userFeedback)!.id.value)"
+                                   :is-highlighted="(talk, talkNotes) => talkNotes.isFavorite"
+                                   :conf-descriptor="confDescriptor"
+                                   @talkClicked="toBeImplemented('To be implemented: opening feedback page in EDIT mode')">
                       <template #upper-right="{ talk }">
                         <talk-format :format="talk.format" class="talkFormatContainer" />
                       </template>
@@ -78,7 +82,7 @@
   import DaySelector from "@/components/schedule/DaySelector.vue";
   import TimeSlotAccordion from "@/components/timeslots/TimeSlotAccordion.vue";
   import {IonAccordionGroup} from "@ionic/vue";
-  import {VoxxrinScheduleTimeSlot} from "@/models/VoxxrinSchedule";
+  import {extractTalksFromSchedule, VoxxrinScheduleTimeSlot} from "@/models/VoxxrinSchedule";
   import TimeslotsIterator from "@/components/timeslots/TimeslotsIterator.vue";
   import ScheduleTalk from "@/components/talk-card/ScheduleTalk.vue";
   import {useTabbedPageNav} from "@/state/useTabbedPageNav";
@@ -88,6 +92,8 @@
   import LinearRating from "@/components/ratings/LinearRating.vue";
   import {useSharedEventSelectedDay} from "@/state/useEventSelectedDay";
   import {areFeedbacksEnabled} from "@/models/VoxxrinConferenceDescriptor";
+  import {useUserEventTalkNotes} from "@/state/useUserTalkNotes";
+  import {computed, toValue} from "vue";
 
   const { LL } = typesafeI18n()
 
@@ -99,6 +105,13 @@
 
   const { schedule: currentSchedule } = useSchedule(confDescriptor, selectedDayId)
 
+  const talkIdsRef = computed(() => {
+      const schedule = toValue(currentSchedule);
+      return schedule ? extractTalksFromSchedule(schedule).map(talk => talk.id) : [];
+  })
+
+  const {userEventTalkNotesRef} = useUserEventTalkNotes(eventId, talkIdsRef)
+
   const expandedTimeslotIds = ref<string[]>([])
   function toggleExpandedTimeslot(timeslot: VoxxrinScheduleTimeSlot) {
       const expandedTimeslotIdsIndex = expandedTimeslotIds.value.indexOf(timeslot.id.value)

mobile/src/views/feedbacks/RateTalkPage.vue

@@ -6,7 +6,9 @@
       <slot>
         <div class="rateTalkView">
           <div class="rateTalkView-head">
-            <schedule-talk :conf-descriptor="confDescriptorRef" :is-highlighted="() => false" :talk="labelledTimeslotWithTalkRef.talk">
+            <schedule-talk :conf-descriptor="confDescriptorRef" :is-highlighted="() => false"
+                           :talk="labelledTimeslotWithTalkRef.talk"
+                           :talk-notes="userEventTalkNotesRef.get(labelledTimeslotWithTalkRef.talk.id.value)">
             </schedule-talk>
           </div>
 
@@ -65,10 +67,10 @@
 
 <script setup lang="ts">
 import {EventId} from "@/models/VoxxrinEvent";
-import {getRouteParamsValue} from "@/views/vue-utils";
+import {getRouteParamsValue, toManagedRef as toRef} from "@/views/vue-utils";
 import {useRoute} from "vue-router";
 import {useSharedConferenceDescriptor} from "@/state/useConferenceDescriptor";
-import {computed, reactive, unref, watch} from "vue";
+import {computed, reactive, toValue, unref, watch} from "vue";
 import {managedRef as ref} from "@/views/vue-utils";
 import {typesafeI18n} from "@/i18n/i18n-vue";
 import {TalkId} from "@/models/VoxxrinTalk";
@@ -88,12 +90,13 @@ import VoxDivider from "@/components/ui/VoxDivider.vue";
 import FeedbackFooter from "@/components/feedbacks/FeedbackFooter.vue";
 import {goBackOrNavigateTo} from "@/router";
 import LabelledLinearRating from "@/components/ratings/LabelledLinearRating.vue";
+import {useUserEventTalkNotes} from "@/state/useUserTalkNotes";
 
 const { LL } = typesafeI18n()
 
 const route = useRoute();
 const eventIdRef = computed(() => new EventId(getRouteParamsValue(route, 'eventId')));
-const talkId = new TalkId(getRouteParamsValue(route, 'talkId'));
+const talkIdRef = ref(new TalkId(getRouteParamsValue(route, 'talkId')));
 const {conferenceDescriptor: confDescriptorRef } = useSharedConferenceDescriptor(eventIdRef);
 
 const labelledTimeslotWithTalkRef = ref<undefined | DailyLabelledTimeslotWithTalk>(undefined);
@@ -104,7 +107,7 @@ const dayIdRef = computed(() => {
 
 const feedback: UnwrapNestedRefs<Omit<ProvidedUserFeedback, 'createdOn'|'lastUpdatedOn'>> = reactive({
     timeslotId: '',
-    talkId: talkId.value,
+    talkId: talkIdRef.value.value,
     alsoConcernsOverlappingTimeslotIds: [],
     status: 'provided',
     ratings: {
@@ -115,7 +118,7 @@ const feedback: UnwrapNestedRefs<Omit<ProvidedUserFeedback, 'createdOn'|'lastUpd
     comment: null
 })
 
-watch([confDescriptorRef], async ([confDescriptor]) => {
+watch([confDescriptorRef, talkIdRef], async ([confDescriptor, talkId]) => {
     if(!confDescriptor) {
         labelledTimeslotWithTalkRef.value = undefined;
         return;
@@ -162,6 +165,12 @@ const feedbackCanBeSubmitted = computed(() => {
 
 const {updateTimeslotFeedback} = useUserFeedbacks(eventIdRef, dayIdRef);
 
+const { userEventTalkNotesRef } = useUserEventTalkNotes(eventIdRef, toRef(() => talkIdRef ? [talkIdRef.value] : undefined))
+const talkNotes = toRef(() => {
+    const userEventTalkNotes = toValue(userEventTalkNotesRef)
+    return Array.from(userEventTalkNotes.values())[0];
+})
+
 async function submitFeedback() {
     const labelledTimeslotWithTalk = unref(labelledTimeslotWithTalkRef);
     if(!labelledTimeslotWithTalk) {