Skip to content

fix: UI for update and create key #2795

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

Merged
MichaelUnkey merged 9 commits into from
Jan 14, 2025
Merged

fix: UI for update and create key #2795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cd6f2a1
fixes UI for update and create key
Jan 8, 2025
f901b73
Merge branch 'main' into eng-1598-creating-a-key-in-the-ui-with-remai…
MichaelUnkey Jan 8, 2025
aab82f3
code rabbit
Jan 8, 2025
99ac8db
Merge branch 'eng-1598-creating-a-key-in-the-ui-with-remaining-forces…
Jan 8, 2025
9bd0d92
fmt
Jan 8, 2025
4307ecc
missing validation for refill amount
Jan 9, 2025
6007ef7
Merge branch 'main' of https://github.com/unkeyed/unkey into eng-1598…
Jan 9, 2025
1acc997
[autofix.ci] apply automated fixes
autofix-ci[bot] Jan 9, 2025
4c24bbd
Merge branch 'main' into eng-1598-creating-a-key-in-the-ui-with-remai…
MichaelUnkey Jan 10, 2025
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
80 changes: 71 additions & 9 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 @@ -20,6 +20,13 @@ import {
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { Switch } from "@/components/ui/switch";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
Expand All @@ -36,10 +43,12 @@ const formSchema = z.object({
remaining: z.coerce.number().positive({ message: "Please enter a positive number" }).optional(),
refill: z
.object({
interval: z.enum(["none", "daily", "monthly"]).optional(),
amount: z
.literal("")
.transform(() => undefined)
.or(z.coerce.number().int().positive()),
.or(z.coerce.number().int().positive())
.optional(),
refillDay: z
.literal("")
.transform(() => undefined)
Expand Down Expand Up @@ -70,6 +79,7 @@ export const UpdateKeyRemaining: React.FC<Props> = ({ apiKey }) => {
limitEnabled: Boolean(apiKey.remaining) || Boolean(apiKey.refillAmount),
remaining: apiKey.remaining ? apiKey.remaining : undefined,
refill: {
interval: apiKey.refillDay ? "monthly" : apiKey.refillAmount ? "daily" : "none",
amount: apiKey.refillAmount ? apiKey.refillAmount : undefined,
refillDay: apiKey.refillDay ?? undefined,
},
Expand All @@ -94,21 +104,40 @@ export const UpdateKeyRemaining: React.FC<Props> = ({ apiKey }) => {
});

async function onSubmit(values: z.infer<typeof formSchema>) {
if (!values.refill?.amount && values.refill?.refillDay) {
if (values.refill?.interval === "none") {
delete values.refill;
}
// make sure they aren't sent to the server if they are disabled.
if (values.refill?.interval !== "none" && !values.refill?.amount) {
form.setError("refill.amount", {
type: "manual",
message: "Please enter a value if interval is selected",
});
return;
}
if (!values.refill?.amount && values.refill?.refillDay && values.limitEnabled) {
form.setError("refill.amount", {
message: "Please enter the number of uses per interval or remove the refill day",
});
return;
}
if (values.remaining === undefined) {
if (values.remaining === undefined && values.limitEnabled) {
form.setError("remaining", { message: "Please enter a value" });
return;
}
if (values.limitEnabled === false) {
if (!values.limitEnabled) {
delete values.refill;
delete values.remaining;
}
await updateRemaining.mutateAsync(values);
if (values.refill?.interval === "monthly" && !values.refill?.refillDay) {
values.refill.refillDay = 1;
}
await updateRemaining.mutateAsync({
keyId: values.keyId,
limitEnabled: values.limitEnabled,
remaining: values.remaining,
refill: values.refill,
});
}

return (
Expand Down Expand Up @@ -151,12 +180,38 @@ export const UpdateKeyRemaining: React.FC<Props> = ({ apiKey }) => {
</FormItem>
)}
/>
<FormField
control={form.control}
name="refill.interval"
disabled={
!form.watch("limitEnabled") ||
form.watch("remaining") === undefined ||
form.watch("remaining") === null
}
render={({ field }) => (
<FormItem className="">
<FormLabel>Refill Rate</FormLabel>
<Select onValueChange={field.onChange} value={field.value || "none"}>
<SelectTrigger>
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="none">None</SelectItem>
<SelectItem value="daily">Daily</SelectItem>
<SelectItem value="monthly">Monthly</SelectItem>
</SelectContent>
</Select>
<FormDescription>Interval key will be refilled.</FormDescription>
</FormItem>
)}
/>
<FormField
control={form.control}
disabled={
form.watch("remaining") === undefined ||
form.watch("remaining") === null ||
!form.watch("limitEnabled") === true
!form.watch("limitEnabled") === true ||
form.watch("refill.interval") === "none"
}
name="refill.amount"
render={({ field }) => (
Expand All @@ -183,19 +238,26 @@ export const UpdateKeyRemaining: React.FC<Props> = ({ apiKey }) => {
disabled={
form.watch("remaining") === undefined ||
form.watch("remaining") === null ||
!form.watch("limitEnabled") === true
!form.watch("limitEnabled") === true ||
form.watch("refill.interval") === "none" ||
form.watch("refill.interval") === "daily"
}
name="refill.refillDay"
render={({ field }) => (
<FormItem className="mt-4">
<FormLabel>Day of the month to refill uses.</FormLabel>
<FormControl>
<Input
placeholder="day of the month"
placeholder="1"
className="w-full"
type="number"
{...field}
value={form.getValues("limitEnabled") ? field.value : undefined}
value={
form.getValues("limitEnabled") &&
form.getValues("refill.interval") === "monthly"
? field.value
: undefined
}
/>
</FormControl>
<FormDescription>
Expand Down
18 changes: 13 additions & 5 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 @@ -85,7 +85,13 @@ export const CreateKey = ({ apiId, keyAuthId, defaultBytes, defaultPrefix }: Pro
});

async function onSubmit(values: z.infer<typeof formSchema>) {
// make sure they aren't sent to the server if they are disabled.
if (values.limit?.refill?.interval !== "none" && !values.limit?.refill?.amount) {
form.setError("limit.refill.amount", {
type: "manual",
message: "Please enter a value if interval is selected",
});
return;
}
if (!values.expireEnabled) {
delete values.expires;
}
Expand Down Expand Up @@ -507,8 +513,7 @@ export const CreateKey = ({ apiId, keyAuthId, defaultBytes, defaultPrefix }: Pro
<FormLabel>Refill Rate</FormLabel>
<Select
onValueChange={field.onChange}
defaultValue="none"
value={field.value}
value={field.value || "none"}
>
<SelectTrigger>
<SelectValue />
Expand All @@ -527,6 +532,10 @@ export const CreateKey = ({ apiId, keyAuthId, defaultBytes, defaultPrefix }: Pro
/>
<FormField
control={form.control}
disabled={
!form.watch("limitEnabled") ||
form.watch("limit.refill.interval") === "none"
}
name="limit.refill.amount"
render={({ field }) => (
<FormItem className="mt-4">
Expand All @@ -538,7 +547,7 @@ export const CreateKey = ({ apiId, keyAuthId, defaultBytes, defaultPrefix }: Pro
type="number"
{...field}
value={
form.getValues("limitEnabled") ? field.value : undefined
form.getValues("limitEnabled") ? field.value : "undefined"
}
/>
</FormControl>
Expand All @@ -549,7 +558,6 @@ export const CreateKey = ({ apiId, keyAuthId, defaultBytes, defaultPrefix }: Pro
</FormItem>
)}
/>

<FormField
control={form.control}
disabled={
Expand Down