From c18de73b295486be81fc14b6133bfb82f858928c Mon Sep 17 00:00:00 2001 From: Ajit Mehrotra Date: Mon, 15 Dec 2025 16:46:54 -0500 Subject: [PATCH] refactor(notifications): center notification error button text --- web/src/components/Notifications/List.vue | 41 +++++------------------ 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/web/src/components/Notifications/List.vue b/web/src/components/Notifications/List.vue index 62a649a90..a448faa2b 100644 --- a/web/src/components/Notifications/List.vue +++ b/web/src/components/Notifications/List.vue @@ -6,13 +6,14 @@ import { useQuery } from '@vue/apollo-composable'; import { vInfiniteScroll } from '@vueuse/components'; import { useDebounceFn } from '@vueuse/core'; +import { dbgApolloError, extractGraphQLErrorMessage } from '~/helpers/functions'; + import type { ApolloError } from '@apollo/client/errors'; import type { NotificationImportance as Importance, Notification, NotificationType, } from '~/composables/gql/graphql'; -import type { GraphQLError } from 'graphql'; import { getNotifications, @@ -100,24 +101,11 @@ subscribeToMore({ }, }); -function dbgApolloError(prefix: string, err: ApolloError | null | undefined) { - if (!err) return; - console.group(`[Notifications] ${prefix}`); - console.log('top message:', err.message); - console.log('graphQLErrors:', err.graphQLErrors); - console.log('networkError:', err.networkError); - try { - console.log('json:', JSON.parse(JSON.stringify(err))); - } catch { - console.log('json:', 'failed to parse'); - console.log('json:', err); - } - console.groupEnd(); -} +// for debugging purposes: +// watch(error, (e) => dbgApolloError('useQuery error', e as ApolloError | null | undefined), { +// immediate: true, +// }); -watch(error, (e) => dbgApolloError('useQuery error', e as ApolloError | null | undefined), { - immediate: true, -}); watch(offlineError, (o) => { if (o) console.log('[Notifications] offlineError:', o.message); }); @@ -256,20 +244,7 @@ const displayErrorMessage = computed(() => { if (offlineError.value) return offlineError.value.message; const apolloErr = error.value as ApolloError | null | undefined; - const firstGqlErr = apolloErr?.graphQLErrors?.[0] as - | (GraphQLError & { - extensions?: { error?: { message?: string } }; - error?: { message?: string }; - }) - | undefined; - - const gqlEmbedded = firstGqlErr?.extensions?.error?.message; - const gqlTop = firstGqlErr?.error?.message; - const gqlMessage = firstGqlErr?.message; - const netMessage = (apolloErr?.networkError as { message?: string } | undefined)?.message; - const topMessage = apolloErr?.message; - - return gqlEmbedded || gqlTop || gqlMessage || netMessage || topMessage || 'An unknown error occurred.'; + return extractGraphQLErrorMessage(apolloErr); }); @@ -341,7 +316,7 @@ const displayErrorMessage = computed(() => {

Error

{{ displayErrorMessage }}

- Try Again + Try Again