From 476ad97fd93cf1c96cc8808db661cc7fbe2bf3d3 Mon Sep 17 00:00:00 2001
From: Melissa Autumn <melissa@thunderbird.net>
Date: Tue, 17 Oct 2023 12:14:05 -0700
Subject: [PATCH] Swap siteNotification to use a pinia store, and make the
 z-index bigger. (Fixes #151)

---
 frontend/src/App.vue                       | 24 +++++------
 frontend/src/elements/SiteNotification.vue |  2 +-
 frontend/src/stores/alert-store.js         | 50 ++++++++++++++++++++--
 3 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index f996726d..e01ed472 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -2,7 +2,7 @@
   <!-- authenticated subscriber content -->
   <template v-if="isAuthenticated">
     <site-notification
-      v-if="siteNotificationStore.display"
+      v-if="siteNotificationStore.isVisible"
       :title="siteNotificationStore.title"
       :action-url="siteNotificationStore.actionUrl"
     >
@@ -40,7 +40,7 @@ import { useRoute } from "vue-router";
 import NavBar from "@/components/NavBar";
 import TitleBar from "@/components/TitleBar";
 import SiteNotification from "@/elements/SiteNotification";
-import { siteNotificationStore } from "@/stores/alert-store";
+import { useSiteNotificationStore } from "@/stores/alert-store";
 
 // stores
 import { useUserStore } from '@/stores/user-store';
@@ -51,6 +51,7 @@ const currentUser = useUserStore(); // data: { username, email, name, level, tim
 const apiUrl = inject("apiUrl");
 const dj = inject("dayjs");
 const route = useRoute();
+const siteNotificationStore = useSiteNotificationStore();
 
 // handle auth and fetch
 const auth = useAuth0();
@@ -74,24 +75,23 @@ const call = createFetch({
     async onFetchError({ data, response, error }) {
       // Catch any google refresh error that may occur
       if (
-        data?.detail?.error === "google_refresh_error" &&
-        siteNotificationStore.value.id !== "google_refresh_error"
+        data?.detail?.error === 'google_refresh_error' &&
+        !siteNotificationStore.isSameNotification('google_refresh_error')
       ) {
         // Ensure other async calls don't reach here
-        siteNotificationStore.value.id = data.detail.error;
+        siteNotificationStore.lock(data.detail.error);
 
         // Retrieve the google auth url, and if that fails send them to calendar settings!
         const { data: urlData, error: urlError } = await call('google/auth').get();
         const url = urlError.value ? '/settings/calendar' : urlData.value.slice(1, -1);
 
         // Update our site notification store with the error details
-        siteNotificationStore.value = {
-          id: data.detail.error,
-          display: true,
-          actionUrl: url,
-          title: "Action needed!",
-          message: data.detail?.message || "Please re-connect with Google",
-        };
+        siteNotificationStore.show(
+          data.detail.error,
+          'Action needed!',
+          data.detail?.message || 'Please re-connect with Google',
+          url,
+        );
       }
 
       // Pass the error along
diff --git a/frontend/src/elements/SiteNotification.vue b/frontend/src/elements/SiteNotification.vue
index ace62c35..f3cc35ed 100644
--- a/frontend/src/elements/SiteNotification.vue
+++ b/frontend/src/elements/SiteNotification.vue
@@ -2,7 +2,7 @@
   <a :href="actionUrl">
     <div
       class="
-        fixed left-1/2 -translate-x-1/2 my-2.5 p-2 leading-none lg:rounded-full
+        z-[999] fixed left-1/2 -translate-x-1/2 my-2.5 p-2 leading-none lg:rounded-full
         flex lg:inline-flex items-center shadow-md dark:shadow-lg
         bg-rose-600 dark:bg-rose-900 text-white shadow-black/30"
       role="alert"
diff --git a/frontend/src/stores/alert-store.js b/frontend/src/stores/alert-store.js
index 8b20e8b1..074c0eac 100644
--- a/frontend/src/stores/alert-store.js
+++ b/frontend/src/stores/alert-store.js
@@ -1,7 +1,6 @@
-import { ref } from 'vue';
+import { defineStore } from 'pinia';
 
-// eslint-disable-next-line import/prefer-default-export
-export const siteNotificationStore = ref({
+const initialSiteNotificationObject = {
   // Ensure we don't need to set the same notification twice
   id: null,
   // Details
@@ -9,4 +8,49 @@ export const siteNotificationStore = ref({
   title: '',
   message: '',
   actionUrl: '',
+};
+
+// eslint-disable-next-line import/prefer-default-export
+export const useSiteNotificationStore = defineStore('siteNotification', {
+  state: () => ({
+    data: initialSiteNotificationObject,
+  }),
+  getters: {
+    isVisible() {
+      return this.data.display;
+    },
+    title() {
+      return this.data.title;
+    },
+    actionUrl() {
+      return this.data.actionUrl;
+    },
+    message() {
+      return this.data.message;
+    },
+  },
+  actions: {
+    isSameNotification(id) {
+      return this.data.id === id;
+    },
+    lock(id) {
+      this.$patch({
+        data: { id },
+      });
+    },
+    show(id, title, message, actionUrl) {
+      this.$patch({
+        data: {
+          id,
+          display: true,
+          title,
+          message,
+          actionUrl,
+        },
+      });
+    },
+    reset() {
+      this.$patch({ data: initialSiteNotificationObject });
+    },
+  },
 });