Commit67333b6

authored

feat: getWorkspaces filter site api (#1564)

1 parent0438430 commit67333b6Copy full SHA for 67333b6

File tree

+41

-10

lines changed

+41

-10

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ func (api api) workspaces(rw http.ResponseWriter, r http.Request) {`
`151`	`151`
`152`	`152`	`// Empty strings mean no filter`
`153`	`153`	`orgFilter:=r.URL.Query().Get("organization_id")`
`154`		`-ownerFilter:=r.URL.Query().Get("owner_id")`
	`154`	`+ownerFilter:=r.URL.Query().Get("owner")`
`155`	`155`
`156`	`156`	`filter:= database.GetWorkspacesWithFilterParams{Deleted:false}`
`157`	`157`	`iforgFilter!="" {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ func (f WorkspaceFilter) asRequestOption() requestOption {`
`194`	`194`	`q.Set("organization_id",f.OrganizationID.String())`
`195`	`195`	`}`
`196`	`196`	`iff.Owner!="" {`
`197`		`-q.Set("owner_id",f.Owner)`
	`197`	`+q.Set("owner",f.Owner)`
`198`	`198`	`}`
`199`	`199`	`r.URL.RawQuery=q.Encode()`
`200`	`200`	`}`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`importaxiosfrom"axios"`
`2`		`-import{getApiKey,login,logout}from"./api"`
	`2`	`+import{getApiKey,getWorkspacesURL,login,logout}from"./api"`
`3`	`3`	`import*asTypesGenfrom"./typesGenerated"`
`4`	`4`
`5`	`5`	`describe("api.ts",()=>{`
`@@ -113,4 +113,17 @@ describe("api.ts", () => {`
`113`	`113`	`}`
`114`	`114`	`})`
`115`	`115`	`})`
	`116`	`+`
	`117`	`+describe("getWorkspacesURL",()=>{`
	`118`	`+it.each<[TypesGen.WorkspaceFilter\|undefined,string]>([`
	`119`	`+[undefined,"/api/v2/workspaces"],`
	`120`	`+`
	`121`	`+[{OrganizationID:"1",Owner:""},"/api/v2/workspaces?organization_id=1"],`
	`122`	`+[{OrganizationID:"",Owner:"1"},"/api/v2/workspaces?owner=1"],`
	`123`	`+`
	`124`	`+[{OrganizationID:"1",Owner:"me"},"/api/v2/workspaces?organization_id=1&owner=me"],`
	`125`	+])(`getWorkspacesURL(%p) returns %p`,(filter,expected)=>{
	`126`	`+expect(getWorkspacesURL(filter)).toBe(expected)`
	`127`	`+})`
	`128`	`+})`
`116`	`129`	`})`

Lines changed: 19 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -120,10 +120,25 @@ export const getWorkspace = async (workspaceId: string): Promise<TypesGen.Worksp`
`120`	`120`	`returnresponse.data`
`121`	`121`	`}`
`122`	`122`
`123`		`-// TODO:@emyrk add query params as arguments. Supports 'organization_id' and 'owner'`
`124`		`-// 'owner' can be a username, user_id, or 'me'`
`125`		`-exportconstgetWorkspaces=async():Promise<TypesGen.Workspace[]>=>{`
`126`		-constresponse=awaitaxios.get<TypesGen.Workspace[]>(`/api/v2/workspaces`)
	`123`	`+exportconstgetWorkspacesURL=(filter?:TypesGen.WorkspaceFilter):string=>{`
	`124`	`+constbasePath="/api/v2/workspaces"`
	`125`	`+constsearchParams=newURLSearchParams()`
	`126`	`+`
	`127`	`+if(filter?.OrganizationID){`
	`128`	`+searchParams.append("organization_id",filter.OrganizationID)`
	`129`	`+}`
	`130`	`+if(filter?.Owner){`
	`131`	`+searchParams.append("owner",filter.Owner)`
	`132`	`+}`
	`133`	`+`
	`134`	`+constsearchString=searchParams.toString()`
	`135`	`+`
	`136`	+returnsearchString ?`${basePath}?${searchString}` :basePath
	`137`	`+}`
	`138`	`+`
	`139`	`+exportconstgetWorkspaces=async(filter?:TypesGen.WorkspaceFilter):Promise<TypesGen.Workspace[]>=>{`
	`140`	`+consturl=getWorkspacesURL(filter)`
	`141`	`+constresponse=awaitaxios.get<TypesGen.Workspace[]>(url)`
`127`	`142`	`returnresponse.data`
`128`	`143`	`}`
`129`	`144`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,6 @@ export const handlers = [`
`36`	`36`	`rest.post("/api/v2/users/me/workspaces",async(req,res,ctx)=>{`
`37`	`37`	`returnres(ctx.status(200),ctx.json(M.MockWorkspace))`
`38`	`38`	`}),`
`39`		`-rest.get("/api/v2/workspaces",async(req,res,ctx)=>{`
`40`		`-returnres(ctx.status(200),ctx.json([M.MockWorkspace]))`
`41`		`-}),`
`42`	`39`	`rest.get("/api/v2/users/me/organizations",(req,res,ctx)=>{`
`43`	`40`	`returnres(ctx.status(200),ctx.json([M.MockOrganization]))`
`44`	`41`	`}),`
`@@ -79,6 +76,12 @@ export const handlers = [`
`79`	`76`	`}),`
`80`	`77`
`81`	`78`	`// workspaces`
	`79`	`+`
	`80`	`+// REMARK: This endpoint works with query parameters, but they won't be`
	`81`	`+// reflected in the return.`
	`82`	`+rest.get("/api/v2/workspaces",async(req,res,ctx)=>{`
	`83`	`+returnres(ctx.status(200),ctx.json([M.MockWorkspace]))`
	`84`	`+}),`
`82`	`85`	`rest.get("/api/v2/organizations/:organizationId/workspaces/:userName/:workspaceName",(req,res,ctx)=>{`
`83`	`86`	`if(req.params.workspaceName!==M.MockWorkspace.name){`
`84`	`87`	`returnres(`

Comments

(0)