AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.
fix(platform): fix admin dashboard credit tool search, pagination, and modal feedback issues (#10644)
Nicholas Tindle6fce3a09eacf
diff --git a/autogpt_platform/frontend/package.json b/autogpt_platform/frontend/package.jsonindex 09fe0a5c12..633b9736b2 100644--- a/autogpt_platform/frontend/package.json+++ b/autogpt_platform/frontend/package.json@@ -8,7 +8,7 @@"start": "next start","start:standalone": "cd .next/standalone && node server.js","lint": "next lint && prettier --check .",- "format": "prettier --write .",+ "format": "next lint --fix; prettier --write .","type-check": "tsc --noEmit","test": "next build --turbo && playwright test","test-ui": "next build --turbo && playwright test --ui",diff --git a/autogpt_platform/frontend/src/app/(platform)/admin/spending/actions.ts b/autogpt_platform/frontend/src/app/(platform)/admin/spending/actions.tsindex ea4a194acd..f6d8ad40db 100644--- a/autogpt_platform/frontend/src/app/(platform)/admin/spending/actions.ts+++ b/autogpt_platform/frontend/src/app/(platform)/admin/spending/actions.ts@@ -14,12 +14,7 @@ export async function addDollars(formData: FormData) {comments: formData.get("comments") as string,};const api = new BackendApi();- const resp = await api.addUserCredits(- data.user_id,- data.amount,- data.comments,- );- console.log(resp);+ await api.addUserCredits(data.user_id, data.amount, data.comments);revalidatePath("/admin/spending");}diff --git a/autogpt_platform/frontend/src/app/(platform)/admin/spending/page.tsx b/autogpt_platform/frontend/src/app/(platform)/admin/spending/page.tsxindex ddb60f3f01..2b741102d1 100644--- a/autogpt_platform/frontend/src/app/(platform)/admin/spending/page.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/admin/spending/page.tsx@@ -29,6 +29,7 @@ function SpendingDashboard({</div><Suspense+ key={`${page}-${status}-${search}`}fallback={<div className="py-10 text-center">Loading submissions...</div>}diff --git a/autogpt_platform/frontend/src/components/admin/spending/add-money-button.tsx b/autogpt_platform/frontend/src/components/admin/spending/add-money-button.tsxindex ee84464df0..64b5860d27 100644--- a/autogpt_platform/frontend/src/components/admin/spending/add-money-button.tsx+++ b/autogpt_platform/frontend/src/components/admin/spending/add-money-button.tsx@@ -15,6 +15,7 @@ import { Textarea } from "@/components/ui/textarea";import { Input } from "@/components/ui/input";import { useRouter } from "next/navigation";import { addDollars } from "@/app/(platform)/admin/spending/actions";+import { useToast } from "@/components/molecules/Toast/use-toast";export function AdminAddMoneyButton({userId,@@ -30,18 +31,32 @@ export function AdminAddMoneyButton({defaultComments?: string;}) {const router = useRouter();+ const { toast } = useToast();const [isAddMoneyDialogOpen, setIsAddMoneyDialogOpen] = useState(false);+ const [isSubmitting, setIsSubmitting] = useState(false);const [dollarAmount, setDollarAmount] = useState(defaultAmount ? Math.abs(defaultAmount / 100).toFixed(2) : "1.00",);const handleApproveSubmit = async (formData: FormData) => {- setIsAddMoneyDialogOpen(false);+ setIsSubmitting(true);try {await addDollars(formData);+ setIsAddMoneyDialogOpen(false);+ toast({+ title: "Success",+ description: `Added $${dollarAmount} to ${userEmail}'s balance`,+ });router.refresh(); // Refresh the current route} catch (error) {console.error("Error adding dollars:", error);+ toast({+ title: "Error",+ description: "Failed to add dollars. Please try again.",+ variant: "destructive",+ });+ } finally {+ setIsSubmitting(false);}};@@ -122,10 +137,13 @@ export function AdminAddMoneyButton({type="button"variant="outline"onClick={() => setIsAddMoneyDialogOpen(false)}+ disabled={isSubmitting}>Cancel</Button>- <Button type="submit">Add Dollars</Button>+ <Button type="submit" disabled={isSubmitting}>+ {isSubmitting ? "Adding..." : "Add Dollars"}+ </Button></DialogFooter></form></DialogContent>diff --git a/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts b/autogpt_platform/frontend/src/lib/autogpt-server-api/client.tsindex a08e49af59..f3630c385e 100644--- a/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts+++ b/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts@@ -637,6 +637,7 @@ export default class BackendAPI {search?: string;page?: number;page_size?: number;+ transaction_filter?: string;}): Promise<UsersBalanceHistoryResponse> {return this._get("/credits/admin/users_history", params);}diff --git a/autogpt_platform/frontend/src/lib/autogpt-server-api/helpers.ts b/autogpt_platform/frontend/src/lib/autogpt-server-api/helpers.tsindex d3a48414d0..98acdd584e 100644--- a/autogpt_platform/frontend/src/lib/autogpt-server-api/helpers.ts+++ b/autogpt_platform/frontend/src/lib/autogpt-server-api/helpers.ts@@ -228,7 +228,13 @@ export async function makeAuthenticatedRequest(const payloadAsQuery = ["GET", "DELETE"].includes(method);const hasRequestBody = !payloadAsQuery && payload !== undefined;- const response = await fetch(url, {+ // Add query parameters for GET/DELETE requests+ let requestUrl = url;+ if (payloadAsQuery && payload) {+ requestUrl = buildUrlWithQuery(url, payload);+ }++ const response = await fetch(requestUrl, {method,headers: createRequestHeaders(token, hasRequestBody, contentType),body: hasRequestBodydiff --git a/autogpt_platform/frontend/src/lib/autogpt-server-api/proxy-action.ts b/autogpt_platform/frontend/src/lib/autogpt-server-api/proxy-action.tsindex ec0aeb149e..f8a98cba32 100644--- a/autogpt_platform/frontend/src/lib/autogpt-server-api/proxy-action.ts+++ b/autogpt_platform/frontend/src/lib/autogpt-server-api/proxy-action.ts@@ -12,7 +12,6 @@ export interface ProxyRequestOptions {method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";path: string;payload?: Record<string, any>;- baseUrl?: string;contentType?: string;}@@ -20,13 +19,13 @@ export async function proxyApiRequest({method,path,payload,- baseUrl = getAgptServerApiUrl(),contentType = "application/json",}: ProxyRequestOptions) {return await Sentry.withServerActionInstrumentation("proxyApiRequest",{},async () => {+ const baseUrl = getAgptServerApiUrl();const url = buildRequestUrl(baseUrl, path, method, payload);return makeAuthenticatedRequest(method, url, payload, contentType);},@@ -36,12 +35,12 @@ export async function proxyApiRequest({export async function proxyFileUpload(path: string,formData: FormData,- baseUrl = getAgptServerApiUrl(),): Promise<string> {return await Sentry.withServerActionInstrumentation("proxyFileUpload",{},async () => {+ const baseUrl = getAgptServerApiUrl();const url = baseUrl + path;return makeAuthenticatedFileUpload(url, formData);},