refactor: clean up props

Parkreiner · Parkreiner · commit 1b934ab0f071 · 2023-10-05T19:05:40.000Z
diff --git a/site/src/pages/WorkspacesPage/WorkspacesButton.tsx b/site/src/pages/WorkspacesPage/WorkspacesButton.tsx
@@ -1,7 +1,6 @@
 import { type PropsWithChildren, type ReactNode, useState } from "react";
+import { useTheme } from "@emotion/react";
 import { Language } from "./WorkspacesPageView";
-
-import { UseQueryResult } from "@tanstack/react-query";
 import { type Template } from "api/typesGenerated";
 
 import { Link as RouterLink } from "react-router-dom";
@@ -21,7 +20,6 @@ import {
   PopoverContainer,
   PopoverLink,
 } from "components/PopoverContainer/PopoverContainer";
-import { useTheme } from "@emotion/react";
 
 const ICON_SIZE = 18;
 const COLUMN_GAP = 1.5;
@@ -113,25 +111,24 @@ function WorkspaceResultsRow({ template }: { template: Template }) {
 }
 
 type WorkspacesButtonProps = PropsWithChildren<{
-  templatesQuery: UseQueryResult<Template[]>;
+  isLoadingTemplates: boolean;
+  templates: readonly Template[];
 }>;
 
 export function WorkspacesButton({
   children,
-  templatesQuery,
+  isLoadingTemplates,
+  templates,
 }: WorkspacesButtonProps) {
   const theme = useTheme();
 
   // Dataset should always be small enough that client-side filtering should be
   // good enough. Can swap out down the line if it becomes an issue
   const [searchTerm, setSearchTerm] = useState("");
-  const processed = sortTemplatesByUsersDesc(
-    templatesQuery.data ?? [],
-    searchTerm,
-  );
+  const processed = sortTemplatesByUsersDesc(templates, searchTerm);
 
   let emptyState: ReactNode = undefined;
-  if (templatesQuery.data?.length === 0) {
+  if (templates.length === 0) {
     emptyState = (
       <EmptyState
         message="No templates yet"
@@ -175,7 +172,7 @@ export function WorkspacesButton({
           paddingY: 1,
         }}
       >
-        {status === "loading" ? (
+        {isLoadingTemplates ? (
           <Loader size={14} />
         ) : (
           <>
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
@@ -79,7 +79,10 @@ export const WorkspacesPageView: FC<
     <Margins>
       <PageHeader
         actions={
-          <WorkspacesButton templatesQuery={templatesQuery}>
+          <WorkspacesButton
+            templates={templatesQuery.data ?? []}
+            isLoadingTemplates={templatesQuery.isLoading}
+          >
             {Language.createWorkspace}
           </WorkspacesButton>
         }
