Skip to content

Adds server and client side metadata #87

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
merged 2 commits into from
Jun 25, 2024
Merged

Adds server and client side metadata #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cedcd7d
Added server and client side metadata
hkirat Jun 21, 2024
b11183d
revert lint
hkirat Jun 21, 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
16 changes: 14 additions & 2 deletions apps/dashboard/src/components/data-table/user-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ import { standardProviders } from "@stackframe/stack-shared/dist/interface/clien
import { ActionCell, AvatarCell, BadgeCell, DateCell, TextCell } from "./elements/cells";
import { SearchToolbarItem } from "./elements/toolbar-items";
import { FormDialog } from "../form-dialog";
import { DateField, InputField, SwitchField } from "../form-fields";
import { DateField, InputField, SwitchField, TextAreaField } from "../form-fields";
import { ActionDialog } from "../action-dialog";
import Typography from "../ui/typography";
import { standardFilterFn } from "./elements/utils";
import { SimpleTooltip } from "../simple-tooltip";
import { yupJsonValidator } from "@stackframe/stack-shared/dist/utils/yup";

export type ExtendedServerUser = ServerUser & {
authType: string,
Expand Down Expand Up @@ -50,6 +51,8 @@ const userEditFormSchema = yup.object({
primaryEmail: yup.string().email("Primary Email must be a valid email address"),
signedUpAt: yup.date().required(),
primaryEmailVerified: yup.boolean().required(),
clientMetadata: yupJsonValidator,
serverMetadata: yupJsonValidator,
});

function EditUserDialog(props: {
Expand All @@ -62,6 +65,8 @@ function EditUserDialog(props: {
primaryEmail: props.user.primaryEmail || undefined,
primaryEmailVerified: props.user.primaryEmailVerified,
signedUpAt: props.user.signedUpAt,
clientMetadata: props.user.clientMetadata ? JSON.stringify(props.user.clientMetadata) : undefined,
serverMetadata: props.user.serverMetadata ? JSON.stringify(props.user.serverMetadata) : undefined,
};

return <FormDialog
Expand All @@ -86,9 +91,16 @@ function EditUserDialog(props: {
</div>

<DateField control={form.control} label="Signed Up At" name="signedUpAt" />

<TextAreaField rows={3} control={form.control} label="Client Metadata" name="clientMetadata" />
<TextAreaField rows={3} control={form.control} label="Server Metadata" name="serverMetadata" />
</>
)}
onSubmit={async (values) => { await props.user.update(values); }}
onSubmit={async (values) => { await props.user.update({
...values,
clientMetadata: values.clientMetadata ? JSON.parse(values.clientMetadata) : undefined,
serverMetadata: values.serverMetadata ? JSON.parse(values.serverMetadata) : undefined
}); }}
cancelButton
/>;
}
Expand Down
34 changes: 34 additions & 0 deletions apps/dashboard/src/components/form-fields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Button } from "./ui/button";
import { cn } from "@/lib/utils";
import { Checkbox } from "./ui/checkbox";
import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "./ui/select";
import { Textarea } from "./ui/textarea";


export function FieldLabel(props: {
Expand All @@ -23,6 +24,39 @@ export function FieldLabel(props: {
</FormLabel>;
}

export function TextAreaField<F extends FieldValues>(props: {
rows?: number,
required?: boolean,
placeholder?: string,
helperText?: string | JSX.Element,
control: Control<F>,
name: Path<F>,
label: React.ReactNode,
}) {
return (
<FormField
control={props.control}
name={props.name}
render={({ field }) => (
<FormItem>
<label className="flex flex-col gap-2">
<FieldLabel required={props.required}>{props.label}</FieldLabel>
<FormControl>
<Textarea
{...field}
rows={props.rows}
placeholder={props.placeholder}
value={field.value ?? ""}
/>
</FormControl>
<FormMessage />
</label>
</FormItem>
)}
/>
);
}

export function InputField<F extends FieldValues>(props: {
control: Control<F>,
name: Path<F>,
Expand Down
10 changes: 10 additions & 0 deletions packages/stack-shared/src/utils/yup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
import * as yup from "yup";

export const yupJson = yup.mixed().nullable().defined().transform((value) => JSON.parse(JSON.stringify(value)));

export const yupJsonValidator = yup.string().test("json", "Invalid JSON format", (value) => {
if (!value) return true;
try {
JSON.parse(value);
return true;
} catch (error) {
return false;
}
});