Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Improve errors and remove parser to get accurate toasts #2115

Merged
merged 10 commits into from
Sep 19, 2024
Merged

fix: Improve errors and remove parser to get accurate toasts #2115

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b8cfe2d
remove trpcError parser
perkinsjr Sep 19, 2024
f184be8
Fix root key to actually error
perkinsjr Sep 19, 2024
c7a8352
[autofix.ci] apply automated fixes
autofix-ci[bot] Sep 19, 2024
254c655
Merge branch 'main' into trpc-error-fix
perkinsjr Sep 19, 2024
2f28747
Update apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]…
perkinsjr Sep 19, 2024
f20a0f5
Update apps/dashboard/app/(app)/settings/root-keys/[keyId]/update-roo…
perkinsjr Sep 19, 2024
baff8bd
Update update-key-name.tsx
perkinsjr Sep 19, 2024
979b723
[autofix.ci] apply automated fixes
autofix-ci[bot] Sep 19, 2024
77fe533
Update update-root-key-name.tsx
perkinsjr Sep 19, 2024
c7a8c21
[autofix.ci] apply automated fixes
autofix-ci[bot] Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/role-toggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import { Checkbox } from "@/components/ui/checkbox";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { parseTrpcError } from "@/lib/utils";
import { Loader2 } from "lucide-react";
import { useRouter } from "next/navigation";
import { useState } from "react";
Expand Down Expand Up @@ -33,10 +32,9 @@ export const RoleToggle: React.FC<Props> = ({ roleId, keyId, checked }) => {
},
});
},
onError: (err) => {
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
},
onSettled: () => {
router.refresh();
Expand All @@ -58,10 +56,9 @@ export const RoleToggle: React.FC<Props> = ({ roleId, keyId, checked }) => {
},
});
},
onError: (err) => {
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
},
onSettled: () => {
router.refresh();
Expand Down
4 changes: 1 addition & 3 deletions apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/settings/delete-key.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import {
DialogTitle,
} from "@/components/ui/dialog";
import { trpc } from "@/lib/trpc/client";
import { parseTrpcError } from "@/lib/utils";
import { useRouter } from "next/navigation";

type Props = {
Expand All @@ -39,8 +38,7 @@ export const DeleteKey: React.FC<Props> = ({ apiKey, keyAuthId }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
},
});

Expand Down
4 changes: 1 addition & 3 deletions ...dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/settings/update-key-enabled.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { Form, FormControl, FormField, FormItem, FormLabel } from "@/components/
import { Switch } from "@/components/ui/switch";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { parseTrpcError } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
Expand Down Expand Up @@ -52,8 +51,7 @@ export const UpdateKeyEnabled: React.FC<Props> = ({ apiKey }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
perkinsjr marked this conversation as resolved.
Show resolved Hide resolved
},
});

Expand Down
5 changes: 2 additions & 3 deletions ...hboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/settings/update-key-expiration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { Input } from "@/components/ui/input";
import { Switch } from "@/components/ui/switch";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { cn, parseTrpcError } from "@/lib/utils";
import { cn } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { format } from "date-fns";

Expand Down Expand Up @@ -74,8 +74,7 @@ export const UpdateKeyExpiration: React.FC<Props> = ({ apiKey }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
},
});

Expand Down
4 changes: 1 addition & 3 deletions ...ashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/settings/update-key-metadata.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { Label } from "@/components/ui/label";
import { Textarea } from "@/components/ui/textarea";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { parseTrpcError } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
Expand Down Expand Up @@ -54,8 +53,7 @@ export const UpdateKeyMetadata: React.FC<Props> = ({ apiKey }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
},
});

Expand Down
5 changes: 2 additions & 3 deletions apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/settings/update-key-name.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { cn, parseTrpcError } from "@/lib/utils";
import { cn } from "@/lib/utils";
perkinsjr marked this conversation as resolved.
Show resolved Hide resolved
import { zodResolver } from "@hookform/resolvers/zod";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
Expand Down Expand Up @@ -56,8 +56,7 @@ export const UpdateKeyName: React.FC<Props> = ({ apiKey }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
},
});

