Regreats and improvements

coder · BrunoQuaresma · May 30, 2023 · May 19, 2023 · May 23, 2023 · May 23, 2023
commit 1341444cadbe86a484b62ec4bf3b6522959f42e7
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
@@ -6,16 +6,28 @@ import { workspaceFilterQuery } from "utils/filters"
 import { pageTitle } from "utils/page"
 import { useWorkspacesData, useWorkspaceUpdate } from "./data"
 import { WorkspacesPageView } from "./WorkspacesPageView"
+import { useQuery } from "@tanstack/react-query"
+import { getTemplates, getUsers } from "api/api"
+import { useOrganizationId } from "hooks"
 
 const WorkspacesPage: FC = () => {
   const filter = useFilter(workspaceFilterQuery.me)
   const pagination = usePagination()
+  const orgId = useOrganizationId()
 
   const { data, error, queryKey } = useWorkspacesData({
     ...pagination,
     ...filter,
   })
   const updateWorkspace = useWorkspaceUpdate(queryKey)
+  const { data: users } = useQuery({
+    queryKey: ["users"],
+    queryFn: () => getUsers({ limit: 100 }).then((res) => res.users),
+  })
+  const { data: templates } = useQuery({
+    queryKey: ["templates"],
+    queryFn: () => getTemplates(orgId),
+  })
 
   return (
     <>
@@ -26,15 +38,21 @@ const WorkspacesPage: FC = () => {
       <WorkspacesPageView
         workspaces={data?.workspaces}
         error={error}
-        filterQuery={filter.query}
-        onFilterQueryChange={filter.setFilter}
         count={data?.count}
         page={pagination.page}
         limit={pagination.limit}
         onPageChange={pagination.goToPage}
         onUpdateWorkspace={(workspace) => {
           updateWorkspace.mutate(workspace)
         }}
+        filterProps={{
+          query: filter.query,
+          onQueryChange: filter.setFilter,
+          onLoadTemplates: () => {},
+          onLoadUsers: () => {},
+          users,
+          templates,
+        }}
       />
     </>
   )

diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.stories.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.stories.tsx
@@ -20,6 +20,7 @@ import {
   WorkspacesPageViewProps,
 } from "./WorkspacesPageView"
 import { DashboardProviderContext } from "components/Dashboard/DashboardProvider"
+import { action } from "@storybook/addon-actions"
 
 const createWorkspace = (
   status: WorkspaceStatus,
@@ -69,12 +70,24 @@ const MockedAppearance = {
   save: () => null,
 }
 
+const defaultFilterProps = {
+  query: workspaceFilterQuery.me,
+  templates: undefined,
+  users: undefined,
+  onLoadTemplates: action("onLoadTemplates"),
+  onLoadUsers: action("onLoadUsers"),
+  onQueryChange: action("onQueryChange"),
+}
+
 export default {
   title: "pages/WorkspacesPageView",
   component: WorkspacesPageView,
   args: {
     limit: DEFAULT_RECORDS_PER_PAGE,
   },
+  parameters: {
+    filterProps: defaultFilterProps,
+  },
 } as ComponentMeta<typeof WorkspacesPageView>
 
 const Template: Story<WorkspacesPageViewProps> = (args) => (
@@ -99,13 +112,15 @@ AllStates.args = {
 export const OwnerHasNoWorkspaces = Template.bind({})
 OwnerHasNoWorkspaces.args = {
   workspaces: [],
-  filterQuery: workspaceFilterQuery.me,
   count: 0,
 }
 
 export const NoSearchResults = Template.bind({})
 NoSearchResults.args = {
   workspaces: [],
-  filterQuery: "searchtearmwithnoresults",
+  filterProps: {
+    ...defaultFilterProps,
+    query: "searchwithnoresults",
+  },
   count: 0,
 }