Merge remote-tracking branch 'origin/main' into release/0.12

# Conflicts:
#	app/src/ui/elements/auth/AuthForm.tsx
This commit is contained in:
dswbx
2025-04-22 15:56:40 +02:00
2 changed files with 31 additions and 21 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
"type": "module",
"sideEffects": false,
"bin": "./dist/cli/index.js",
"version": "0.11.1",
"version": "0.11.2",
"description": "Lightweight Firebase/Supabase alternative built to run anywhere — incl. Next.js, React Router, Astro, Cloudflare, Bun, Node, AWS Lambda & more.",
"homepage": "https://bknd.io",
"repository": {
+30 -20
View File
@@ -164,26 +164,36 @@ export function DataEntityUpdate({ params }) {
]}
/>
</AppShell.SectionHeader>
<AppShell.Scrollable>
{error && (
<div className="flex flex-row dark:bg-red-950 bg-red-100 p-4">
<b className="mr-2">Update failed: </b> {error}
</div>
)}
<EntityForm
entity={entity}
entityId={entityId}
handleSubmit={handleSubmit}
fieldsDisabled={fieldsDisabled}
data={data ?? undefined}
Form={Form}
action="update"
className="flex flex-grow flex-col gap-3 p-3"
/>
{targetRelations.length > 0 ? (
<EntityDetailRelations id={entityId} entity={entity} relations={targetRelations} />
) : null}
</AppShell.Scrollable>
{$q.isLoading ? (
<div className="w-full h-full flex justify-center items-center font-mono opacity-30">
Loading...
</div>
) : (
<AppShell.Scrollable>
{error && (
<div className="flex flex-row dark:bg-red-950 bg-red-100 p-4">
<b className="mr-2">Update failed: </b> {error}
</div>
)}
<EntityForm
entity={entity}
entityId={entityId}
handleSubmit={handleSubmit}
fieldsDisabled={fieldsDisabled}
data={data ?? undefined}
Form={Form}
action="update"
className="flex flex-grow flex-col gap-3 p-3"
/>
{targetRelations.length > 0 ? (
<EntityDetailRelations
id={entityId}
entity={entity}
relations={targetRelations}
/>
) : null}
</AppShell.Scrollable>
)}
</Fragment>
);
}