Skip to content
Open
Show file tree
Hide file tree
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
19 changes: 19 additions & 0 deletions frontend/common/utils/__tests__/featureFilterParams.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
buildApiFilterParams,
getFiltersFromParams,
hasActiveFilters,
normaliseFilters,
} from 'common/utils/featureFilterParams'
import { SortOrder } from 'common/types/requests'
import { TagStrategy } from 'common/types/responses'
Expand Down Expand Up @@ -187,6 +188,24 @@ describe('featureFilterParams', () => {
})
})

describe('normaliseFilters', () => {
it.each`
field | input | expected
${'search'} | ${' '} | ${null}
${'search'} | ${''} | ${null}
${'search'} | ${null} | ${null}
${'search'} | ${' hello '} | ${'hello'}
${'value_search'} | ${' '} | ${null}
${'value_search'} | ${' test value '} | ${'test value'}
`(
'normalises $field "$input" to $expected',
({ expected, field, input }) => {
const result = normaliseFilters({ [field]: input })
expect(result[field as keyof typeof result]).toBe(expected)
},
)
})

describe('hasActiveFilters', () => {
it('returns false for default filters', () => {
expect(hasActiveFilters(createDefaultFilters())).toBe(false)
Expand Down
14 changes: 14 additions & 0 deletions frontend/common/utils/featureFilterParams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,20 @@ function parsePageNumber(value: string | string[] | undefined): number {
return 1
}

/** Normalises filter updates by trimming string fields to prevent whitespace-only API requests. */
export function normaliseFilters(
filters: Partial<FilterState>,
): Partial<FilterState> {
const result = { ...filters }
if ('search' in result) {
result.search = result.search?.trim() || null
}
if ('value_search' in result) {
result.value_search = result.value_search?.trim() || null
}
return result
}

/** Check if any filters are currently active. */
export function hasActiveFilters(filters: FilterState): boolean {
return !!(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import {
hasActiveFilters,
buildUrlParams,
getFiltersFromParams,
normaliseFilters,
} from 'common/utils/featureFilterParams'
import { isEqual } from 'lodash'
import Utils from 'common/utils/utils'

/**
Expand Down Expand Up @@ -43,7 +45,12 @@ export function useFeatureFilters(history: History): {
}, [updateURLParams])

const handleFilterChange = (updates: Partial<FilterState>) => {
setFilters((prev) => ({ ...prev, ...updates }))
const normalised = normaliseFilters(updates)
setFilters((prev) => {
const next = { ...prev, ...normalised }
if (isEqual(prev, next)) return prev
return next
})
setPage(1)
}

Expand Down
Loading