Merge branch 'mes/filter-work-1' into mes/filter-work-2

Parkreiner · Parkreiner · commit 83788e785082 · 2024-09-06T23:17:05.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -1684,11 +1684,13 @@ class ApiMethods {
 	};
 
 	getWorkspaceQuota = async (
+		organizationName: string,
 		username: string,
 	): Promise<TypesGen.WorkspaceQuota> => {
 		const response = await this.axios.get(
-			`/api/v2/workspace-quota/${encodeURIComponent(username)}`,
+			`/api/v2/organizations/${encodeURIComponent(organizationName)}/members/${encodeURIComponent(username)}/workspace-quota`,
 		);
+
 		return response.data;
 	};
 
diff --git a/site/src/api/queries/workspaceQuota.ts b/site/src/api/queries/workspaceQuota.ts
@@ -1,14 +1,16 @@
 import { API } from "api/api";
 
-export const getWorkspaceQuotaQueryKey = (username: string) => [
-	username,
-	"workspaceQuota",
-];
+export const getWorkspaceQuotaQueryKey = (
+	organizationName: string,
+	username: string,
+) => {
+	return [organizationName, username, "workspaceQuota"];
+};
 
-export const workspaceQuota = (username: string) => {
+export const workspaceQuota = (organizationName: string, username: string) => {
 	return {
-		queryKey: getWorkspaceQuotaQueryKey(username),
-		queryFn: () => API.getWorkspaceQuota(username),
+		queryKey: getWorkspaceQuotaQueryKey(organizationName, username),
+		queryFn: () => API.getWorkspaceQuota(organizationName, username),
 	};
 };
 
diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx
@@ -3,6 +3,7 @@ import { expect, screen, userEvent, waitFor, within } from "@storybook/test";
 import { getWorkspaceQuotaQueryKey } from "api/queries/workspaceQuota";
 import { addHours, addMinutes } from "date-fns";
 import {
+	MockOrganization,
 	MockTemplate,
 	MockTemplateVersion,
 	MockUser,
@@ -266,7 +267,10 @@ export const WithQuota: Story = {
 	parameters: {
 		queries: [
 			{
-				key: getWorkspaceQuotaQueryKey(MockUser.username),
+				key: getWorkspaceQuotaQueryKey(
+					MockOrganization.name,
+					MockUser.username,
+				),
 				data: {
 					credits_consumed: 2,
 					budget: 40,
diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
