Move quota fetching to be used close to where it is used

BrunoQuaresma · BrunoQuaresma · commit 2cd9de1062e0 · 2023-11-09T19:00:26.000Z
diff --git a/site/src/pages/WorkspacePage/Workspace.tsx b/site/src/pages/WorkspacePage/Workspace.tsx
@@ -102,7 +102,6 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
   buildInfo,
   sshPrefix,
   template,
-  quotaBudget,
   handleBuildRetry,
   buildLogs,
   onLoadMoreBuilds,
@@ -185,7 +184,6 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
 
         <WorkspaceStats
           workspace={workspace}
-          quotaBudget={quotaBudget}
           handleUpdate={handleUpdate}
           canUpdateWorkspace={canUpdateWorkspace}
           maxDeadlineDecrease={scheduleProps.maxDeadlineDecrease}
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
@@ -9,7 +9,6 @@ import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { useOrganizationId } from "hooks";
 import { isAxiosError } from "axios";
 import { Margins } from "components/Margins/Margins";
-import { workspaceQuota } from "api/queries/workspaceQuota";
 import { useInfiniteQuery, useQuery } from "react-query";
 import { infiniteWorkspaceBuilds } from "api/queries/workspaceBuilds";
 import { templateByName } from "api/queries/templates";
@@ -57,19 +56,14 @@ export const WorkspacePage: FC = () => {
   });
   const permissions = permissionsQuery.data as WorkspacePermissions | undefined;
 
-  const quotaQuery = useQuery(workspaceQuota(username));
-
   const buildsQuery = useInfiniteQuery({
     ...infiniteWorkspaceBuilds(workspace?.id ?? ""),
     enabled: workspace !== undefined,
   });
 
   const pageError =
-    workspaceQuery.error ??
-    templateQuery.error ??
-    quotaQuery.error ??
-    permissionsQuery.error;
-  const isLoading = !workspace || !template || !permissions || !quotaQuery.data;
+    workspaceQuery.error ?? templateQuery.error ?? permissionsQuery.error;
+  const isLoading = !workspace || !template || !permissions;
 
   if (pageError) {
     return (
@@ -94,7 +88,6 @@ export const WorkspacePage: FC = () => {
         template={template}
         permissions={permissions}
         workspaceState={workspaceState}
-        quota={quotaQuery.data}
         workspaceSend={workspaceSend}
         builds={buildsQuery.data?.pages.flat()}
         buildsError={buildsQuery.error}
diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
@@ -48,7 +48,6 @@ interface WorkspaceReadyPageProps {
     "template" | "workspace" | "permissions"
   >;
   workspaceSend: (event: WorkspaceEvent) => void;
-  quota?: TypesGen.WorkspaceQuota;
   builds: TypesGen.WorkspaceBuild[] | undefined;
   buildsError: unknown;
   onLoadMoreBuilds: () => void;
@@ -62,7 +61,6 @@ export const WorkspaceReadyPage = ({
   permissions,
   workspaceState,
   workspaceSend,
-  quota,
   builds,
   buildsError,
   onLoadMoreBuilds,
@@ -212,7 +210,6 @@ export const WorkspaceReadyPage = ({
         buildInfo={buildInfo}
         sshPrefix={sshPrefix}
         template={template}
-        quotaBudget={quota?.budget}
         buildLogs={
           shouldDisplayBuildLogs && (
             <WorkspaceBuildLogsSection logs={buildLogs} />
diff --git a/site/src/pages/WorkspacePage/WorkspaceStats.tsx b/site/src/pages/WorkspacePage/WorkspaceStats.tsx
@@ -24,6 +24,8 @@ import {
   PopoverTrigger,
   usePopover,
 } from "components/Popover/Popover";
+import { workspaceQuota } from "api/queries/workspaceQuota";
+import { useQuery } from "react-query";
 
 const Language = {
   workspaceDetails: "Workspace Details",
@@ -37,15 +39,13 @@ export interface WorkspaceStatsProps {
   maxDeadlineIncrease: number;
   maxDeadlineDecrease: number;
   canUpdateWorkspace: boolean;
-  quotaBudget?: number;
   onDeadlinePlus: (hours: number) => void;
   onDeadlineMinus: (hours: number) => void;
   handleUpdate: () => void;
 }
 
 export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
   workspace,
-  quotaBudget,
   maxDeadlineDecrease,
   maxDeadlineIncrease,
   canUpdateWorkspace,
@@ -56,6 +56,8 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
   const displayTemplateName = getDisplayWorkspaceTemplateName(workspace);
   const deadlinePlusEnabled = maxDeadlineIncrease >= 1;
   const deadlineMinusEnabled = maxDeadlineDecrease >= 1;
+  const quotaQuery = useQuery(workspaceQuota(workspace.owner_name));
+  const quotaBudget = quotaQuery.data?.budget;
 
   const paperStyles = css`
     padding: 24px;
