Commit6a6a7e6

committed

Add name filter

1 parent9597345 commit6a6a7e6Copy full SHA for 6a6a7e6

File tree

+32

-23

lines changed

+32

-23

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,10 @@ describe("api.ts", () => {`
`118`	`118`	`it.each<[TypesGen.WorkspaceFilter\|undefined,string]>([`
`119`	`119`	`[undefined,"/api/v2/workspaces"],`
`120`	`120`
`121`		`-[{OrganizationID:"1",Owner:""},"/api/v2/workspaces?organization_id=1"],`
`122`		`-[{OrganizationID:"",Owner:"1"},"/api/v2/workspaces?owner=1"],`
	`121`	`+[{organization_id:"1",owner:""},"/api/v2/workspaces?organization_id=1"],`
	`122`	`+[{organization_id:"",owner:"1"},"/api/v2/workspaces?owner=1"],`
`123`	`123`
`124`		`-[{OrganizationID:"1",Owner:"me"},"/api/v2/workspaces?organization_id=1&owner=me"],`
	`124`	`+[{organization_id:"1",owner:"me"},"/api/v2/workspaces?organization_id=1&owner=me"],`
`125`	`125`	])(`getWorkspacesURL(%p) returns %p`,(filter,expected)=>{
`126`	`126`	`expect(getWorkspacesURL(filter)).toBe(expected)`
`127`	`127`	`})`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -116,11 +116,14 @@ export const getWorkspacesURL = (filter?: TypesGen.WorkspaceFilter): string => {`
`116`	`116`	`constbasePath="/api/v2/workspaces"`
`117`	`117`	`constsearchParams=newURLSearchParams()`
`118`	`118`
`119`		`-if(filter?.OrganizationID){`
`120`		`-searchParams.append("organization_id",filter.OrganizationID)`
	`119`	`+if(filter?.organization_id){`
	`120`	`+searchParams.append("organization_id",filter.organization_id)`
`121`	`121`	`}`
`122`		`-if(filter?.Owner){`
`123`		`-searchParams.append("owner",filter.Owner)`
	`122`	`+if(filter?.owner){`
	`123`	`+searchParams.append("owner",filter.owner)`
	`124`	`+}`
	`125`	`+if(filter?.name){`
	`126`	`+searchParams.append("name",filter.name)`
`124`	`127`	`}`
`125`	`128`
`126`	`129`	`constsearchString=searchParams.toString()`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -445,10 +445,9 @@ export interface WorkspaceBuildsRequest extends Pagination {`
`445`	`445`
`446`	`446`	`// From codersdk/workspaces.go:201:6`
`447`	`447`	`exportinterfaceWorkspaceFilter{`
`448`		`-readonlyOrganizationID:string`
`449`		`-readonlyOwner:string`
`450`		`-readonlyName:string`
`451`		`-readonlyDeleted:boolean`
	`448`	`+readonlyorganization_id?:string`
	`449`	`+readonlyowner?:string`
	`450`	`+readonlyname?:string`
`452`	`451`	`}`
`453`	`452`
`454`	`453`	`// From codersdk/workspaceresources.go:21:6`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,12 @@ describe("util > workspace", () => {`
`42`	`42`	`})`
`43`	`43`	`describe("workspaceQueryToFilter",()=>{`
`44`	`44`	`it.each<[string\|undefined,TypesGen.WorkspaceFilter]>([`
`45`		`-[undefined,{Owner:"",OrganizationID:""}],`
`46`		`-["",{Owner:"",OrganizationID:""}],`
`47`		`-["asdkfvjn",{Owner:"",OrganizationID:""}],`
`48`		`-["owner:me",{Owner:"me",OrganizationID:""}],`
`49`		`-["owner:me owner:me2",{Owner:"me",OrganizationID:""}],`
	`45`	`+[undefined,{}],`
	`46`	`+["",{}],`
	`47`	`+["asdkfvjn",{name:"asdkfvjn"}],`
	`48`	`+["owner:me",{owner:"me"}],`
	`49`	`+["owner:me owner:me2",{owner:"me"}],`
	`50`	`+["me/dev",{owner:"me",name:"dev"}],`
`50`	`51`	])(`query=%p, filter=%p`,(query,filter)=>{
`51`	`52`	`expect(workspaceQueryToFilter(query)).toEqual(filter)`
`52`	`53`	`})`

Lines changed: 13 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -196,11 +196,7 @@ export const isWorkspaceOn = (workspace: TypeGen.Workspace): boolean => {`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`exportconstworkspaceQueryToFilter=(query?:string):TypeGen.WorkspaceFilter=>{`
`199`		`-constdefaultFilter:TypeGen.WorkspaceFilter={`
`200`		`-Owner:"",`
`201`		`-OrganizationID:"",`
`202`		`-}`
`203`		`-`
	`199`	`+constdefaultFilter:TypeGen.WorkspaceFilter={}`
`204`	`200`	`constpreparedQuery=query?.replace(/+/g," ")`
`205`	`201`
`206`	`202`	`if(!preparedQuery){`
`@@ -212,10 +208,20 @@ export const workspaceQueryToFilter = (query?: string): TypeGen.WorkspaceFilter`
`212`	`208`	`const[key,val]=part.split(":")`
`213`	`209`	`if(key==="owner"){`
`214`	`210`	`return{`
`215`		`-Owner:val,`
`216`		`-OrganizationID:"",`
	`211`	`+owner:val,`
	`212`	`+}`
	`213`	`+}`
	`214`	`+`
	`215`	`+const[username,name]=part.split("/")`
	`216`	`+if(username&&name){`
	`217`	`+return{`
	`218`	`+owner:username,`
	`219`	`+name:name,`
`217`	`220`	`}`
`218`	`221`	`}`
	`222`	`+return{`
	`223`	`+name:part,`
	`224`	`+}`
`219`	`225`	`}`
`220`	`226`
`221`	`227`	`returndefaultFilter`

Comments

(0)