Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure processSearchFilters handles an undefined input. #14852

Merged
merged 4 commits into from
Oct 23, 2024
Merged

Make sure processSearchFilters handles an undefined input. #14852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca0dc03
Make sure processSearchFilters handles an undefined input.
samwho Oct 23, 2024
9ebd890
Handle empty arrays too.
samwho Oct 23, 2024
f2a844c
Fix test.
samwho Oct 23, 2024
f7b84ca
Fix some type skullduggery.
samwho Oct 23, 2024
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
11 changes: 5 additions & 6 deletions packages/shared-core/src/filters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,19 +455,18 @@ export function splitFiltersArray(filters: LegacyFilter[]) {
* Legacy support remains for the old **SearchFilter[]** format.
* These will be migrated to an appropriate **SearchFilters** object, if encountered
*/
export function buildQuery(filter: undefined): undefined
export function buildQuery(
filter: UISearchFilter | LegacyFilter[]
): SearchFilters
export function buildQuery(
filter?: UISearchFilter | LegacyFilter[]
): SearchFilters | undefined {
): SearchFilters {
if (!filter) {
return
return {}
}

if (Array.isArray(filter)) {
filter = processSearchFilters(filter)
if (!filter) {
return {}
}
}

const operator = logicalOperatorFromUI(
Expand Down
10 changes: 7 additions & 3 deletions packages/shared-core/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,16 @@ export function isSupportedUserSearch(query: SearchFilters) {
return false
}
}

return true
}

export const processSearchFilters = (
filterArray: LegacyFilter[]
): Required<UISearchFilter> => {
export function processSearchFilters(
filterArray?: LegacyFilter[]
): Required<UISearchFilter> | undefined {
if (!filterArray || filterArray.length === 0) {
return undefined
}
const { allOr, onEmptyFilter, filters } = splitFiltersArray(filterArray)
return {
logicalOperator: UILogicalOperator.ALL,
Expand Down
Loading