Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Changed both OAuth sheets to the standard sheet layout

Damian Legawiec83c256bd37ff
diff --git a/packages/dashboard/src/components/spree/mcp-connect-sheet.tsx b/packages/dashboard/src/components/spree/mcp-connect-sheet.tsx
index 16469fbb72..eec815d8b4 100644
--- a/packages/dashboard/src/components/spree/mcp-connect-sheet.tsx
+++ b/packages/dashboard/src/components/spree/mcp-connect-sheet.tsx
@@ -126,7 +126,7 @@ export function McpConnectSheet({ open, onOpenChange }: McpConnectSheetProps) {
return (
<Sheet open={open} onOpenChange={reset}>
- <SheetContent className="flex w-full flex-col sm:max-w-xl">
+ <SheetContent className="w-full sm:max-w-xl">
<SheetHeader>
<SheetTitle>
{created
@@ -138,7 +138,7 @@ export function McpConnectSheet({ open, onOpenChange }: McpConnectSheetProps) {
</SheetDescription>
</SheetHeader>
- <div className="flex flex-1 flex-col gap-6 overflow-y-auto px-4">
+ <div className="flex flex-1 flex-col gap-6 overflow-y-auto p-4">
{failure ? (
<Alert variant="destructive">
<AlertDescription>{failure}</AlertDescription>
@@ -210,12 +210,12 @@ export function McpConnectSheet({ open, onOpenChange }: McpConnectSheetProps) {
<Button onClick={() => reset(false)}>{t('admin.common.done')}</Button>
) : (
<>
- <Button disabled={!canConnect} onClick={connect}>
- {t('admin.mcp_connect.continue')}
- </Button>
<Button variant="outline" onClick={() => reset(false)}>
{t('admin.common.cancel')}
</Button>
+ <Button disabled={!canConnect} onClick={connect}>
+ {t('admin.mcp_connect.continue')}
+ </Button>
</>
)}
</SheetFooter>
diff --git a/packages/dashboard/src/components/spree/oauth-application-sheet.tsx b/packages/dashboard/src/components/spree/oauth-application-sheet.tsx
index 8bf880a6e7..037d8bdb56 100644
--- a/packages/dashboard/src/components/spree/oauth-application-sheet.tsx
+++ b/packages/dashboard/src/components/spree/oauth-application-sheet.tsx
@@ -85,50 +85,52 @@ export function OauthApplicationSheet({
</SheetDescription>
</SheetHeader>
- <form
- className="flex flex-1 flex-col gap-4 overflow-y-auto px-4"
- onSubmit={form.handleSubmit(onSubmit)}
- >
- {form.formState.errors.root && (
- <p className="text-destructive text-sm">{form.formState.errors.root.message}</p>
- )}
+ {/* The form wraps the footer so the submit button belongs to it, but
+ only the fields scroll — a footer inside the scroll area slides
+ out of reach on a short viewport. */}
+ <form className="flex min-h-0 flex-1 flex-col" onSubmit={form.handleSubmit(onSubmit)}>
+ <div className="flex flex-1 flex-col gap-4 overflow-y-auto p-4">
+ {form.formState.errors.root && (
+ <p className="text-destructive text-sm">{form.formState.errors.root.message}</p>
+ )}
- <Field>
- <Label htmlFor="oauth-application-name">
- {t('admin.fields.oauth_application.name.label')}
- </Label>
- <Input
- id="oauth-application-name"
- {...form.register('name', { required: true })}
- aria-invalid={Boolean(form.formState.errors.name)}
- placeholder={t('admin.fields.oauth_application.name.placeholder')}
- />
- <FieldError>{form.formState.errors.name?.message}</FieldError>
- </Field>
+ <Field>
+ <Label htmlFor="oauth-application-name">
+ {t('admin.fields.oauth_application.name.label')}
+ </Label>
+ <Input
+ id="oauth-application-name"
+ {...form.register('name', { required: true })}
+ aria-invalid={Boolean(form.formState.errors.name)}
+ placeholder={t('admin.fields.oauth_application.name.placeholder')}
+ />
+ <FieldError>{form.formState.errors.name?.message}</FieldError>
+ </Field>
- <Field>
- <Label htmlFor="oauth-application-redirect-uri">
- {t('admin.fields.oauth_application.redirect_uri.label')}
- </Label>
- <Input
- id="oauth-application-redirect-uri"
- {...form.register('redirect_uri', { required: true })}
- aria-invalid={Boolean(form.formState.errors.redirect_uri)}
- placeholder="https://example.com/oauth/callback"
- />
- <p className="text-muted-foreground text-xs">
- {t('admin.fields.oauth_application.redirect_uri.help')}
- </p>
- <FieldError>{form.formState.errors.redirect_uri?.message}</FieldError>
- </Field>
+ <Field>
+ <Label htmlFor="oauth-application-redirect-uri">
+ {t('admin.fields.oauth_application.redirect_uri.label')}
+ </Label>
+ <Input
+ id="oauth-application-redirect-uri"
+ {...form.register('redirect_uri', { required: true })}
+ aria-invalid={Boolean(form.formState.errors.redirect_uri)}
+ placeholder="https://example.com/oauth/callback"
+ />
+ <p className="text-muted-foreground text-xs">
+ {t('admin.fields.oauth_application.redirect_uri.help')}
+ </p>
+ <FieldError>{form.formState.errors.redirect_uri?.message}</FieldError>
+ </Field>
+ </div>
- <SheetFooter className="px-0">
- <Button type="submit" disabled={save.isPending}>
- {t('admin.common.save')}
- </Button>
+ <SheetFooter>
<Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
{t('admin.common.cancel')}
</Button>
+ <Button type="submit" disabled={save.isPending}>
+ {t('admin.common.save')}
+ </Button>
</SheetFooter>
</form>
</SheetContent>