Merge branch 'main' into fix/v1_permissions_createRole_transaction_error

unkeyed · Oct 8, 2024 · a61f1ad · a61f1ad
2 parents 479043a + 0572c25
commit a61f1ad
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 1 deletion.
diff --git a/apps/dashboard/app/(app)/authorization/permissions/[permissionId]/client.tsx b/apps/dashboard/app/(app)/authorization/permissions/[permissionId]/client.tsx
@@ -49,6 +49,9 @@ export const Client: React.FC<Props> = ({ permission }) => {
       toast.success("Permission updated");
       router.refresh();
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
 
   async function onSubmit(values: z.infer<typeof formSchema>) {

diff --git a/apps/dashboard/app/(app)/authorization/permissions/[permissionId]/delete-permission.tsx b/apps/dashboard/app/(app)/authorization/permissions/[permissionId]/delete-permission.tsx
@@ -59,6 +59,9 @@ export const DeletePermission: React.FC<Props> = ({ trigger, permission }) => {
       revalidate("/authorization/permissions");
       router.push("/authorization/permissions");
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
 
   async function onSubmit() {

diff --git a/apps/dashboard/app/(app)/authorization/permissions/create-new-permission.tsx b/apps/dashboard/app/(app)/authorization/permissions/create-new-permission.tsx
@@ -67,6 +67,9 @@ export const CreateNewPermission: React.FC<Props> = ({ trigger }) => {
       });
       setOpen(false);
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
 
   async function onSubmit(values: z.infer<typeof formSchema>) {

diff --git a/apps/dashboard/app/(app)/authorization/roles/[roleId]/delete-role.tsx b/apps/dashboard/app/(app)/authorization/roles/[roleId]/delete-role.tsx
@@ -60,6 +60,9 @@ export const DeleteRole: React.FC<Props> = ({ trigger, role }) => {
       toast.success("Role deleted successfully");
       router.push("/authorization/roles");
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
 
   async function onSubmit() {

diff --git a/apps/dashboard/app/(app)/authorization/roles/[roleId]/update-role.tsx b/apps/dashboard/app/(app)/authorization/roles/[roleId]/update-role.tsx
@@ -62,6 +62,9 @@ export const UpdateRole: React.FC<Props> = ({ trigger, role }) => {
       router.refresh();
       setOpen(false);
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
 
   async function onSubmit(values: z.infer<typeof formSchema>) {

diff --git a/apps/dashboard/app/(app)/ratelimits/[namespaceId]/overrides/[overrideId]/settings.tsx b/apps/dashboard/app/(app)/ratelimits/[namespaceId]/overrides/[overrideId]/settings.tsx
@@ -79,6 +79,9 @@ export const UpdateCard: React.FC<Props> = ({ overrideId, defaultValues }) => {
       });
       router.refresh();
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
 
   const deleteOverride = trpc.ratelimit.override.delete.useMutation({

diff --git a/apps/dashboard/app/(app)/ratelimits/[namespaceId]/overrides/create-new-override.tsx b/apps/dashboard/app/(app)/ratelimits/[namespaceId]/overrides/create-new-override.tsx
@@ -63,6 +63,9 @@ export const CreateNewOverride: React.FC<Props> = ({ namespaceId }) => {
       });
       router.refresh();
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
   async function onSubmit(values: z.infer<typeof formSchema>) {
     create.mutate({

diff --git a/apps/dashboard/app/(app)/ratelimits/[namespaceId]/settings/delete-namespace.tsx b/apps/dashboard/app/(app)/ratelimits/[namespaceId]/settings/delete-namespace.tsx
@@ -65,6 +65,9 @@ export const DeleteNamespace: React.FC<Props> = ({ namespace }) => {
 
       router.push("/ratelimits");
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
 
   const isValid = form.watch("intent") === intent && form.watch("name") === namespace.name;

diff --git a/apps/dashboard/app/(app)/ratelimits/[namespaceId]/settings/update-namespace-name.tsx b/apps/dashboard/app/(app)/ratelimits/[namespaceId]/settings/update-namespace-name.tsx
@@ -47,6 +47,9 @@ export const UpdateNamespaceName: React.FC<Props> = ({ namespace }) => {
       toast.success("Your namespace name has been renamed!");
       router.refresh();
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
   async function onSubmit(values: z.infer<typeof formSchema>) {
     if (values.name === namespace.name || !values.name) {

diff --git a/apps/dashboard/app/(app)/ratelimits/create-namespace-button.tsx b/apps/dashboard/app/(app)/ratelimits/create-namespace-button.tsx
@@ -38,6 +38,9 @@ export const CreateNamespaceButton = ({
       router.refresh();
       router.push(`/ratelimits/${res.id}`);
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
   async function onSubmit(values: z.infer<typeof formSchema>) {
     create.mutate(values);

diff --git a/apps/dashboard/app/(app)/settings/general/update-workspace-name.tsx b/apps/dashboard/app/(app)/settings/general/update-workspace-name.tsx
@@ -45,6 +45,9 @@ export const UpdateWorkspaceName: React.FC<Props> = ({ workspace }) => {
       user?.reload();
       router.refresh();
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
 
   async function onSubmit(values: z.infer<typeof formSchema>) {

diff --git a/apps/dashboard/components/opt-in.tsx b/apps/dashboard/components/opt-in.tsx
@@ -35,6 +35,9 @@ export const OptIn: React.FC<Props> = ({ title, description, feature }) => {
       toast.success("Successfully opted in");
       router.refresh();
     },
+    onError(err) {
+      toast.error(err.message);
+    },
   });
   return (
     <EmptyPlaceholder className="h-full">

diff --git a/apps/dashboard/lib/trpc/routers/ratelimit/deleteNamespace.ts b/apps/dashboard/lib/trpc/routers/ratelimit/deleteNamespace.ts
@@ -109,7 +109,13 @@ export const deleteNamespace = rateLimitedProcedure(ratelimit.delete)
               userAgent: ctx.audit.userAgent,
             },
           })),
-        );
+        ).catch((_err) => {
+          throw new TRPCError({
+            code: "INTERNAL_SERVER_ERROR",
+            message:
+              "We are unable to delete the namespaces. Please contact support using support@unkey.dev",
+          });
+        });
       }
     });
   });
diff --git a/apps/dashboard/lib/trpc/routers/ratelimit/updateNamespaceName.ts b/apps/dashboard/lib/trpc/routers/ratelimit/updateNamespaceName.ts
@@ -81,6 +81,12 @@ export const updateNamespaceName = rateLimitedProcedure(ratelimit.update)
           location: ctx.audit.location,
           userAgent: ctx.audit.userAgent,
         },
+      }).catch((_err) => {
+        throw new TRPCError({
+          message:
+            "We are unable to update the namespace name. Please contact support using support@unkey.dev",
+          code: "INTERNAL_SERVER_ERROR",
+        });
       });
     });
   });
diff --git a/apps/dashboard/lib/trpc/routers/ratelimit/updateOverride.ts b/apps/dashboard/lib/trpc/routers/ratelimit/updateOverride.ts
@@ -89,6 +89,12 @@ export const updateOverride = rateLimitedProcedure(ratelimit.update)
           location: ctx.audit.location,
           userAgent: ctx.audit.userAgent,
         },
+      }).catch((_err) => {
+        throw new TRPCError({
+          code: "INTERNAL_SERVER_ERROR",
+          message:
+            "We are unable to update the override. Please contact support using support@unkey.dev",
+        });
       });
     });
   });
diff --git a/apps/dashboard/lib/trpc/routers/rbac/deleteRole.ts b/apps/dashboard/lib/trpc/routers/rbac/deleteRole.ts
@@ -68,6 +68,13 @@ export const deleteRole = rateLimitedProcedure(ratelimit.delete)
           location: ctx.audit.location,
           userAgent: ctx.audit.userAgent,
         },
+      }).catch((err) => {
+        console.error(err);
+        throw new TRPCError({
+          code: "INTERNAL_SERVER_ERROR",
+          message:
+            "We are unable to delete the role. Please contact support using support@unkey.dev.",
+        });
       });
     });
   });