From 94a6dedf87bc57972abaa35c1b29f48bbf425ffa Mon Sep 17 00:00:00 2001
From: Andrew Tavis McAllister <andrew.t.mcallister@gmail.com>
Date: Tue, 2 Jul 2024 02:12:47 +0200
Subject: [PATCH] Apply event store to further components to fix TS errors

---
 frontend/components/card/about/CardAboutEvent.vue          | 6 ++++--
 frontend/components/header/HeaderAppPage.vue               | 7 +++++--
 .../components/modal/edit/about/ModalEditAboutEvent.vue    | 6 ++++--
 frontend/utils/testEntities.ts                             | 2 --
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/frontend/components/card/about/CardAboutEvent.vue b/frontend/components/card/about/CardAboutEvent.vue
index c2d1efb93..bed36a18e 100644
--- a/frontend/components/card/about/CardAboutEvent.vue
+++ b/frontend/components/card/about/CardAboutEvent.vue
@@ -64,8 +64,10 @@ import CardAbout from "./CardAbout.vue";
 const idParam = useRoute().params.id;
 const id = typeof idParam === "string" ? idParam : undefined;
 
-const event = useEventStore();
-await event.fetchByID(id);
+const eventStore = useEventStore();
+await eventStore.fetchByID(id);
+
+const { event } = eventStore;
 
 const description = ref();
 const descriptionExpandable = ref(false);
diff --git a/frontend/components/header/HeaderAppPage.vue b/frontend/components/header/HeaderAppPage.vue
index e10d58893..99dd97b9e 100644
--- a/frontend/components/header/HeaderAppPage.vue
+++ b/frontend/components/header/HeaderAppPage.vue
@@ -75,6 +75,7 @@
 
 <script setup lang="ts">
 import type { Organization } from "~/types/entities/organization";
+import type { Event } from "~/types/events/event";
 import { IconMap } from "~/types/icon-map";
 
 const props = defineProps<{
@@ -90,7 +91,8 @@ const id = typeof idParam === "string" ? idParam : undefined;
 const organizationStore = useOrganizationStore();
 let organization: Organization;
 const group = useGroupStore();
-const event = useEventStore();
+const eventStore = useEventStore();
+let event: Event;
 
 if (props.pageType === "organization") {
   await organizationStore.fetchByID(id);
@@ -98,7 +100,8 @@ if (props.pageType === "organization") {
 } else if (props.pageType === "group") {
   await group.fetchByID(id);
 } else if (props.pageType === "event") {
-  await event.fetchByID(id);
+  await eventStore.fetchByID(id);
+  event = eventStore.event;
 }
 
 const headerName = computed<string>(() => {
diff --git a/frontend/components/modal/edit/about/ModalEditAboutEvent.vue b/frontend/components/modal/edit/about/ModalEditAboutEvent.vue
index 482664338..2d7f1c3c1 100644
--- a/frontend/components/modal/edit/about/ModalEditAboutEvent.vue
+++ b/frontend/components/modal/edit/about/ModalEditAboutEvent.vue
@@ -59,8 +59,10 @@ const props = defineProps<{
 const idParam = useRoute().params.id;
 const id = typeof idParam === "string" ? idParam : undefined;
 
-const event = useEventStore();
-await event.fetchByID(id);
+const eventStore = useEventStore();
+await eventStore.fetchByID(id);
+
+const { event } = eventStore;
 
 const formData = ref({
   description: event.description,
diff --git a/frontend/utils/testEntities.ts b/frontend/utils/testEntities.ts
index 5b0d27b10..3d805dfac 100644
--- a/frontend/utils/testEntities.ts
+++ b/frontend/utils/testEntities.ts
@@ -145,7 +145,6 @@ export const testClimateEvent: Event = {
   // supportingUsers: [user, user],
   // iconURL: "/images/an_image.svg",
   socialLinks: ["climate_org@mastodon", "climate_org@email.com"],
-  loading: false,
 };
 
 export const testTechEvent: Event = {
@@ -163,7 +162,6 @@ export const testTechEvent: Event = {
   startTime: new Date().toLocaleDateString(),
   // supportingUsers: [user, user, user],
   socialLinks: [""],
-  loading: false,
 };
 
 export const testResource: Resource = {