opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-10-24 01:26:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Workspaces filtering (#1972)

Browse Source 
Co-authored-by: G r e y <grey@coder.com>
Co-authored-by: Kira Pilot <kira@coder.com>
This commit is contained in:
Garrett Delfosse
2022-06-03 17:20:28 +00:00
committed by GitHub
co-authored by G r e y Kira Pilot
parent ac6cb269db
commit 8b03e2b0e1
14 changed files with 377 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
site/src/api/api.test.ts
+3 -3
View File
@@ -118,10 +118,10 @@ describe("api.ts", () => {
it.each<[TypesGen.WorkspaceFilter | undefined, string]>([
[undefined, "/api/v2/workspaces"],
[{ OrganizationID: "1", Owner: "" }, "/api/v2/workspaces?organization_id=1"],
[{ OrganizationID: "", Owner: "1" }, "/api/v2/workspaces?owner=1"],
[{ organization_id: "1", owner: "" }, "/api/v2/workspaces?organization_id=1"],
[{ organization_id: "", owner: "1" }, "/api/v2/workspaces?owner=1"],
[{ OrganizationID: "1", Owner: "me" }, "/api/v2/workspaces?organization_id=1&owner=me"],
[{ organization_id: "1", owner: "me" }, "/api/v2/workspaces?organization_id=1&owner=me"],
])(`getWorkspacesURL(%p) returns %p`, (filter, expected) => {
expect(getWorkspacesURL(filter)).toBe(expected)
})
site/src/api/api.ts
+7 -4
View File
@@ -117,11 +117,14 @@ export const getWorkspacesURL = (filter?: TypesGen.WorkspaceFilter): string => {
const basePath = "/api/v2/workspaces"
const searchParams = new URLSearchParams()
if (filter?.OrganizationID) {
searchParams.append("organization_id", filter.OrganizationID)
if (filter?.organization_id) {
searchParams.append("organization_id", filter.organization_id)
}
if (filter?.Owner) {
searchParams.append("owner", filter.Owner)
if (filter?.owner) {
searchParams.append("owner", filter.owner)
}
if (filter?.name) {
searchParams.append("name", filter.name)
}
const searchString = searchParams.toString()
site/src/api/typesGenerated.ts
+3 -2
View File
@@ -443,8 +443,9 @@ export interface WorkspaceBuildsRequest extends Pagination {
// From codersdk/workspaces.go:200:6
export interface WorkspaceFilter {
readonly OrganizationID: string
readonly Owner: string
readonly organization_id?: string
readonly owner?: string
readonly name?: string
}
// From codersdk/workspaceresources.go:21:6