From 5a335da9d89963dac1089bbe5d098016fecf5ffe Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Wed, 31 May 2023 16:28:36 +0000 Subject: [PATCH 1/3] refactor(site): Add default owner:me filter to workspaces --- site/src/pages/WorkspacesPage/filter/filter.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/pages/WorkspacesPage/filter/filter.tsx b/site/src/pages/WorkspacesPage/filter/filter.tsx index 4822e71cb6844..67d21721dab7e 100644 --- a/site/src/pages/WorkspacesPage/filter/filter.tsx +++ b/site/src/pages/WorkspacesPage/filter/filter.tsx @@ -50,7 +50,7 @@ export const useFilter = ({ onUpdate?: () => void }) => { const [searchParams, setSearchParams] = searchParamsResult - const query = searchParams.get("filter") ?? "" + const query = searchParams.get("filter") ?? "owner:me" const values = parseFilterQuery(query) const update = (values: string | FilterValues) => { From c2b21aa413e6706406bc2f943bc8d31432b83d3c Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Thu, 1 Jun 2023 13:59:52 +0000 Subject: [PATCH 2/3] Fix when showiing when it is empty --- site/src/pages/WorkspacesPage/WorkspacesPageView.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx index bdb97241e3383..fda50a448f681 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx @@ -145,7 +145,10 @@ export const WorkspacesPageView: FC< From c1d015b002247be571434c7a418c6fcd34ddd4ef Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Thu, 1 Jun 2023 14:01:02 +0000 Subject: [PATCH 3/3] Fix empty filter --- site/src/pages/WorkspacesPage/WorkspacesPageView.tsx | 2 +- site/src/pages/WorkspacesPage/filter/filter.tsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx index fda50a448f681..c2307b7725f55 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx @@ -147,7 +147,7 @@ export const WorkspacesPageView: FC< workspaces={workspaces} isUsingFilter={ filterProps.filter.query !== "" && - filterProps.filter.query !== "owner:me" + filterProps.filter.query !== workspaceFilterQuery.me } onUpdateWorkspace={onUpdateWorkspace} error={error} diff --git a/site/src/pages/WorkspacesPage/filter/filter.tsx b/site/src/pages/WorkspacesPage/filter/filter.tsx index 67d21721dab7e..47052e91806a6 100644 --- a/site/src/pages/WorkspacesPage/filter/filter.tsx +++ b/site/src/pages/WorkspacesPage/filter/filter.tsx @@ -35,6 +35,7 @@ import { BaseOption, } from "./options" import debounce from "just-debounce-it" +import { workspaceFilterQuery } from "utils/filters" export type FilterValues = { owner?: string // User["username"] @@ -50,7 +51,7 @@ export const useFilter = ({ onUpdate?: () => void }) => { const [searchParams, setSearchParams] = searchParamsResult - const query = searchParams.get("filter") ?? "owner:me" + const query = searchParams.get("filter") ?? workspaceFilterQuery.me const values = parseFilterQuery(query) const update = (values: string | FilterValues) => {