Merge pull request #4939 from carlobeltrame/fix-story-printing-periods

Fix story printing when there are multiple periods
ecamp · Apr 13, 2024 · e18b379 · e18b379
2 parents f04f30c + 3dc1c23
commit e18b379
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/frontend/src/views/camp/Story.vue b/frontend/src/views/camp/Story.vue
@@ -64,9 +64,7 @@ export default {
           {
             type: 'Story',
             options: {
-              periods: this.camp()
-                .periods()
-                .items.map((period) => period._meta.self),
+              periods: [this.period()._meta.self],
             },
           },
         ],

diff --git a/print/components/story/StoryPeriod.vue b/print/components/story/StoryPeriod.vue
@@ -30,27 +30,30 @@ const props = defineProps({
 
 const { $api } = useNuxtApp()
 
-const { data, error } = await useAsyncData('StoryPeriod', async () => {
-  const contentTypeStorycontext = (
-    await $api.get().contentTypes().$loadItems()
-  ).items.find((contentType) => contentType.name === 'Storycontext')
+const { data, error } = await useAsyncData(
+  `StoryPeriod-${props.period._meta.self}`,
+  async () => {
+    const contentTypeStorycontext = (
+      await $api.get().contentTypes().$loadItems()
+    ).items.find((contentType) => contentType.name === 'Storycontext')
 
-  const [periodStoryChapters] = await Promise.all([
-    $api
-      .get()
-      .contentNodes({
-        period: props.period._meta.self,
-        contentType: contentTypeStorycontext._meta.self,
-      })
-      .$loadItems(),
-    props.period.days().$loadItems(),
-    props.period.scheduleEntries().$loadItems(),
-    props.period.camp().categories().$loadItems(),
-  ])
+    const [periodStoryChapters] = await Promise.all([
+      $api
+        .get()
+        .contentNodes({
+          period: props.period._meta.self,
+          contentType: contentTypeStorycontext._meta.self,
+        })
+        .$loadItems(),
+      props.period.days().$loadItems(),
+      props.period.scheduleEntries().$loadItems(),
+      props.period.camp().categories().$loadItems(),
+    ])
 
-  return {
-    days: props.period.days().items,
-    periodStoryChapters: periodStoryChapters.items,
+    return {
+      days: props.period.days().items,
+      periodStoryChapters: periodStoryChapters.items,
+    }
   }
-})
+)
 </script>