Expand Down
5 changes: 2 additions & 3 deletions ...ashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/settings/update-key-owner-id.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { cn, parseTrpcError } from "@/lib/utils";
import { cn } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
Expand Down Expand Up @@ -57,8 +57,7 @@ export const UpdateKeyOwnerId: React.FC<Props> = ({ apiKey }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
},
});

Expand Down
5 changes: 2 additions & 3 deletions ...shboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/settings/update-key-ratelimit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { Label } from "@/components/ui/label";
import { Switch } from "@/components/ui/switch";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { cn, parseTrpcError } from "@/lib/utils";
import { cn } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import type { Key } from "@unkey/db";
import { useRouter } from "next/navigation";
Expand Down Expand Up @@ -90,8 +90,7 @@ export const UpdateKeyRatelimit: React.FC<Props> = ({ apiKey }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
},
});
async function onSubmit(values: z.infer<typeof formSchema>) {
Expand Down
9 changes: 5 additions & 4 deletions ...shboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/settings/update-key-remaining.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
import { Switch } from "@/components/ui/switch";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { cn, parseTrpcError } from "@/lib/utils";
import { cn } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
Expand Down Expand Up @@ -95,14 +95,15 @@ export const UpdateKeyRemaining: React.FC<Props> = ({ apiKey }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
},
});

async function onSubmit(values: z.infer<typeof formSchema>) {
if (values.refill?.interval !== "none" && !values.refill?.amount) {
form.setError("refill.amount", { message: "Please enter the number of uses per interval" });
form.setError("refill.amount", {
message: "Please enter the number of uses per interval",
});
return;
}
if (values.refill.interval !== "none" && values.remaining === undefined) {
Expand Down
4 changes: 1 addition & 3 deletions apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/new/client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import { Switch } from "@/components/ui/switch";
import { Textarea } from "@/components/ui/textarea";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { parseTrpcError } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { AlertCircle } from "lucide-react";
import Link from "next/link";
Expand Down Expand Up @@ -176,8 +175,7 @@ export const CreateKey: React.FC<Props> = ({ apiId, keyAuthId }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
perkinsjr marked this conversation as resolved.
Show resolved Hide resolved
},
});

Expand Down
5 changes: 2 additions & 3 deletions apps/dashboard/app/(app)/apis/[apiId]/settings/delete-api.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
import { z } from "zod";

import { cn, parseTrpcError } from "@/lib/utils";
import { cn } from "@/lib/utils";
import { revalidate } from "./actions";

type Props = {
Expand Down Expand Up @@ -74,8 +74,7 @@ export const DeleteApi: React.FC<Props> = ({ api, keys }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
perkinsjr marked this conversation as resolved.
Show resolved Hide resolved
},
});

Expand Down
10 changes: 5 additions & 5 deletions apps/dashboard/app/(app)/apis/[apiId]/settings/delete-protection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
import { z } from "zod";

import { parseTrpcError } from "@/lib/utils";
import { revalidate } from "./actions";

type Props = {
Expand Down Expand Up @@ -68,15 +66,17 @@ export const DeleteProtection: React.FC<Props> = ({ api }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
},
});

const isValid = form.watch("name") === api.name;

async function onSubmit(_: z.infer<typeof formSchema>) {
updateDeleteProtection.mutate({ apiId: api.id, enabled: !api.deleteProtection });
updateDeleteProtection.mutate({
apiId: api.id,
enabled: !api.deleteProtection,
});
}

