Update hivegrid-cloud reference to latest main
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e98d38e716
commit
7b21524c86
3781 files changed
+373484
-225607
No files matched your search
+51
-11
@@ -11,18 +11,23 @@
|
||||
*/
|
||||
import { type ActionFunctionArgs, type LoaderFunctionArgs, useLoaderData, Form, Link, useActionData } from "react-router";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import slugify from "@sindresorhus/slugify";
|
||||
import { db } from "~/utils/db.server";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { useLocaleFormatters } from "~/locale/format";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { validateCSRFToken } from "~/utils/session.server";
|
||||
import { FormDefinitionSchema, HONEYPOT_FIELD_KEY } from "@toolctrl/form-widget";
|
||||
import { FormDefinitionSchema, HONEYPOT_FIELD_KEY } from "@hivegrid/form-widget";
|
||||
import { seedShkFormTemplates } from "~/modules/forms/services/shkFormTemplates.server";
|
||||
import { formsOwnerWhere, loadFormsContext, requireFormsPermission } from "~/modules/forms/routes/formsAccess.server";
|
||||
import { useRootData } from "~/utils/data/useRootData";
|
||||
|
||||
type Row = {
|
||||
id: string;
|
||||
key: string;
|
||||
slug: string | null;
|
||||
name: string;
|
||||
subtype: string;
|
||||
status: string;
|
||||
isEnabled: boolean;
|
||||
submissions: number;
|
||||
createdAt: string;
|
||||
@@ -36,15 +41,18 @@ type LoaderData = {
|
||||
type ActionData = { error?: string; createdId?: string };
|
||||
|
||||
export async function loader({ request, params }: LoaderFunctionArgs): Promise<LoaderData> {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.account.update", tenantId);
|
||||
const ctx = await loadFormsContext({ request, params, requireModule: true });
|
||||
requireFormsPermission(ctx, "forms.basic");
|
||||
const forms = await db.form.findMany({
|
||||
where: { tenantId },
|
||||
where: { tenantId: ctx.tenantId, ...formsOwnerWhere(ctx) },
|
||||
orderBy: { createdAt: "desc" },
|
||||
select: {
|
||||
id: true,
|
||||
key: true,
|
||||
slug: true,
|
||||
name: true,
|
||||
subtype: true,
|
||||
status: true,
|
||||
isEnabled: true,
|
||||
createdAt: true,
|
||||
_count: { select: { submissions: true } },
|
||||
@@ -54,7 +62,10 @@ export async function loader({ request, params }: LoaderFunctionArgs): Promise<L
|
||||
forms: forms.map((f) => ({
|
||||
id: f.id,
|
||||
key: f.key,
|
||||
slug: f.slug,
|
||||
name: f.name,
|
||||
subtype: f.subtype,
|
||||
status: f.status,
|
||||
isEnabled: f.isEnabled,
|
||||
submissions: f._count.submissions,
|
||||
createdAt: f.createdAt.toISOString(),
|
||||
@@ -64,8 +75,8 @@ export async function loader({ request, params }: LoaderFunctionArgs): Promise<L
|
||||
}
|
||||
|
||||
export async function action({ request, params }: ActionFunctionArgs): Promise<Response | ActionData> {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.account.update", tenantId);
|
||||
const ctx = await loadFormsContext({ request, params, requireModule: true });
|
||||
requireFormsPermission(ctx, "forms.builder");
|
||||
await validateCSRFToken(request);
|
||||
const { t } = await getTranslations(request);
|
||||
const body = await request.formData();
|
||||
@@ -74,10 +85,18 @@ export async function action({ request, params }: ActionFunctionArgs): Promise<R
|
||||
const name = body.get("name")?.toString()?.trim();
|
||||
const origin = body.get("allowedOrigin")?.toString()?.trim() ?? "";
|
||||
if (!name) return { error: t("settings.forms.admin.errors.nameRequired") };
|
||||
const baseSlug = slugify(name).slice(0, 80) || "form";
|
||||
let slug = baseSlug;
|
||||
for (let i = 2; i < 100; i += 1) {
|
||||
const exists = await db.form.findFirst({ where: { tenantId: ctx.tenantId, slug }, select: { id: true } });
|
||||
if (!exists) break;
|
||||
slug = `${baseSlug}-${i}`;
|
||||
}
|
||||
const definition = FormDefinitionSchema.parse({
|
||||
title: name,
|
||||
submitLabel: t("settings.forms.admin.defaults.submitLabel"),
|
||||
successMessage: t("settings.forms.admin.defaults.successMessage"),
|
||||
gdprConsentLabel: t("settings.forms.admin.defaults.gdprConsentLabel"),
|
||||
fields: [
|
||||
{ key: "full_name", type: "text", label: t("settings.forms.admin.defaults.fields.fullName"), required: true },
|
||||
{ key: "email", type: "email", label: t("settings.forms.admin.defaults.fields.email"), required: true },
|
||||
@@ -87,8 +106,12 @@ export async function action({ request, params }: ActionFunctionArgs): Promise<R
|
||||
});
|
||||
const created = await db.form.create({
|
||||
data: {
|
||||
tenantId,
|
||||
tenantId: ctx.tenantId,
|
||||
createdByUserId: ctx.userId,
|
||||
name,
|
||||
slug,
|
||||
subtype: "standard",
|
||||
status: "draft",
|
||||
definition: definition as object,
|
||||
allowedOrigins: origin ? [origin] : [],
|
||||
config: { honeypotEnabled: true } as object,
|
||||
@@ -97,10 +120,14 @@ export async function action({ request, params }: ActionFunctionArgs): Promise<R
|
||||
});
|
||||
return { createdId: created.id };
|
||||
}
|
||||
if (op === "seed-shk-templates") {
|
||||
await seedShkFormTemplates({ tenantId: ctx.tenantId, userId: ctx.userId, t });
|
||||
return { error: undefined };
|
||||
}
|
||||
if (op === "toggle") {
|
||||
const id = body.get("id")?.toString();
|
||||
if (!id) return { error: t("settings.forms.admin.errors.missingFormId") };
|
||||
const target = await db.form.findFirst({ where: { id, tenantId }, select: { isEnabled: true } });
|
||||
const target = await db.form.findFirst({ where: { id, tenantId: ctx.tenantId, ...formsOwnerWhere(ctx) }, select: { isEnabled: true } });
|
||||
if (!target) return { error: t("settings.forms.admin.errors.formNotFound") };
|
||||
await db.form.update({ where: { id }, data: { isEnabled: !target.isEnabled } });
|
||||
return { error: undefined };
|
||||
@@ -108,7 +135,7 @@ export async function action({ request, params }: ActionFunctionArgs): Promise<R
|
||||
if (op === "delete") {
|
||||
const id = body.get("id")?.toString();
|
||||
if (!id) return { error: t("settings.forms.admin.errors.missingFormId") };
|
||||
await db.form.deleteMany({ where: { id, tenantId } });
|
||||
await db.form.deleteMany({ where: { id, tenantId: ctx.tenantId, ...formsOwnerWhere(ctx) } });
|
||||
return { error: undefined };
|
||||
}
|
||||
return { error: t("settings.forms.admin.errors.unknownOperation") };
|
||||
@@ -119,6 +146,7 @@ export default function FormsAdmin(): React.JSX.Element {
|
||||
const actionData = useActionData() as ActionData | undefined;
|
||||
const { t } = useTranslation();
|
||||
const formatters = useLocaleFormatters();
|
||||
const rootData = useRootData();
|
||||
return (
|
||||
<div className="p-6 space-y-6">
|
||||
<header>
|
||||
@@ -131,7 +159,15 @@ export default function FormsAdmin(): React.JSX.Element {
|
||||
<section>
|
||||
<h2 className="text-lg font-medium mb-2">{t("settings.forms.admin.create.title")}</h2>
|
||||
{actionData?.error ? <p className="text-red-600 text-sm mb-2">{actionData.error}</p> : null}
|
||||
<Form method="post" className="mb-3">
|
||||
<input type="hidden" name="csrf" value={rootData.csrf ?? ""} readOnly />
|
||||
<input type="hidden" name="op" value="seed-shk-templates" />
|
||||
<button type="submit" className="text-sm border rounded px-3 py-1">
|
||||
{t("settings.forms.admin.create.seedShkTemplates")}
|
||||
</button>
|
||||
</Form>
|
||||
<Form method="post" className="flex gap-2 items-end">
|
||||
<input type="hidden" name="csrf" value={rootData.csrf ?? ""} readOnly />
|
||||
<input type="hidden" name="op" value="create" />
|
||||
<label className="flex flex-col gap-1 flex-1">
|
||||
<span className="text-sm">{t("settings.forms.admin.create.name")}</span>
|
||||
@@ -157,6 +193,8 @@ export default function FormsAdmin(): React.JSX.Element {
|
||||
<Link to={f.id} className="font-medium text-blue-700 hover:underline">{f.name}</Link>
|
||||
<div className="text-xs text-gray-500">
|
||||
{t("settings.forms.admin.existing.key")}: <code>{f.key}</code> ·{" "}
|
||||
{t("settings.forms.admin.existing.slug")}: <code>{f.slug ?? "n/a"}</code> ·{" "}
|
||||
{t("settings.forms.admin.existing.status")}: {f.status} ·{" "}
|
||||
{t("settings.forms.admin.existing.submissionsCount", {
|
||||
count: f.submissions,
|
||||
formattedCount: formatters.number(f.submissions),
|
||||
@@ -172,11 +210,13 @@ export default function FormsAdmin(): React.JSX.Element {
|
||||
</div>
|
||||
<div className="flex gap-2">
|
||||
<Form method="post">
|
||||
<input type="hidden" name="csrf" value={rootData.csrf ?? ""} readOnly />
|
||||
<input type="hidden" name="op" value="toggle" />
|
||||
<input type="hidden" name="id" value={f.id} />
|
||||
<button className="text-sm border rounded px-2 py-1">{f.isEnabled ? t("shared.disable") : t("shared.enable")}</button>
|
||||
</Form>
|
||||
<Form method="post" onSubmit={(e) => { if (!confirm(t("settings.forms.admin.delete.confirm"))) e.preventDefault(); }}>
|
||||
<input type="hidden" name="csrf" value={rootData.csrf ?? ""} readOnly />
|
||||
<input type="hidden" name="op" value="delete" />
|
||||
<input type="hidden" name="id" value={f.id} />
|
||||
<button className="text-sm border rounded px-2 py-1 text-red-600">{t("shared.delete")}</button>
|
||||
|
||||
Reference in new issue
Block a user