From baa36182c0466a41ec8f48c3e72d0f2b3be783e0 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 29 Jun 2022 11:59:38 -0500 Subject: [PATCH] fix: Allow spaces in searches (#2723) --- coderd/users_internal_test.go | 9 +++++++++ coderd/workspaces_internal_test.go | 8 ++++++++ .../SearchBarWithFilter/SearchBarWithFilter.tsx | 4 ++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/coderd/users_internal_test.go b/coderd/users_internal_test.go index 729614191d..26e6d14bc0 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 8096c3af44..f9617031f6 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/components/SearchBarWithFilter/SearchBarWithFilter.tsx b/site/src/components/SearchBarWithFilter/SearchBarWithFilter.tsx index 816848249f..95c4685c36 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 = ({