if (api.deleteProtection) {
Expand Down
4 changes: 1 addition & 3 deletions apps/dashboard/app/(app)/apis/[apiId]/settings/update-api-name.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { FormField } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { parseTrpcError } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
Expand Down Expand Up @@ -50,8 +49,7 @@ export const UpdateApiName: React.FC<Props> = ({ api }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
},
});
async function onSubmit(values: z.infer<typeof formSchema>) {
Expand Down
5 changes: 2 additions & 3 deletions apps/dashboard/app/(app)/apis/[apiId]/settings/update-ip-whitelist.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { FormField } from "@/components/ui/form";
import { Textarea } from "@/components/ui/textarea";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { cn, parseTrpcError } from "@/lib/utils";
import { cn } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import type { Workspace } from "@unkey/db";
import Link from "next/link";
Expand Down Expand Up @@ -60,8 +60,7 @@ export const UpdateIpWhitelist: React.FC<Props> = ({ api, workspace }) => {
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
toast.error(err.message);
perkinsjr marked this conversation as resolved.
Show resolved Hide resolved
},
});

Expand Down
6 changes: 2 additions & 4 deletions apps/dashboard/app/(app)/apis/create-api-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
import { Input } from "@/components/ui/input";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { parseTrpcError } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { Plus } from "lucide-react";
import { useRouter } from "next/navigation";
Expand All @@ -38,9 +37,8 @@ export const CreateApiButton = ({ ...rest }: React.ButtonHTMLAttributes<HTMLButt
router.push(`/apis/${res.id}`);
},
onError(err) {
console.error(err.message);
const message = parseTrpcError(err);
toast.error(message);
console.error(err);
toast.error(err.message);
perkinsjr marked this conversation as resolved.
Show resolved Hide resolved
},
});
async function onSubmit(values: z.infer<typeof formSchema>) {
Expand Down
6 changes: 0 additions & 6 deletions apps/dashboard/app/(app)/authorization/permissions/[permissionId]/client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { Input } from "@/components/ui/input";
import { Textarea } from "@/components/ui/textarea";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { parseTrpcError } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import type { Permission } from "@unkey/db";
import { useRouter } from "next/navigation";
Expand Down Expand Up @@ -50,11 +49,6 @@ export const Client: React.FC<Props> = ({ permission }) => {
toast.success("Permission updated");
router.refresh();
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
},
});

async function onSubmit(values: z.infer<typeof formSchema>) {
Expand Down
6 changes: 0 additions & 6 deletions apps/dashboard/app/(app)/authorization/permissions/[permissionId]/delete-permission.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
import { Input } from "@/components/ui/input";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { parseTrpcError } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { DialogTrigger } from "@radix-ui/react-dialog";
import { useRouter } from "next/navigation";
Expand Down Expand Up @@ -60,11 +59,6 @@ export const DeletePermission: React.FC<Props> = ({ trigger, permission }) => {
revalidate("/authorization/permissions");
router.push("/authorization/permissions");
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
},
});

async function onSubmit() {
Expand Down
6 changes: 0 additions & 6 deletions apps/dashboard/app/(app)/authorization/permissions/create-new-permission.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { Input } from "@/components/ui/input";
import { Textarea } from "@/components/ui/textarea";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { parseTrpcError } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { DialogTrigger } from "@radix-ui/react-dialog";
import { useRouter } from "next/navigation";
Expand Down Expand Up @@ -68,11 +67,6 @@ export const CreateNewPermission: React.FC<Props> = ({ trigger }) => {
});
setOpen(false);
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
},
});

async function onSubmit(values: z.infer<typeof formSchema>) {
Expand Down
6 changes: 0 additions & 6 deletions apps/dashboard/app/(app)/authorization/roles/[roleId]/delete-role.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
import { Input } from "@/components/ui/input";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { parseTrpcError } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { DialogTrigger } from "@radix-ui/react-dialog";
import { useRouter } from "next/navigation";
Expand Down Expand Up @@ -61,11 +60,6 @@ export const DeleteRole: React.FC<Props> = ({ trigger, role }) => {
toast.success("Role deleted successfully");
router.push("/authorization/roles");
},
onError(err) {
console.error(err);
const message = parseTrpcError(err);
toast.error(message);
},
});

async function onSubmit() {
Expand Down
Loading
Loading