From 5e3053263b90647548a90d53ade21334b55754b0 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@coder.com>
Date: Wed, 29 Jun 2022 10:31:26 -0500
Subject: [PATCH 1/3] chore: Parameter listing cmd default adding scope column

---
 cli/parameterslist.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/parameterslist.go b/cli/parameterslist.go
index 495b48247ff31..64d250eb5ffdd 100644
--- a/cli/parameterslist.go
+++ b/cli/parameterslist.go
@@ -74,7 +74,7 @@ func parameterList() *cobra.Command {
 			return err
 		},
 	}
-	cmd.Flags().StringArrayVarP(&columns, "column", "c", []string{"name", "source_scheme", "destination_scheme"},
+	cmd.Flags().StringArrayVarP(&columns, "column", "c", []string{"name", "scope", "destination_scheme"},
 		"Specify a column to filter in the table.")
 	return cmd
 }

From aaa2a1567308a424acfd18a45a48f6a5d2f7b6d8 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@coder.com>
Date: Wed, 29 Jun 2022 11:26:27 -0500
Subject: [PATCH 2/3] fix: Allow spaces in searchs

---
 coderd/users_internal_test.go      | 9 +++++++++
 coderd/workspaces_internal_test.go | 8 ++++++++
 site/src/util/formUtils.ts         | 1 -
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/coderd/users_internal_test.go b/coderd/users_internal_test.go
index 729614191db4a..26e6d14bc0954 100644
--- a/coderd/users_internal_test.go
+++ b/coderd/users_internal_test.go
@@ -33,6 +33,15 @@ func TestSearchUsers(t *testing.T) {
 				RbacRole: []string{},
 			},
 		},
+		{
+			Name:  "UsernameWithSpaces",
+			Query: "   user-name    ",
+			Expected: database.GetUsersParams{
+				Search:   "user-name",
+				Status:   []database.UserStatus{},
+				RbacRole: []string{},
+			},
+		},
 		{
 			Name:  "Username+Param",
 			Query: "usEr-name stAtus:actiVe",
diff --git a/coderd/workspaces_internal_test.go b/coderd/workspaces_internal_test.go
index 8096c3af44707..f9617031f68bd 100644
--- a/coderd/workspaces_internal_test.go
+++ b/coderd/workspaces_internal_test.go
@@ -31,6 +31,14 @@ func TestSearchWorkspace(t *testing.T) {
 				Name:          "bar",
 			},
 		},
+		{
+			Name:  "Owner/NameWithSpaces",
+			Query: "     Foo/Bar     ",
+			Expected: database.GetWorkspacesParams{
+				OwnerUsername: "foo",
+				Name:          "bar",
+			},
+		},
 		{
 			Name:  "Name",
 			Query: "workspace-name",
diff --git a/site/src/util/formUtils.ts b/site/src/util/formUtils.ts
index 12d4939693d4d..8c3dca7ed7090 100644
--- a/site/src/util/formUtils.ts
+++ b/site/src/util/formUtils.ts
@@ -48,7 +48,6 @@ export const getFormHelpers =
 export const onChangeTrimmed =
   <T>(form: FormikContextType<T>) =>
   (event: ChangeEvent<HTMLInputElement>): void => {
-    event.target.value = event.target.value.trim()
     form.handleChange(event)
   }
 

From 6c2ac6bae16f3fc264dd189336625739009a8b4c Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@coder.com>
Date: Wed, 29 Jun 2022 11:36:57 -0500
Subject: [PATCH 3/3] Only affect the search bar

---
 .../components/SearchBarWithFilter/SearchBarWithFilter.tsx    | 4 ++--
 site/src/util/formUtils.ts                                    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/site/src/components/SearchBarWithFilter/SearchBarWithFilter.tsx b/site/src/components/SearchBarWithFilter/SearchBarWithFilter.tsx
index 816848249f331..95c4685c36527 100644
--- a/site/src/components/SearchBarWithFilter/SearchBarWithFilter.tsx
+++ b/site/src/components/SearchBarWithFilter/SearchBarWithFilter.tsx
@@ -9,7 +9,7 @@ import SearchIcon from "@material-ui/icons/Search"
 import { FormikErrors, useFormik } from "formik"
 import { useState } from "react"
 import { getValidationErrorMessage } from "../../api/errors"
-import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
+import { getFormHelpers } from "../../util/formUtils"
 import { CloseDropdown, OpenDropdown } from "../DropdownArrows/DropdownArrows"
 import { Stack } from "../Stack/Stack"
 
@@ -91,7 +91,7 @@ export const SearchBarWithFilter: React.FC<SearchBarWithFilterProps> = ({
           <TextField
             {...getFieldHelpers("query")}
             className={styles.textFieldRoot}
-            onChange={onChangeTrimmed(form)}
+            onChange={form.handleChange}
             fullWidth
             variant="outlined"
             InputProps={{
diff --git a/site/src/util/formUtils.ts b/site/src/util/formUtils.ts
index 8c3dca7ed7090..12d4939693d4d 100644
--- a/site/src/util/formUtils.ts
+++ b/site/src/util/formUtils.ts
@@ -48,6 +48,7 @@ export const getFormHelpers =
 export const onChangeTrimmed =
   <T>(form: FormikContextType<T>) =>
   (event: ChangeEvent<HTMLInputElement>): void => {
+    event.target.value = event.target.value.trim()
     form.handleChange(event)
   }