From b84874f3109049ec33dc32b497fc43920744550d Mon Sep 17 00:00:00 2001 From: Garrett Date: Tue, 7 Jun 2022 21:57:31 +0000 Subject: [PATCH 1/2] fix: bug where all workspaces filter defaulted to 'me' --- site/src/pages/WorkspacesPage/WorkspacesPage.tsx | 2 +- site/src/pages/WorkspacesPage/WorkspacesPageView.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx index d8fd2f329d84f..c5f47cc50a537 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx @@ -13,7 +13,7 @@ const WorkspacesPage: FC = () => { useEffect(() => { const filter = searchParams.get("filter") - const query = filter ? filter : workspaceFilterQuery.me + const query = filter !== null ? filter : workspaceFilterQuery.me send({ type: "SET_FILTER", diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx index 3d189179a48ff..14162b2d4c9af 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx @@ -35,7 +35,7 @@ import { Margins } from "../../components/Margins/Margins" import { PageHeader, PageHeaderTitle } from "../../components/PageHeader/PageHeader" import { Stack } from "../../components/Stack/Stack" import { TableLoader } from "../../components/TableLoader/TableLoader" -import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils" +import { getFormHelpers } from "../../util/formUtils" import { getDisplayStatus, workspaceFilterQuery } from "../../util/workspace" dayjs.extend(relativeTime) @@ -156,7 +156,7 @@ export const WorkspacesPageView: FC = ({ loading, works Date: Tue, 7 Jun 2022 22:04:06 +0000 Subject: [PATCH 2/2] Add back trim on form --- site/src/pages/WorkspacesPage/WorkspacesPageView.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx index 14162b2d4c9af..3d189179a48ff 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx @@ -35,7 +35,7 @@ import { Margins } from "../../components/Margins/Margins" import { PageHeader, PageHeaderTitle } from "../../components/PageHeader/PageHeader" import { Stack } from "../../components/Stack/Stack" import { TableLoader } from "../../components/TableLoader/TableLoader" -import { getFormHelpers } from "../../util/formUtils" +import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils" import { getDisplayStatus, workspaceFilterQuery } from "../../util/workspace" dayjs.extend(relativeTime) @@ -156,7 +156,7 @@ export const WorkspacesPageView: FC = ({ loading, works