refactor(settings): simplify settings query options and remove tenant dependency
CI / changes (push) Successful in 10s
CI / commitlint (push) Has been skipped
CI / openapi (push) Successful in 28s
CI / web (push) Successful in 1m0s
CI / go (push) Successful in 1m11s
CI / bird2 (push) Successful in 16s
CI / release (push) Successful in 4m5s

Updated the settings query options to eliminate the tenant ID parameter, streamlining the settings retrieval process. Adjusted the TenantSettingsComponent to reflect this change, ensuring it now queries settings without relying on tenant-specific data. This refactor enhances code clarity and reduces complexity in the settings management flow.
This commit is contained in:
Denozordec
2026-07-06 23:28:14 +07:00
parent db79820df0
commit 53b3c49612
5 changed files with 45 additions and 15 deletions
+2 -4
View File
@@ -42,14 +42,12 @@ export const BOOLEAN_SETTING_KEYS = new Set<KnownSettingKey>(['runtime_logs_auto
export const settingsKeys = {
all: ['settings'] as const,
tenant: (tenantId: string) => [...settingsKeys.all, tenantId] as const,
}
export function settingsQueryOptions(tenantId?: string | null) {
export function settingsQueryOptions() {
return queryOptions<AppSettings>({
queryKey: settingsKeys.tenant(tenantId ?? ''),
queryKey: settingsKeys.all,
queryFn: () => apiJSON<AppSettings>('/v1/settings'),
enabled: Boolean(tenantId),
staleTime: 30_000,
})
}
@@ -39,7 +39,6 @@ import {
settingsQueryOptions,
type BirdSettingKey,
} from '@/queries/settings'
import { authSessionQueryOptions } from '@/queries/auth'
import { apiMutate } from '@/lib/api-client'
export const Route = createFileRoute('/_auth/tenant-settings')({
@@ -72,9 +71,7 @@ const BIRD_LABELS: Record<BirdSettingKey, string> = {
function TenantSettingsComponent() {
const search = useSearch({ from: '/_auth/tenant-settings' })
const sessionQ = useQuery(authSessionQueryOptions())
const tenantId = sessionQ.data?.tenant_id ?? null
const settingsQ = useQuery(settingsQueryOptions(tenantId))
const settingsQ = useQuery(settingsQueryOptions())
const qc = useQueryClient()
const partitioned = settingsQ.data ? partitionSettings(settingsQ.data) : null