Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions packages/ui/src/utils/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -474,22 +474,23 @@ export function useSearch(
}
orGroups[field].push(val)
} else {
parts.push(`${field} = ${val === 'true' || val === 'false' ? val : `"${val}"`}`)
parts.push(`${field} = ${enquoteNonBools(val)}`)
}
}
}

for (const [field, values] of Object.entries(orGroups)) {
if (values.length === 1) {
parts.push(`${field} = "${values[0]}"`)
const val = values[0]
parts.push(`${field} = ${enquoteNonBools(val)}`)
} else {
const quoted = values.map((v) => `"${v}"`).join(', ')
const quoted = values.map(enquoteNonBools).join(', ')
parts.push(`${field} IN [${quoted}]`)
}
}

for (const [field, values] of Object.entries(negativeByType)) {
const quoted = values.map((v) => `"${v}"`).join(', ')
const quoted = values.map(enquoteNonBools).join(', ')
parts.push(`${field} NOT IN [${quoted}]`)
}

Expand All @@ -503,11 +504,11 @@ export function useSearch(
for (const envGroup of getEnvironmentFilterGroups(client, server)) {
if (envGroup.length === 1) {
const [field, val] = envGroup[0].split(':')
parts.push(`${field} = "${val}"`)
parts.push(`${field} = ${enquoteNonBools(val)}`)
} else if (envGroup.length > 1) {
const conditions = envGroup.map((f) => {
const [field, val] = f.split(':')
return `${field} = "${val}"`
return `${field} = ${enquoteNonBools(val)}`
})
parts.push(`(${conditions.join(' OR ')})`)
}
Expand All @@ -516,9 +517,9 @@ export function useSearch(
// Project types
const mappedProjectTypes = projectTypes.value.map(mapProjectTypeToSearch)
if (mappedProjectTypes.length === 1) {
parts.push(`project_types = "${mappedProjectTypes[0]}"`)
parts.push(`project_types = ${enquoteNonBools(mappedProjectTypes[0])}`)
} else if (mappedProjectTypes.length > 1) {
const quoted = mappedProjectTypes.map((v) => `"${v}"`).join(', ')
const quoted = mappedProjectTypes.map(enquoteNonBools).join(', ')
parts.push(`project_types IN [${quoted}]`)
}

Expand Down Expand Up @@ -781,6 +782,13 @@ function getEnvironmentFilterGroups(client: boolean, server: boolean): string[][
return groups
}

function enquoteNonBools(value: string): string {
if (value === 'true' || value === 'false') {
return value
}
return `"${value}"`
}

function getOptionValue(option: FilterOption, negative?: boolean): string {
let value = option.method === 'or' || option.method === 'and' ? option.value : option.id
if (negative === true) {
Expand Down
Loading