From 548a3f4bc4aff191e69339e19fdfdadb039b3d2c Mon Sep 17 00:00:00 2001 From: Kunal Bhatia Date: Mon, 5 Oct 2026 00:41:07 +0530 Subject: [PATCH 1/5] feat: Add team setting to change default query language and enable/disable --- .changeset/team-query-language-settings.md | 7 + packages/api/src/controllers/team.ts | 54 +++++ packages/api/src/models/team.ts | 12 +- .../routers/api/__tests__/team.int.test.ts | 47 +++++ packages/api/src/routers/api/team.ts | 34 +++ packages/app/src/api.ts | 20 ++ .../SearchInput/InputLanguageSwitch.tsx | 11 +- .../SearchInput/SearchWhereInput.tsx | 74 ++++++- .../__tests__/SearchWhereInput.test.tsx | 26 ++- .../TeamSettings/TeamQueryConfigSection.tsx | 198 ++++++++++++++++++ packages/cli/src/api/client.ts | 2 + packages/common-utils/src/types.ts | 36 +++- 12 files changed, 506 insertions(+), 15 deletions(-) create mode 100644 .changeset/team-query-language-settings.md diff --git a/.changeset/team-query-language-settings.md b/.changeset/team-query-language-settings.md new file mode 100644 index 0000000000..e87a8d77b9 --- /dev/null +++ b/.changeset/team-query-language-settings.md @@ -0,0 +1,7 @@ +--- +'@hyperdx/app': minor +'@hyperdx/api': minor +'@hyperdx/common-utils': minor +--- + +feat: Add team setting to change default query language and enable/disable query languages diff --git a/packages/api/src/controllers/team.ts b/packages/api/src/controllers/team.ts index 6fd5bba1d5..d33443bfce 100644 --- a/packages/api/src/controllers/team.ts +++ b/packages/api/src/controllers/team.ts @@ -1,6 +1,7 @@ import { TagResourceType, TeamClickHouseSettingsUpdate, + TeamQueryLanguageSettingsUpdate, } from '@hyperdx/common-utils/dist/types'; import mongoose from 'mongoose'; import { v4 as uuidv4 } from 'uuid'; @@ -11,6 +12,7 @@ import Alert from '@/models/alert'; import Dashboard from '@/models/dashboard'; import { SavedSearch } from '@/models/savedSearch'; import Team, { type ITeam, type TeamDocument } from '@/models/team'; +import { BadRequestError } from '@/utils/errors'; export function getTeamInviteUrl(token: string) { return `${config.FRONTEND_URL}/join-team?token=${token}`; @@ -123,6 +125,58 @@ export function updateTeamClickhouseSettings( return Team.findByIdAndUpdate(teamId, update, { new: true }); } +export async function updateTeamQueryLanguageSettings( + teamId: ObjectId, + settings: TeamQueryLanguageSettingsUpdate, +) { + const currentTeam = await Team.findById(teamId); + if (!currentTeam) { + throw new Error(`Team ${teamId} not found`); + } + + const effectiveAllowed = + settings.allowedQueryLanguages !== undefined && + settings.allowedQueryLanguages !== null + ? settings.allowedQueryLanguages + : (currentTeam.allowedQueryLanguages ?? ['lucene', 'sql']); + + if (!effectiveAllowed || effectiveAllowed.length === 0) { + throw new BadRequestError('At least one query language must be enabled'); + } + + const effectiveDefault = + settings.defaultQueryLanguage !== undefined && + settings.defaultQueryLanguage !== null + ? settings.defaultQueryLanguage + : (currentTeam.defaultQueryLanguage ?? 'lucene'); + + if ( + effectiveDefault != null && + !effectiveAllowed.includes(effectiveDefault as 'sql' | 'lucene') + ) { + throw new BadRequestError( + 'Default query language must be one of the allowed query languages', + ); + } + + const $set: Record = {}; + const $unset: Record = {}; + + for (const [key, value] of Object.entries(settings)) { + if (value === null) { + $unset[key] = ''; + } else if (value !== undefined) { + $set[key] = value; + } + } + + const update: Record = {}; + if (Object.keys($set).length > 0) update.$set = $set; + if (Object.keys($unset).length > 0) update.$unset = $unset; + + return Team.findByIdAndUpdate(teamId, update, { new: true }); +} + function getCollectionsWithTags( resourceType?: TagResourceType, ): Pick, 'aggregate'>[] { diff --git a/packages/api/src/models/team.ts b/packages/api/src/models/team.ts index 1954e0ac7a..5dddbc8ed9 100644 --- a/packages/api/src/models/team.ts +++ b/packages/api/src/models/team.ts @@ -38,7 +38,6 @@ export default mongoose.model( type: Boolean, default: false, }, - // TODO: maybe add these to a top level Mixed type // CH Client Settings metadataMaxRowsToRead: Number, searchRowLimit: Number, @@ -46,6 +45,17 @@ export default mongoose.model( fieldMetadataDisabled: Boolean, parallelizeWhenPossible: Boolean, filterKeysFetchLimit: Number, + // Query Language Settings + defaultQueryLanguage: { + type: String, + enum: ['lucene', 'sql'], + default: 'lucene', + }, + allowedQueryLanguages: { + type: [String], + enum: ['lucene', 'sql'], + default: ['lucene', 'sql'], + }, }, { timestamps: true, diff --git a/packages/api/src/routers/api/__tests__/team.int.test.ts b/packages/api/src/routers/api/__tests__/team.int.test.ts index 93344f53ac..5eb5792635 100644 --- a/packages/api/src/routers/api/__tests__/team.int.test.ts +++ b/packages/api/src/routers/api/__tests__/team.int.test.ts @@ -34,12 +34,59 @@ describe('team router', () => { .toMatchInlineSnapshot(` { "allowedAuthMethods": [], + "allowedQueryLanguages": [ + "lucene", + "sql", + ], + "defaultQueryLanguage": "lucene", "isMetricsSeriesTableEnabled": false, "name": "fake@deploysentinel.com's Team", } `); }); + it('PATCH /team/query-language-settings - update query language settings', async () => { + const { agent } = await getLoggedInAgent(server); + + const patchResp = await agent + .patch('/team/query-language-settings') + .send({ + allowedQueryLanguages: ['sql'], + defaultQueryLanguage: 'sql', + }) + .expect(200); + + expect(patchResp.body).toEqual({ + allowedQueryLanguages: ['sql'], + defaultQueryLanguage: 'sql', + }); + + const getResp = await agent.get('/team').expect(200); + expect(getResp.body.allowedQueryLanguages).toEqual(['sql']); + expect(getResp.body.defaultQueryLanguage).toEqual('sql'); + }); + + it('PATCH /team/query-language-settings - rejects invalid configuration', async () => { + const { agent } = await getLoggedInAgent(server); + + // Rejects empty allowed languages + await agent + .patch('/team/query-language-settings') + .send({ + allowedQueryLanguages: [], + }) + .expect(400); + + // Rejects default language not in allowed languages + await agent + .patch('/team/query-language-settings') + .send({ + allowedQueryLanguages: ['sql'], + defaultQueryLanguage: 'lucene', + }) + .expect(400); + }); + it('GET /team reflects isMetricsSeriesTableEnabled when set', async () => { const { agent, team } = await getLoggedInAgent(server); diff --git a/packages/api/src/routers/api/team.ts b/packages/api/src/routers/api/team.ts index 40fc199486..e9aa9708f8 100644 --- a/packages/api/src/routers/api/team.ts +++ b/packages/api/src/routers/api/team.ts @@ -5,10 +5,12 @@ import type { TeamMembersApiResponse, TeamTagsApiResponse, UpdateClickHouseSettingsApiResponse, + UpdateQueryLanguageSettingsApiResponse, } from '@hyperdx/common-utils/dist/types'; import { TagResourceTypeSchema, TeamClickHouseSettingsUpdateSchema, + TeamQueryLanguageSettingsUpdateSchema, } from '@hyperdx/common-utils/dist/types'; import crypto from 'crypto'; import express from 'express'; @@ -23,6 +25,7 @@ import { rotateTeamApiKey, setTeamName, updateTeamClickhouseSettings, + updateTeamQueryLanguageSettings, } from '@/controllers/team'; import { deleteTeamMember, @@ -56,6 +59,8 @@ router.get('/', async (req, res: TeamApiExpRes, next) => { 'name', 'createdAt', 'isMetricsSeriesTableEnabled', + 'defaultQueryLanguage', + 'allowedQueryLanguages', ] as const; const team = await getTeam(teamId, fields); if (team == null) { @@ -136,6 +141,35 @@ router.patch( }, ); +router.patch( + '/query-language-settings', + processRequest({ + body: TeamQueryLanguageSettingsUpdateSchema, + }), + async ( + req, + res: express.Response, + next, + ) => { + try { + const teamId = req.user?.team; + if (teamId == null) { + throw new Error(`User ${req.user?._id} not associated with a team`); + } + + if (Object.keys(req.body).length === 0) { + return res.json({}); + } + + const team = await updateTeamQueryLanguageSettings(teamId, req.body); + + res.json(pick(team, Object.keys(req.body))); + } catch (e) { + next(e); + } + }, +); + router.post( '/invitation', validateRequest({ diff --git a/packages/app/src/api.ts b/packages/app/src/api.ts index 08a83e0a32..2da9003612 100644 --- a/packages/app/src/api.ts +++ b/packages/app/src/api.ts @@ -23,8 +23,10 @@ import type { TeamClickHouseSettingsUpdate, TeamInvitationsApiResponse, TeamMembersApiResponse, + TeamQueryLanguageSettingsUpdate, TeamTagsApiResponse, UpdateClickHouseSettingsApiResponse, + UpdateQueryLanguageSettingsApiResponse, WebhookCreateApiResponse, WebhooksApiResponse, WebhookTestApiResponse, @@ -599,6 +601,24 @@ const api = { }).json(), }); }, + useUpdateQueryLanguageSettings() { + const queryClient = useQueryClient(); + return useMutation< + UpdateQueryLanguageSettingsApiResponse, + HTTPError, + TeamQueryLanguageSettingsUpdate + >({ + mutationFn: async settings => + hdxServer(`team/query-language-settings`, { + method: 'PATCH', + json: settings, + }).json(), + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ['team'] }); + queryClient.invalidateQueries({ queryKey: ['me'] }); + }, + }); + }, getTagsQueryKey: (resourceType?: TagResourceType) => [...TAGS_QUERY_KEY_PREFIX, resourceType ?? null] as const, /** Tags that have been added to resources, optionally narrowed to one resource type. */ diff --git a/packages/app/src/components/SearchInput/InputLanguageSwitch.tsx b/packages/app/src/components/SearchInput/InputLanguageSwitch.tsx index 9a63c12083..bfba4d3e37 100644 --- a/packages/app/src/components/SearchInput/InputLanguageSwitch.tsx +++ b/packages/app/src/components/SearchInput/InputLanguageSwitch.tsx @@ -8,13 +8,19 @@ const DATA: { value: Language; label: string }[] = [ { value: 'lucene', label: 'Lucene' }, ]; +const DEFAULT_ALLOWED_LANGUAGES: Language[] = ['sql', 'lucene']; + export default function InputLanguageSwitch({ language, onLanguageChange, + allowedLanguages = DEFAULT_ALLOWED_LANGUAGES, }: { language: Language; onLanguageChange: (language: Language) => void; + allowedLanguages?: Language[]; }) { + const options = DATA.filter(d => allowedLanguages.includes(d.value)); + return ( { + if (val === 'sql' || val === 'lucene') { + setSelectedDefault(val); + } + }} + data={selectedAllowed.map(l => ({ + value: l, + label: l === 'sql' ? 'SQL' : 'Lucene', + }))} + /> + + + + + + + + ) : ( + + + + + Enabled:{' '} + + {allowedLanguages + .map(l => (l === 'sql' ? 'SQL' : 'Lucene')) + .join(', ')} + + + + Default:{' '} + + {defaultLanguage === 'sql' ? 'SQL' : 'Lucene'} + + + {hasAdminAccess && ( + + )} + + )} + + ); +} + type ClickhouseSettingType = 'number' | 'boolean'; interface ClickhouseSettingFormProps { @@ -281,6 +473,12 @@ export default function TeamQueryConfigSection() { return ( + Query Language Settings + + + + + ClickHouse Client Settings diff --git a/packages/cli/src/api/client.ts b/packages/cli/src/api/client.ts index 504401e670..302665684f 100644 --- a/packages/cli/src/api/client.ts +++ b/packages/cli/src/api/client.ts @@ -418,6 +418,8 @@ export class ProxyClickhouseClient extends BaseClickhouseClient { export interface MeTeam { id: string; name: string; + defaultQueryLanguage?: 'sql' | 'lucene'; + allowedQueryLanguages?: ('sql' | 'lucene')[]; } interface MeResponse { diff --git a/packages/common-utils/src/types.ts b/packages/common-utils/src/types.ts index 69c26e4699..4db2854077 100644 --- a/packages/common-utils/src/types.ts +++ b/packages/common-utils/src/types.ts @@ -2338,6 +2338,35 @@ export type TeamClickHouseSettings = z.infer< typeof TeamClickHouseSettingsSchema >; +export const TeamQueryLanguageSettingsSchema = z.object({ + defaultQueryLanguage: z.enum(['lucene', 'sql']).optional(), + allowedQueryLanguages: z + .array(z.enum(['lucene', 'sql'])) + .min(1) + .optional(), +}); + +export const TeamQueryLanguageSettingsUpdateSchema = z.object({ + defaultQueryLanguage: z.enum(['lucene', 'sql']).nullish(), + allowedQueryLanguages: z + .array(z.enum(['lucene', 'sql'])) + .min(1) + .nullish(), +}); + +export type TeamQueryLanguageSettings = z.infer< + typeof TeamQueryLanguageSettingsSchema +>; +export type TeamQueryLanguageSettingsUpdate = z.infer< + typeof TeamQueryLanguageSettingsUpdateSchema +>; + +export const UpdateQueryLanguageSettingsApiResponseSchema = + TeamQueryLanguageSettingsSchema.partial(); +export type UpdateQueryLanguageSettingsApiResponse = z.infer< + typeof UpdateQueryLanguageSettingsApiResponseSchema +>; + export const TeamSchema = z .object({ id: z.string(), @@ -2348,7 +2377,8 @@ export const TeamSchema = z collectorAuthenticationEnforced: z.boolean(), isMetricsSeriesTableEnabled: z.boolean(), }) - .merge(TeamClickHouseSettingsSchema); + .merge(TeamClickHouseSettingsSchema) + .merge(TeamQueryLanguageSettingsSchema); export type Team = z.infer; @@ -3078,7 +3108,9 @@ export const MeApiResponseSchema = z.object({ name: true, allowedAuthMethods: true, apiKey: true, - }).merge(TeamClickHouseSettingsSchema), + }) + .merge(TeamClickHouseSettingsSchema) + .merge(TeamQueryLanguageSettingsSchema), usageStatsEnabled: z.boolean(), aiAssistantEnabled: z.boolean(), }); From b17aeb5e6484a364a1d2946daabf1e16787ab795 Mon Sep 17 00:00:00 2001 From: Kunal Bhatia Date: Mon, 5 Oct 2026 01:10:17 +0530 Subject: [PATCH 2/5] fix(team): address PR #3282 review feedback for query language settings --- packages/api/src/controllers/team.ts | 74 +++--- .../SearchInput/SearchWhereInput.tsx | 28 ++- .../__tests__/SearchWhereInput.test.tsx | 10 + .../QueryLanguageSettingsForm.tsx | 213 ++++++++++++++++++ .../TeamSettings/TeamQueryConfigSection.tsx | 196 +--------------- packages/common-utils/src/types.ts | 19 +- 6 files changed, 291 insertions(+), 249 deletions(-) create mode 100644 packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx diff --git a/packages/api/src/controllers/team.ts b/packages/api/src/controllers/team.ts index d33443bfce..23b90d955f 100644 --- a/packages/api/src/controllers/team.ts +++ b/packages/api/src/controllers/team.ts @@ -12,7 +12,7 @@ import Alert from '@/models/alert'; import Dashboard from '@/models/dashboard'; import { SavedSearch } from '@/models/savedSearch'; import Team, { type ITeam, type TeamDocument } from '@/models/team'; -import { BadRequestError } from '@/utils/errors'; +import { Api400Error } from '@/utils/errors'; export function getTeamInviteUrl(token: string) { return `${config.FRONTEND_URL}/join-team?token=${token}`; @@ -28,6 +28,8 @@ export const LOCAL_APP_TEAM = { apiKey: uuidv4(), collectorAuthenticationEnforced: false, isMetricsSeriesTableEnabled: false, + defaultQueryLanguage: 'lucene' as 'sql' | 'lucene', + allowedQueryLanguages: ['lucene', 'sql'] as ('sql' | 'lucene')[], toJSON() { return this; }, @@ -103,12 +105,9 @@ export function setTeamName(teamId: ObjectId, name: string) { return Team.findByIdAndUpdate(teamId, { name }, { new: true }); } -export function updateTeamClickhouseSettings( - teamId: ObjectId, - settings: TeamClickHouseSettingsUpdate, -) { - const $set: Record = {}; - const $unset: Record = {}; +function buildSetUnsetUpdate>(settings: T) { + const $set: Record = {}; + const $unset: Record = {}; for (const [key, value] of Object.entries(settings)) { if (value === null) { @@ -118,10 +117,18 @@ export function updateTeamClickhouseSettings( } } - const update: Record = {}; + const update: mongoose.UpdateQuery = {}; if (Object.keys($set).length > 0) update.$set = $set; if (Object.keys($unset).length > 0) update.$unset = $unset; + return update; +} + +export function updateTeamClickhouseSettings( + teamId: ObjectId, + settings: TeamClickHouseSettingsUpdate, +) { + const update = buildSetUnsetUpdate(settings); return Team.findByIdAndUpdate(teamId, update, { new: true }); } @@ -129,50 +136,43 @@ export async function updateTeamQueryLanguageSettings( teamId: ObjectId, settings: TeamQueryLanguageSettingsUpdate, ) { - const currentTeam = await Team.findById(teamId); + const currentTeam = config.IS_LOCAL_APP_MODE + ? LOCAL_APP_TEAM + : await Team.findById(teamId); + if (!currentTeam) { throw new Error(`Team ${teamId} not found`); } - const effectiveAllowed = - settings.allowedQueryLanguages !== undefined && - settings.allowedQueryLanguages !== null - ? settings.allowedQueryLanguages - : (currentTeam.allowedQueryLanguages ?? ['lucene', 'sql']); + const effectiveAllowed = settings.allowedQueryLanguages ?? + currentTeam.allowedQueryLanguages ?? ['lucene', 'sql']; - if (!effectiveAllowed || effectiveAllowed.length === 0) { - throw new BadRequestError('At least one query language must be enabled'); + if (effectiveAllowed.length === 0) { + throw new Api400Error('At least one query language must be enabled'); } const effectiveDefault = - settings.defaultQueryLanguage !== undefined && - settings.defaultQueryLanguage !== null - ? settings.defaultQueryLanguage - : (currentTeam.defaultQueryLanguage ?? 'lucene'); - - if ( - effectiveDefault != null && - !effectiveAllowed.includes(effectiveDefault as 'sql' | 'lucene') - ) { - throw new BadRequestError( + settings.defaultQueryLanguage ?? + currentTeam.defaultQueryLanguage ?? + 'lucene'; + + if (!effectiveAllowed.includes(effectiveDefault)) { + throw new Api400Error( 'Default query language must be one of the allowed query languages', ); } - const $set: Record = {}; - const $unset: Record = {}; - - for (const [key, value] of Object.entries(settings)) { - if (value === null) { - $unset[key] = ''; - } else if (value !== undefined) { - $set[key] = value; + if (config.IS_LOCAL_APP_MODE) { + if (settings.defaultQueryLanguage !== undefined) { + LOCAL_APP_TEAM.defaultQueryLanguage = settings.defaultQueryLanguage; + } + if (settings.allowedQueryLanguages !== undefined) { + LOCAL_APP_TEAM.allowedQueryLanguages = settings.allowedQueryLanguages; } + return LOCAL_APP_TEAM; } - const update: Record = {}; - if (Object.keys($set).length > 0) update.$set = $set; - if (Object.keys($unset).length > 0) update.$unset = $unset; + const update = buildSetUnsetUpdate(settings); return Team.findByIdAndUpdate(teamId, update, { new: true }); } diff --git a/packages/app/src/components/SearchInput/SearchWhereInput.tsx b/packages/app/src/components/SearchInput/SearchWhereInput.tsx index f30321dc6b..d6b8f26c5b 100644 --- a/packages/app/src/components/SearchInput/SearchWhereInput.tsx +++ b/packages/app/src/components/SearchInput/SearchWhereInput.tsx @@ -27,26 +27,38 @@ export function getStoredLanguage( defaultQueryLanguage?: 'sql' | 'lucene'; } | null, ): 'sql' | 'lucene' | null { - const allowed = team?.allowedQueryLanguages?.length - ? team.allowedQueryLanguages - : ['lucene', 'sql']; + let stored: 'sql' | 'lucene' | null = null; try { - const stored = + const val = typeof window !== 'undefined' ? window.localStorage.getItem(STORAGE_KEY) : null; - if (stored === 'sql' || stored === 'lucene') { - if (allowed.includes(stored)) return stored; + if (val === 'sql' || val === 'lucene') { + stored = val; } } catch { // localStorage may throw in private browsing } + + if (!team) { + return stored; + } + + const allowed: ('sql' | 'lucene')[] = team.allowedQueryLanguages?.length + ? team.allowedQueryLanguages + : ['lucene', 'sql']; + + if (stored && allowed.includes(stored)) { + return stored; + } + if ( - team?.defaultQueryLanguage && + team.defaultQueryLanguage && allowed.includes(team.defaultQueryLanguage) ) { return team.defaultQueryLanguage; } + return allowed[0] ?? null; } @@ -186,7 +198,7 @@ export default function SearchWhereInput({ const { data: me } = api.useMe(); const teamAllowedLanguages = me?.team?.allowedQueryLanguages; - const allowedLanguages = useMemo( + const allowedLanguages: ('sql' | 'lucene')[] = useMemo( () => teamAllowedLanguages ?? ['lucene', 'sql'], [teamAllowedLanguages], ); diff --git a/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx b/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx index 18bf922cb2..d84d3371e8 100644 --- a/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx +++ b/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx @@ -80,6 +80,16 @@ describe('SearchWhereInput', () => { }); describe('Team Query Language Settings', () => { + it('returns null when no team argument is passed and localStorage is empty', () => { + window.localStorage.removeItem('hdx-search-where-language'); + expect(getStoredLanguage()).toBeNull(); + }); + + it('returns stored language when no team argument is passed if localStorage has a value', () => { + window.localStorage.setItem('hdx-search-where-language', 'sql'); + expect(getStoredLanguage()).toBe('sql'); + }); + it('returns stored language if allowed by team', () => { window.localStorage.setItem('hdx-search-where-language', 'sql'); expect( diff --git a/packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx b/packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx new file mode 100644 index 0000000000..7afe966364 --- /dev/null +++ b/packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx @@ -0,0 +1,213 @@ +import { useState } from 'react'; +import { + Box, + Button, + Checkbox, + Group, + InputLabel, + Select, + Stack, + Text, + Tooltip, +} from '@mantine/core'; +import { notifications } from '@mantine/notifications'; +import { IconHelpCircle, IconPencil } from '@tabler/icons-react'; + +import api from '@/api'; + +export default function QueryLanguageSettingsForm() { + const { data: me } = api.useMe(); + const updateQueryLanguageSettings = api.useUpdateQueryLanguageSettings(); + const hasAdminAccess = true; + const [isEditing, setIsEditing] = useState(false); + + const allowedLanguages: ('sql' | 'lucene')[] = me?.team + ?.allowedQueryLanguages ?? ['lucene', 'sql']; + const defaultLanguage: 'sql' | 'lucene' = + me?.team?.defaultQueryLanguage ?? 'lucene'; + + const [selectedAllowed, setSelectedAllowed] = + useState<('sql' | 'lucene')[]>(allowedLanguages); + const [selectedDefault, setSelectedDefault] = useState<'sql' | 'lucene'>( + defaultLanguage, + ); + + const handleStartEdit = () => { + setSelectedAllowed(allowedLanguages); + setSelectedDefault(defaultLanguage); + setIsEditing(true); + }; + + const handleToggleLanguage = (lang: 'sql' | 'lucene', checked: boolean) => { + let newAllowed: ('sql' | 'lucene')[]; + if (checked) { + newAllowed = [...selectedAllowed, lang]; + } else { + newAllowed = selectedAllowed.filter(l => l !== lang); + } + if (newAllowed.length === 0) { + notifications.show({ + color: 'red', + message: 'At least one query language must be enabled', + }); + return; + } + setSelectedAllowed(newAllowed); + if (!newAllowed.includes(selectedDefault)) { + setSelectedDefault(newAllowed[0]); + } + }; + + const handleSubmit = async (e: React.FormEvent) => { + e.preventDefault(); + if (selectedAllowed.length === 0) { + notifications.show({ + color: 'red', + message: 'At least one query language must be enabled', + }); + return; + } + updateQueryLanguageSettings.mutate( + { + allowedQueryLanguages: selectedAllowed, + defaultQueryLanguage: selectedDefault, + }, + { + onError: async err => { + let message = 'Failed to update query language settings'; + try { + const data = await ( + err as { + response?: { json: () => Promise<{ message?: string }> }; + } + )?.response?.json(); + if (data?.message) message = data.message; + } catch { + if (err instanceof Error) message = err.message; + } + notifications.show({ + color: 'red', + message, + }); + }, + onSuccess: () => { + notifications.show({ + color: 'green', + message: 'Updated query language settings', + }); + setIsEditing(false); + }, + }, + ); + }; + + return ( + + + Query language configuration + + + + + + + + Restrict available query languages across search interfaces and set the + default option. + + {isEditing && hasAdminAccess ? ( +
+ + + + Enabled query languages + + + + handleToggleLanguage('lucene', e.currentTarget.checked) + } + /> + + handleToggleLanguage('sql', e.currentTarget.checked) + } + /> + + + + + Default query language + + { - if (val === 'sql' || val === 'lucene') { - setSelectedDefault(val); - } - }} - data={selectedAllowed.map(l => ({ - value: l, - label: l === 'sql' ? 'SQL' : 'Lucene', - }))} - /> - - - - - - -
- ) : ( - - - - - Enabled:{' '} - - {allowedLanguages - .map(l => (l === 'sql' ? 'SQL' : 'Lucene')) - .join(', ')} - - - - Default:{' '} - - {defaultLanguage === 'sql' ? 'SQL' : 'Lucene'} - - - {hasAdminAccess && ( - - )} - - )} -
- ); -} +import QueryLanguageSettingsForm from './QueryLanguageSettingsForm'; type ClickhouseSettingType = 'number' | 'boolean'; @@ -473,13 +283,13 @@ export default function TeamQueryConfigSection() { return ( - Query Language Settings + Query language settings - ClickHouse Client Settings + ClickHouse client settings diff --git a/packages/common-utils/src/types.ts b/packages/common-utils/src/types.ts index 4db2854077..3f2f3b7a0d 100644 --- a/packages/common-utils/src/types.ts +++ b/packages/common-utils/src/types.ts @@ -155,10 +155,13 @@ const SearchConditionRequiredLanguageSchema = z.enum([ 'lucene', 'promql', ]); +export const QueryLanguageSchema = + SearchConditionRequiredLanguageSchema.exclude(['promql']); +export type QueryLanguage = z.infer; export const SearchConditionLanguageSchema = SearchConditionRequiredLanguageSchema.optional(); export const SearchConditionTrimmedLanguageSchema = - SearchConditionRequiredLanguageSchema.exclude(['promql']).optional(); + QueryLanguageSchema.optional(); export const AggregateFunctionSchema = z.enum([ 'avg', 'count', @@ -2339,19 +2342,13 @@ export type TeamClickHouseSettings = z.infer< >; export const TeamQueryLanguageSettingsSchema = z.object({ - defaultQueryLanguage: z.enum(['lucene', 'sql']).optional(), - allowedQueryLanguages: z - .array(z.enum(['lucene', 'sql'])) - .min(1) - .optional(), + defaultQueryLanguage: QueryLanguageSchema.optional(), + allowedQueryLanguages: z.array(QueryLanguageSchema).min(1).optional(), }); export const TeamQueryLanguageSettingsUpdateSchema = z.object({ - defaultQueryLanguage: z.enum(['lucene', 'sql']).nullish(), - allowedQueryLanguages: z - .array(z.enum(['lucene', 'sql'])) - .min(1) - .nullish(), + defaultQueryLanguage: QueryLanguageSchema.optional(), + allowedQueryLanguages: z.array(QueryLanguageSchema).min(1).optional(), }); export type TeamQueryLanguageSettings = z.infer< From cff70b9d722aa447ee3ecabe98a19dfb6b70920f Mon Sep 17 00:00:00 2001 From: Kunal Bhatia Date: Mon, 5 Oct 2026 01:29:26 +0530 Subject: [PATCH 3/5] fix(team): resolve race conditions, default language upgrade, and schema aliasing --- packages/api/src/controllers/team.ts | 41 ++++++++++++++++++- .../routers/api/__tests__/team.int.test.ts | 21 ++++++++++ .../SearchInput/SearchWhereInput.tsx | 31 ++++++++------ .../__tests__/SearchWhereInput.test.tsx | 10 +++++ .../QueryLanguageSettingsForm.tsx | 21 ++++------ packages/common-utils/src/types.ts | 6 +-- 6 files changed, 101 insertions(+), 29 deletions(-) diff --git a/packages/api/src/controllers/team.ts b/packages/api/src/controllers/team.ts index 23b90d955f..f562edf165 100644 --- a/packages/api/src/controllers/team.ts +++ b/packages/api/src/controllers/team.ts @@ -174,7 +174,46 @@ export async function updateTeamQueryLanguageSettings( const update = buildSetUnsetUpdate(settings); - return Team.findByIdAndUpdate(teamId, update, { new: true }); + const updatedTeam = await Team.findByIdAndUpdate(teamId, update, { + new: true, + }); + + if (!updatedTeam) { + throw new Error(`Team ${teamId} not found`); + } + + const finalAllowed = updatedTeam.allowedQueryLanguages ?? ['lucene', 'sql']; + const finalDefault = updatedTeam.defaultQueryLanguage ?? 'lucene'; + + if (finalAllowed.length === 0) { + await Team.findByIdAndUpdate(teamId, { + $set: { + allowedQueryLanguages: currentTeam.allowedQueryLanguages ?? [ + 'lucene', + 'sql', + ], + defaultQueryLanguage: currentTeam.defaultQueryLanguage ?? 'lucene', + }, + }); + throw new Api400Error('At least one query language must be enabled'); + } + + if (!finalAllowed.includes(finalDefault)) { + await Team.findByIdAndUpdate(teamId, { + $set: { + allowedQueryLanguages: currentTeam.allowedQueryLanguages ?? [ + 'lucene', + 'sql', + ], + defaultQueryLanguage: currentTeam.defaultQueryLanguage ?? 'lucene', + }, + }); + throw new Api400Error( + 'Default query language must be one of the allowed query languages', + ); + } + + return updatedTeam; } function getCollectionsWithTags( diff --git a/packages/api/src/routers/api/__tests__/team.int.test.ts b/packages/api/src/routers/api/__tests__/team.int.test.ts index 5eb5792635..a8c5451a8b 100644 --- a/packages/api/src/routers/api/__tests__/team.int.test.ts +++ b/packages/api/src/routers/api/__tests__/team.int.test.ts @@ -2,6 +2,11 @@ import _ from 'lodash'; import { ObjectId } from 'mongodb'; import mongoose from 'mongoose'; +import * as config from '@/config'; +import { + LOCAL_APP_TEAM, + updateTeamQueryLanguageSettings, +} from '@/controllers/team'; import { getLoggedInAgent, getServer } from '@/fixtures'; import Alert, { AlertSource, AlertThresholdType } from '@/models/alert'; import Team from '@/models/team'; @@ -87,6 +92,22 @@ describe('team router', () => { .expect(400); }); + it('updateTeamQueryLanguageSettings works in local app mode', async () => { + const origLocalMode = config.IS_LOCAL_APP_MODE; + try { + (config as { IS_LOCAL_APP_MODE: boolean }).IS_LOCAL_APP_MODE = true; + const res = await updateTeamQueryLanguageSettings(LOCAL_APP_TEAM._id, { + allowedQueryLanguages: ['sql'], + defaultQueryLanguage: 'sql', + }); + expect(res.allowedQueryLanguages).toEqual(['sql']); + expect(res.defaultQueryLanguage).toEqual('sql'); + } finally { + (config as { IS_LOCAL_APP_MODE: boolean }).IS_LOCAL_APP_MODE = + origLocalMode; + } + }); + it('GET /team reflects isMetricsSeriesTableEnabled when set', async () => { const { agent, team } = await getLoggedInAgent(server); diff --git a/packages/app/src/components/SearchInput/SearchWhereInput.tsx b/packages/app/src/components/SearchInput/SearchWhereInput.tsx index d6b8f26c5b..1c0dbd1bfe 100644 --- a/packages/app/src/components/SearchInput/SearchWhereInput.tsx +++ b/packages/app/src/components/SearchInput/SearchWhereInput.tsx @@ -1,6 +1,7 @@ import { useCallback, useEffect, useMemo } from 'react'; import { FieldPath, useController, UseControllerProps } from 'react-hook-form'; import { TableConnectionChoice } from '@hyperdx/common-utils/dist/core/metadata'; +import type { QueryLanguage } from '@hyperdx/common-utils/dist/types'; import { ActionIcon, Box, Flex, Tooltip } from '@mantine/core'; import { useDisclosure } from '@mantine/hooks'; import { IconHelp } from '@tabler/icons-react'; @@ -23,11 +24,11 @@ const STORAGE_KEY = 'hdx-search-where-language'; */ export function getStoredLanguage( team?: { - allowedQueryLanguages?: ('sql' | 'lucene')[]; - defaultQueryLanguage?: 'sql' | 'lucene'; + allowedQueryLanguages?: QueryLanguage[]; + defaultQueryLanguage?: QueryLanguage; } | null, -): 'sql' | 'lucene' | null { - let stored: 'sql' | 'lucene' | null = null; +): QueryLanguage | null { + let stored: QueryLanguage | null = null; try { const val = typeof window !== 'undefined' @@ -44,7 +45,7 @@ export function getStoredLanguage( return stored; } - const allowed: ('sql' | 'lucene')[] = team.allowedQueryLanguages?.length + const allowed: QueryLanguage[] = team.allowedQueryLanguages?.length ? team.allowedQueryLanguages : ['lucene', 'sql']; @@ -62,7 +63,7 @@ export function getStoredLanguage( return allowed[0] ?? null; } -function setStoredLanguage(lang: 'sql' | 'lucene'): void { +function setStoredLanguage(lang: QueryLanguage): void { try { if (typeof window !== 'undefined') window.localStorage.setItem(STORAGE_KEY, lang); @@ -80,7 +81,7 @@ export type SearchWhereInputProps = { * Callback when language changes - typically used to update form state * If not provided, language switching will be handled internally */ - onLanguageChange?: (lang: 'sql' | 'lucene') => void; + onLanguageChange?: (lang: QueryLanguage) => void; /** * Enable keyboard shortcut (/ or s) to focus the input */ @@ -198,7 +199,7 @@ export default function SearchWhereInput({ const { data: me } = api.useMe(); const teamAllowedLanguages = me?.team?.allowedQueryLanguages; - const allowedLanguages: ('sql' | 'lucene')[] = useMemo( + const allowedLanguages: QueryLanguage[] = useMemo( () => teamAllowedLanguages ?? ['lucene', 'sql'], [teamAllowedLanguages], ); @@ -209,9 +210,7 @@ export default function SearchWhereInput({ name: languageName as FieldPath, }); - const language: 'sql' | 'lucene' = allowedLanguages.includes( - languageField.value, - ) + const language: QueryLanguage = allowedLanguages.includes(languageField.value) ? languageField.value : allowedLanguages.includes(defaultLanguage) ? defaultLanguage @@ -220,7 +219,7 @@ export default function SearchWhereInput({ const isSql = language === 'sql'; const handleLanguageChange = useCallback( - (lang: 'sql' | 'lucene') => { + (lang: QueryLanguage) => { setStoredLanguage(lang); languageField.onChange(lang); onLanguageChange?.(lang); @@ -229,6 +228,7 @@ export default function SearchWhereInput({ ); useEffect(() => { + const rawStored = getStoredLanguage(); if ( languageField.value && !allowedLanguages.includes(languageField.value) @@ -238,6 +238,13 @@ export default function SearchWhereInput({ const stored = getStoredLanguage(me?.team); const fallback = stored ?? language; handleLanguageChange(fallback); + } else if ( + rawStored == null && + me?.team?.defaultQueryLanguage && + allowedLanguages.includes(me.team.defaultQueryLanguage) && + languageField.value !== me.team.defaultQueryLanguage + ) { + handleLanguageChange(me.team.defaultQueryLanguage); } }, [ languageField.value, diff --git a/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx b/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx index d84d3371e8..644bc84ed1 100644 --- a/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx +++ b/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx @@ -109,6 +109,16 @@ describe('SearchWhereInput', () => { }), ).toBe('sql'); }); + + it('returns defaultQueryLanguage SQL when both languages are allowed and localStorage is empty', () => { + window.localStorage.removeItem('hdx-search-where-language'); + expect( + getStoredLanguage({ + allowedQueryLanguages: ['lucene', 'sql'], + defaultQueryLanguage: 'sql', + }), + ).toBe('sql'); + }); }); describe('Lucene Mode', () => { diff --git a/packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx b/packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx index 7afe966364..173705bee1 100644 --- a/packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx +++ b/packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx @@ -18,7 +18,6 @@ import api from '@/api'; export default function QueryLanguageSettingsForm() { const { data: me } = api.useMe(); const updateQueryLanguageSettings = api.useUpdateQueryLanguageSettings(); - const hasAdminAccess = true; const [isEditing, setIsEditing] = useState(false); const allowedLanguages: ('sql' | 'lucene')[] = me?.team @@ -115,7 +114,7 @@ export default function QueryLanguageSettingsForm() { Restrict available query languages across search interfaces and set the default option. - {isEditing && hasAdminAccess ? ( + {isEditing ? (
@@ -196,16 +195,14 @@ export default function QueryLanguageSettingsForm() { {defaultLanguage === 'sql' ? 'SQL' : 'Lucene'} - {hasAdminAccess && ( - - )} + )} diff --git a/packages/common-utils/src/types.ts b/packages/common-utils/src/types.ts index 3f2f3b7a0d..d121de02f6 100644 --- a/packages/common-utils/src/types.ts +++ b/packages/common-utils/src/types.ts @@ -2346,10 +2346,8 @@ export const TeamQueryLanguageSettingsSchema = z.object({ allowedQueryLanguages: z.array(QueryLanguageSchema).min(1).optional(), }); -export const TeamQueryLanguageSettingsUpdateSchema = z.object({ - defaultQueryLanguage: QueryLanguageSchema.optional(), - allowedQueryLanguages: z.array(QueryLanguageSchema).min(1).optional(), -}); +export const TeamQueryLanguageSettingsUpdateSchema = + TeamQueryLanguageSettingsSchema; export type TeamQueryLanguageSettings = z.infer< typeof TeamQueryLanguageSettingsSchema From 75ffe89caba7821c9344822ee9bcea5a94a4a745 Mon Sep 17 00:00:00 2001 From: Kunal Bhatia Date: Mon, 5 Oct 2026 01:43:27 +0530 Subject: [PATCH 4/5] Address review comments for team query language settings --- packages/api/src/controllers/team.ts | 102 +++++++++--------- .../SearchInput/InputLanguageSwitch.tsx | 26 ++--- .../__tests__/SearchWhereInput.test.tsx | 28 +++++ .../QueryLanguageSettingsForm.tsx | 34 +++--- packages/common-utils/src/types.ts | 5 + 5 files changed, 118 insertions(+), 77 deletions(-) diff --git a/packages/api/src/controllers/team.ts b/packages/api/src/controllers/team.ts index f562edf165..8bc90733f6 100644 --- a/packages/api/src/controllers/team.ts +++ b/packages/api/src/controllers/team.ts @@ -1,4 +1,6 @@ import { + DEFAULT_QUERY_LANGUAGES, + QueryLanguage, TagResourceType, TeamClickHouseSettingsUpdate, TeamQueryLanguageSettingsUpdate, @@ -28,8 +30,8 @@ export const LOCAL_APP_TEAM = { apiKey: uuidv4(), collectorAuthenticationEnforced: false, isMetricsSeriesTableEnabled: false, - defaultQueryLanguage: 'lucene' as 'sql' | 'lucene', - allowedQueryLanguages: ['lucene', 'sql'] as ('sql' | 'lucene')[], + defaultQueryLanguage: 'lucene' as QueryLanguage, + allowedQueryLanguages: [...DEFAULT_QUERY_LANGUAGES] as QueryLanguage[], toJSON() { return this; }, @@ -136,16 +138,45 @@ export async function updateTeamQueryLanguageSettings( teamId: ObjectId, settings: TeamQueryLanguageSettingsUpdate, ) { - const currentTeam = config.IS_LOCAL_APP_MODE - ? LOCAL_APP_TEAM - : await Team.findById(teamId); + if (config.IS_LOCAL_APP_MODE) { + const effectiveAllowed = + settings.allowedQueryLanguages ?? + LOCAL_APP_TEAM.allowedQueryLanguages ?? + DEFAULT_QUERY_LANGUAGES; + + if (effectiveAllowed.length === 0) { + throw new Api400Error('At least one query language must be enabled'); + } + + const effectiveDefault = + settings.defaultQueryLanguage ?? + LOCAL_APP_TEAM.defaultQueryLanguage ?? + 'lucene'; + + if (!effectiveAllowed.includes(effectiveDefault)) { + throw new Api400Error( + 'Default query language must be one of the allowed query languages', + ); + } + + if (settings.defaultQueryLanguage !== undefined) { + LOCAL_APP_TEAM.defaultQueryLanguage = settings.defaultQueryLanguage; + } + if (settings.allowedQueryLanguages !== undefined) { + LOCAL_APP_TEAM.allowedQueryLanguages = settings.allowedQueryLanguages; + } + return LOCAL_APP_TEAM; + } + const currentTeam = await Team.findById(teamId); if (!currentTeam) { throw new Error(`Team ${teamId} not found`); } - const effectiveAllowed = settings.allowedQueryLanguages ?? - currentTeam.allowedQueryLanguages ?? ['lucene', 'sql']; + const effectiveAllowed = + settings.allowedQueryLanguages ?? + currentTeam.allowedQueryLanguages ?? + DEFAULT_QUERY_LANGUAGES; if (effectiveAllowed.length === 0) { throw new Api400Error('At least one query language must be enabled'); @@ -162,52 +193,25 @@ export async function updateTeamQueryLanguageSettings( ); } - if (config.IS_LOCAL_APP_MODE) { - if (settings.defaultQueryLanguage !== undefined) { - LOCAL_APP_TEAM.defaultQueryLanguage = settings.defaultQueryLanguage; - } - if (settings.allowedQueryLanguages !== undefined) { - LOCAL_APP_TEAM.allowedQueryLanguages = settings.allowedQueryLanguages; - } - return LOCAL_APP_TEAM; - } - const update = buildSetUnsetUpdate(settings); - const updatedTeam = await Team.findByIdAndUpdate(teamId, update, { - new: true, - }); + const updatedTeam = await Team.findOneAndUpdate( + { + _id: teamId, + ...(settings.allowedQueryLanguages && !settings.defaultQueryLanguage + ? { + $or: [ + { defaultQueryLanguage: { $in: settings.allowedQueryLanguages } }, + { defaultQueryLanguage: { $exists: false } }, + ], + } + : {}), + }, + update, + { new: true }, + ); if (!updatedTeam) { - throw new Error(`Team ${teamId} not found`); - } - - const finalAllowed = updatedTeam.allowedQueryLanguages ?? ['lucene', 'sql']; - const finalDefault = updatedTeam.defaultQueryLanguage ?? 'lucene'; - - if (finalAllowed.length === 0) { - await Team.findByIdAndUpdate(teamId, { - $set: { - allowedQueryLanguages: currentTeam.allowedQueryLanguages ?? [ - 'lucene', - 'sql', - ], - defaultQueryLanguage: currentTeam.defaultQueryLanguage ?? 'lucene', - }, - }); - throw new Api400Error('At least one query language must be enabled'); - } - - if (!finalAllowed.includes(finalDefault)) { - await Team.findByIdAndUpdate(teamId, { - $set: { - allowedQueryLanguages: currentTeam.allowedQueryLanguages ?? [ - 'lucene', - 'sql', - ], - defaultQueryLanguage: currentTeam.defaultQueryLanguage ?? 'lucene', - }, - }); throw new Api400Error( 'Default query language must be one of the allowed query languages', ); diff --git a/packages/app/src/components/SearchInput/InputLanguageSwitch.tsx b/packages/app/src/components/SearchInput/InputLanguageSwitch.tsx index bfba4d3e37..f9afbe772b 100644 --- a/packages/app/src/components/SearchInput/InputLanguageSwitch.tsx +++ b/packages/app/src/components/SearchInput/InputLanguageSwitch.tsx @@ -1,23 +1,25 @@ +import { + DEFAULT_QUERY_LANGUAGES, + formatQueryLanguageLabel, + type QueryLanguage, +} from '@hyperdx/common-utils/dist/types'; import { Select } from '@mantine/core'; import { IconChevronDown } from '@tabler/icons-react'; -type Language = 'sql' | 'lucene'; - -const DATA: { value: Language; label: string }[] = [ - { value: 'sql', label: 'SQL' }, - { value: 'lucene', label: 'Lucene' }, -]; - -const DEFAULT_ALLOWED_LANGUAGES: Language[] = ['sql', 'lucene']; +const DATA: { value: QueryLanguage; label: string }[] = + DEFAULT_QUERY_LANGUAGES.map(lang => ({ + value: lang, + label: formatQueryLanguageLabel(lang), + })); export default function InputLanguageSwitch({ language, onLanguageChange, - allowedLanguages = DEFAULT_ALLOWED_LANGUAGES, + allowedLanguages = DEFAULT_QUERY_LANGUAGES, }: { - language: Language; - onLanguageChange: (language: Language) => void; - allowedLanguages?: Language[]; + language: QueryLanguage; + onLanguageChange: (language: QueryLanguage) => void; + allowedLanguages?: QueryLanguage[]; }) { const options = DATA.filter(d => allowedLanguages.includes(d.value)); diff --git a/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx b/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx index 644bc84ed1..6a4ce87524 100644 --- a/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx +++ b/packages/app/src/components/SearchInput/__tests__/SearchWhereInput.test.tsx @@ -6,6 +6,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import InputLanguageSwitch from '@/components/SearchInput/InputLanguageSwitch'; import SearchWhereInput, { getStoredLanguage, } from '@/components/SearchInput/SearchWhereInput'; @@ -119,6 +120,33 @@ describe('SearchWhereInput', () => { }), ).toBe('sql'); }); + + it('does not write auto-resolved team defaults to localStorage on reconciliation', () => { + window.localStorage.removeItem('hdx-search-where-language'); + const lang = getStoredLanguage({ + allowedQueryLanguages: ['lucene', 'sql'], + defaultQueryLanguage: 'sql', + }); + expect(lang).toBe('sql'); + expect( + window.localStorage.getItem('hdx-search-where-language'), + ).toBeNull(); + }); + }); + + describe('InputLanguageSwitch', () => { + it('disables language dropdown when only one language is allowed', () => { + const onLanguageChange = jest.fn(); + renderWithMantine( + , + ); + const select = screen.getByRole('combobox', { name: 'Query language' }); + expect(select).toBeDisabled(); + }); }); describe('Lucene Mode', () => { diff --git a/packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx b/packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx index 173705bee1..8a69641bbb 100644 --- a/packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx +++ b/packages/app/src/components/TeamSettings/QueryLanguageSettingsForm.tsx @@ -1,4 +1,9 @@ import { useState } from 'react'; +import { + DEFAULT_QUERY_LANGUAGES, + formatQueryLanguageLabel, + type QueryLanguage, +} from '@hyperdx/common-utils/dist/types'; import { Box, Button, @@ -20,16 +25,15 @@ export default function QueryLanguageSettingsForm() { const updateQueryLanguageSettings = api.useUpdateQueryLanguageSettings(); const [isEditing, setIsEditing] = useState(false); - const allowedLanguages: ('sql' | 'lucene')[] = me?.team - ?.allowedQueryLanguages ?? ['lucene', 'sql']; - const defaultLanguage: 'sql' | 'lucene' = + const allowedLanguages: QueryLanguage[] = + me?.team?.allowedQueryLanguages ?? DEFAULT_QUERY_LANGUAGES; + const defaultLanguage: QueryLanguage = me?.team?.defaultQueryLanguage ?? 'lucene'; const [selectedAllowed, setSelectedAllowed] = - useState<('sql' | 'lucene')[]>(allowedLanguages); - const [selectedDefault, setSelectedDefault] = useState<'sql' | 'lucene'>( - defaultLanguage, - ); + useState(allowedLanguages); + const [selectedDefault, setSelectedDefault] = + useState(defaultLanguage); const handleStartEdit = () => { setSelectedAllowed(allowedLanguages); @@ -37,12 +41,12 @@ export default function QueryLanguageSettingsForm() { setIsEditing(true); }; - const handleToggleLanguage = (lang: 'sql' | 'lucene', checked: boolean) => { - let newAllowed: ('sql' | 'lucene')[]; + const handleToggleLanguage = (lang: QueryLanguage, checked: boolean) => { + let newAllowed: QueryLanguage[]; if (checked) { newAllowed = [...selectedAllowed, lang]; } else { - newAllowed = selectedAllowed.filter(l => l !== lang); + newAllowed = selectedAllowed.filter((l: QueryLanguage) => l !== lang); } if (newAllowed.length === 0) { notifications.show({ @@ -150,9 +154,9 @@ export default function QueryLanguageSettingsForm() { setSelectedDefault(val); } }} - data={selectedAllowed.map(l => ({ + data={selectedAllowed.map((l: QueryLanguage) => ({ value: l, - label: l === 'sql' ? 'SQL' : 'Lucene', + label: formatQueryLanguageLabel(l), }))} /> @@ -184,15 +188,13 @@ export default function QueryLanguageSettingsForm() { Enabled:{' '} - {allowedLanguages - .map(l => (l === 'sql' ? 'SQL' : 'Lucene')) - .join(', ')} + {allowedLanguages.map(formatQueryLanguageLabel).join(', ')} Default:{' '} - {defaultLanguage === 'sql' ? 'SQL' : 'Lucene'} + {formatQueryLanguageLabel(defaultLanguage)}