Commitcb92b79

committed

fix: update Filter logic to account for fallback filter

1 parentb512e18 commitcb92b79Copy full SHA for cb92b79

File tree

-5

lines changed

site/src
- components/Filter
  - Filter.tsx
- pages/AuditPage
  - AuditPage.test.tsx

-5

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,14 +57,13 @@ export const useFilter = ({`
`57`	`57`	`constupdate=(newValues:string\|FilterValues)=>{`
`58`	`58`	`constserialized=`
`59`	`59`	`typeofnewValues==="string" ?newValues :stringifyFilter(newValues);`
`60`		`-constnoUpdateNeeded=searchParams.get(useFilterParamsKey)===serialized;`
	`60`	`+constnoUpdateNeeded=query===serialized;`
`61`	`61`	`if(noUpdateNeeded){`
`62`	`62`	`return;`
`63`	`63`	`}`
`64`	`64`
`65`		`-constcopy=newURLSearchParams(searchParams);`
`66`		`-copy.set(useFilterParamsKey,serialized);`
`67`		`-onSearchParamsChange(copy);`
	`65`	`+searchParams.set(useFilterParamsKey,serialized);`
	`66`	`+onSearchParamsChange(searchParams);`
`68`	`67`	`onUpdate?.(serialized);`
`69`	`68`	`};`
`70`	`69`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import {`
`15`	`15`	`import{server}from"testHelpers/server";`
`16`	`16`	`import*asCreateDayStringfrom"utils/createDayString";`
`17`	`17`	`importAuditPagefrom"./AuditPage";`
	`18`	`+importtype{AuditLogsRequest}from"api/typesGenerated";`
`18`	`19`
`19`	`20`	`interfaceRenderPageOptions{`
`20`	`21`	`filter?:string;`
`@@ -106,7 +107,7 @@ describe("AuditPage", () => {`
`106`	`107`	`awaituserEvent.type(filterField,query);`
`107`	`108`
`108`	`109`	`awaitwaitFor(()=>`
`109`		`-expect(getAuditLogsSpy).toBeCalledWith({`
	`110`	`+expect(getAuditLogsSpy).toHaveBeenCalledWith<[AuditLogsRequest]>({`
`110`	`111`	`limit:DEFAULT_RECORDS_PER_PAGE,`
`111`	`112`	`offset:0,`
`112`	`113`	`q:query,`

Comments

(0)