From 9ec58e8ba05819cb178316f7782a8137980786d4 Mon Sep 17 00:00:00 2001 From: Graeme Ross Date: Sun, 20 Oct 2024 15:59:57 +0100 Subject: [PATCH] simplified the queryql setup --- api/src/graphql/settings.sdl.ts | 2 +- api/src/services/settings/settings.ts | 2 +- web/src/Routes.tsx | 2 +- web/src/components/Setting/SettingValue/SettingValue.tsx | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/src/graphql/settings.sdl.ts b/api/src/graphql/settings.sdl.ts index f5bdd57..4763d42 100644 --- a/api/src/graphql/settings.sdl.ts +++ b/api/src/graphql/settings.sdl.ts @@ -10,7 +10,7 @@ export const schema = gql` type Query { settings: [Setting!]! @requireAuth setting(id: Int!): Setting @skipAuth - value(name: String, group: String): [Setting!] @skipAuth + value(name: String, group: String): Setting! @skipAuth } input CreateSettingInput { diff --git a/api/src/services/settings/settings.ts b/api/src/services/settings/settings.ts index b21a054..db70b0e 100644 --- a/api/src/services/settings/settings.ts +++ b/api/src/services/settings/settings.ts @@ -13,7 +13,7 @@ export const setting: QueryResolvers['setting'] = ({ id }) => { } export const value: QueryResolvers['value'] = ({ name, group }) => { - const values = db.setting.findMany({ + const values = db.setting.findFirst({ where: { AND: [{ name: name }, { group: group }] }, }) return values diff --git a/web/src/Routes.tsx b/web/src/Routes.tsx index cd0a8af..9736739 100644 --- a/web/src/Routes.tsx +++ b/web/src/Routes.tsx @@ -17,7 +17,7 @@ import { useAuth } from './auth' const Routes = () => { return ( - + diff --git a/web/src/components/Setting/SettingValue/SettingValue.tsx b/web/src/components/Setting/SettingValue/SettingValue.tsx index e24c3ec..905f522 100644 --- a/web/src/components/Setting/SettingValue/SettingValue.tsx +++ b/web/src/components/Setting/SettingValue/SettingValue.tsx @@ -24,8 +24,8 @@ const SettingValue = ({ name, group = 'default' }: SettingValueProps) => { if (error) return 'Error! ' + error let value = name + ' not found in group ' + group - if (data.value.length >= 1) { - value = data.value[0].value + if (data.value) { + value = data.value.value } return value