Add name filter

f0ssel · f0ssel · commit 5dbf5b4bb5d5 · 2022-06-02T21:12:25.000Z
diff --git a/site/src/api/api.test.ts b/site/src/api/api.test.ts
@@ -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)
     })
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -116,11 +116,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()
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -443,10 +443,9 @@ export interface WorkspaceBuildsRequest extends Pagination {
 
 // From codersdk/workspaces.go:201:6
 export interface WorkspaceFilter {
-  readonly OrganizationID: string
-  readonly Owner: string
-  readonly Name: string
-  readonly Deleted: boolean
+  readonly organization_id?: string
+  readonly owner?: string
+  readonly name?: string
 }
 
 // From codersdk/workspaceresources.go:21:6
diff --git a/site/src/util/workspace.test.ts b/site/src/util/workspace.test.ts
@@ -65,11 +65,12 @@ describe("util > workspace", () => {
     })
   describe("workspaceQueryToFilter", () => {
     it.each<[string | undefined, TypesGen.WorkspaceFilter]>([
-      [undefined, { Owner: "", OrganizationID: "" }],
-      ["", { Owner: "", OrganizationID: "" }],
-      ["asdkfvjn", { Owner: "", OrganizationID: "" }],
-      ["owner:me", { Owner: "me", OrganizationID: "" }],
-      ["owner:me owner:me2", { Owner: "me", OrganizationID: "" }],
+      [undefined, {}],
+      ["", {}],
+      ["asdkfvjn", { name: "asdkfvjn" }],
+      ["owner:me", { owner: "me" }],
+      ["owner:me owner:me2", { owner: "me" }],
+      ["me/dev", { owner: "me", name: "dev" }],
     ])(`query=%p, filter=%p`, (query, filter) => {
       expect(workspaceQueryToFilter(query)).toEqual(filter)
     })
diff --git a/site/src/util/workspace.ts b/site/src/util/workspace.ts
@@ -199,6 +199,7 @@ export const isWorkspaceOn = (workspace: TypesGen.Workspace): boolean => {
   return transition === "start" && status === "succeeded"
 }
 
+<<<<<<< HEAD
 
 export const defaultWorkspaceExtension = (__startDate?: dayjs.Dayjs): TypesGen.PutExtendWorkspaceRequest => {
   const now = __startDate ? dayjs(__startDate) : dayjs()
@@ -209,12 +210,8 @@ export const defaultWorkspaceExtension = (__startDate?: dayjs.Dayjs): TypesGen.P
   }
 }
 
-export const workspaceQueryToFilter = (query?: string): WorkspaceFilter => {
-  const defaultFilter: WorkspaceFilter = {
-    Owner: "",
-    OrganizationID: "",
-  }
-
+export const workspaceQueryToFilter = (query?: string): TypesGen.WorkspaceFilter => {
+  const defaultFilter: TypesGen.WorkspaceFilter = {}
   const preparedQuery = query?.replace(/  +/g, " ")
 
   if (!preparedQuery) {
@@ -226,10 +223,20 @@ export const workspaceQueryToFilter = (query?: string): WorkspaceFilter => {
       const [key, val] = part.split(":")
       if (key === "owner") {
         return {
-          Owner: val,
-          OrganizationID: "",
+          owner: val,
+        }
+      }
+
+      const [username, name] = part.split("/")
+      if (username && name) {
+        return {
+          owner: username,
+          name: name,
         }
       }
+      return {
+        name: part,
+      }
     }
 
     return defaultFilter
