From 66aac8f5ed51326dff3ede6de6f8b26b7ddceba8 Mon Sep 17 00:00:00 2001 From: Gauthier Roebroeck Date: Wed, 11 Jun 2025 16:51:33 +0800 Subject: [PATCH] remove export global properties --- next-ui/src/api/komga-client.ts | 11 +---------- next-ui/src/main.ts | 2 -- next-ui/src/pages/login.vue | 4 ++-- next-ui/src/pages/server/users.vue | 2 +- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/next-ui/src/api/komga-client.ts b/next-ui/src/api/komga-client.ts index b2f9151a..61fd526b 100644 --- a/next-ui/src/api/komga-client.ts +++ b/next-ui/src/api/komga-client.ts @@ -1,7 +1,6 @@ import type { Middleware } from 'openapi-fetch' import createClient from 'openapi-fetch' import type { paths } from '@/generated/openapi/komga' -import { globalProperties } from '@/main' // Middleware that throws on error, so it works with Pinia Colada const coladaMiddleware: Middleware = { @@ -22,15 +21,7 @@ const coladaMiddleware: Middleware = { return undefined }, onError() { - throw new Error('error', { - cause: { - message: globalProperties.$intl.formatMessage({ - description: 'Network error: error message when the server cannot be reached', - defaultMessage: 'Server is unreachable', - id: '/6WuF/', - }), - }, - }) + throw new Error('error', { cause: {} }) }, } diff --git a/next-ui/src/main.ts b/next-ui/src/main.ts index ffffa61e..c8fc1722 100644 --- a/next-ui/src/main.ts +++ b/next-ui/src/main.ts @@ -18,5 +18,3 @@ const app = createApp(App) registerPlugins(app) app.mount('#app') - -export const globalProperties = app.config.globalProperties diff --git a/next-ui/src/pages/login.vue b/next-ui/src/pages/login.vue index 4605ca72..fda73c70 100644 --- a/next-ui/src/pages/login.vue +++ b/next-ui/src/pages/login.vue @@ -155,7 +155,7 @@ const { mutate: performLogin, isLoading } = useMutation({ else void router.push('/') }, onError: (error) => { - if ((error.cause as ErrorCause).status === 401) + if ((error?.cause as ErrorCause)?.status === 401) loginError.value = intl.formatMessage({ description: 'Login screen: error message displayed when login failed', defaultMessage: 'Invalid login or password', @@ -164,7 +164,7 @@ const { mutate: performLogin, isLoading } = useMutation({ else messagesStore.messages.push({ text: - (error.cause as ErrorCause).message || intl.formatMessage(commonMessages.networkError), + (error?.cause as ErrorCause)?.message || intl.formatMessage(commonMessages.networkError), }) }, }) diff --git a/next-ui/src/pages/server/users.vue b/next-ui/src/pages/server/users.vue index 1617c752..d4f029c9 100644 --- a/next-ui/src/pages/server/users.vue +++ b/next-ui/src/pages/server/users.vue @@ -348,7 +348,7 @@ function handleDialogConfirmation( .catch((error) => { messagesStore.messages.push({ text: - (error.cause as ErrorCause).message || intl.formatMessage(commonMessages.networkError), + (error?.cause as ErrorCause)?.message || intl.formatMessage(commonMessages.networkError), }) setLoading(false) })