Track HiveGrid Cloud planning reference
This commit is contained in:
1 parent
b3d5ea6764
commit
e341c5938a
5784 files changed
+1104929
-3
No files matched your search
@@ -0,0 +1,86 @@
|
||||
import { ActionFunctionArgs, LoaderFunctionArgs, redirect, useLoaderData } from "react-router";
|
||||
import { EntityGroupForm } from "~/components/entities/EntityGroupForm";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { EntityWithDetails, getAllEntities } from "~/utils/db/entities/entities.db.server";
|
||||
import { EntityGroupWithDetails, deleteEntityGroup, getAllEntityGroups, getEntityGroup, updateEntityGroup } from "~/utils/db/entities/entityGroups.db.server";
|
||||
import { EntityViewWithTenantAndUser, getAllEntityViews } from "~/utils/db/entities/entityViews.db.server";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
|
||||
import { validateCSRFToken } from "~/utils/session.server";
|
||||
import { isReservedTenantChildRouteSlug, normalizeTenantSlug } from "~/utils/services/tenantService";
|
||||
|
||||
type LoaderData = {
|
||||
item: EntityGroupWithDetails;
|
||||
allEntities: EntityWithDetails[];
|
||||
systemViews: EntityViewWithTenantAndUser[];
|
||||
};
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
await verifyUserHasPermission(request, "admin.entities.update");
|
||||
const item = await getEntityGroup(params.id!);
|
||||
if (!item) {
|
||||
return redirect(adminPath("entities/groups", { mode: "host-aware" }));
|
||||
}
|
||||
const data: LoaderData = {
|
||||
item,
|
||||
allEntities: await getAllEntities({ tenantId: null }),
|
||||
systemViews: (await getAllEntityViews({ type: "system" })).items,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
export const action = async ({ request, params }: ActionFunctionArgs) => {
|
||||
await verifyUserHasPermission(request, "admin.entities.update");
|
||||
const { t } = await getTranslations(request);
|
||||
await validateCSRFToken(request);
|
||||
const form = await request.formData();
|
||||
const action = form.get("action")?.toString();
|
||||
|
||||
const item = await getEntityGroup(params.id!);
|
||||
if (!item) {
|
||||
return redirect(adminPath("entities/groups", { mode: "host-aware" }));
|
||||
}
|
||||
|
||||
if (action === "edit") {
|
||||
await verifyUserHasPermission(request, "admin.entities.update");
|
||||
const slug = normalizeTenantSlug(form.get("slug")?.toString() ?? "");
|
||||
const title = form.get("title")?.toString();
|
||||
const icon = form.get("icon")?.toString();
|
||||
const collapsible = Boolean(form.get("collapsible"));
|
||||
const section = form.get("section")?.toString() ?? null;
|
||||
const entities: { entityId: string; allViewId: string | null }[] = form.getAll("entities[]").map((f) => JSON.parse(f.toString()));
|
||||
|
||||
const allGroups = await getAllEntityGroups();
|
||||
const existing = allGroups.find((f) => f.slug.trim() === slug?.trim() && f.id !== params.id);
|
||||
if (isReservedTenantChildRouteSlug(slug)) {
|
||||
return Response.json({ error: t("admin.entities.groups.errors.slugConflictsWithWorkspaceRoute") }, { status: 400 });
|
||||
}
|
||||
if (slug && existing) {
|
||||
return Response.json({ error: t("admin.entities.groups.errors.slugAlreadyExists") }, { status: 400 });
|
||||
}
|
||||
await updateEntityGroup(params.id!, {
|
||||
slug,
|
||||
title,
|
||||
icon,
|
||||
collapsible,
|
||||
section,
|
||||
entities,
|
||||
});
|
||||
return redirect(adminPath("entities/groups", { mode: "host-aware" }));
|
||||
} else if (action === "delete") {
|
||||
await verifyUserHasPermission(request, "admin.entities.delete");
|
||||
await deleteEntityGroup(params.id!);
|
||||
return Response.json({ success: t("shared.deleted") });
|
||||
} else {
|
||||
return Response.json({ error: t("shared.invalidForm") }, { status: 400 });
|
||||
}
|
||||
};
|
||||
|
||||
export default function () {
|
||||
const data = useLoaderData<LoaderData>();
|
||||
|
||||
return (
|
||||
<div>
|
||||
<EntityGroupForm item={data.item} allEntities={data.allEntities} systemViews={data.systemViews} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
import { readFileSync } from "node:fs";
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
function readRouteSource(path: string) {
|
||||
return readFileSync(new URL(path, import.meta.url), "utf8");
|
||||
}
|
||||
|
||||
describe("entity group route slug boundary", () => {
|
||||
it("rejects reserved tenant child route slugs before creating groups", () => {
|
||||
const source = readRouteSource("new.tsx");
|
||||
|
||||
expect(source).toContain("isReservedTenantChildRouteSlug(slug)");
|
||||
expect(source.indexOf("isReservedTenantChildRouteSlug(slug)")).toBeLessThan(source.indexOf("await createEntityGroup"));
|
||||
});
|
||||
|
||||
it("rejects reserved tenant child route slugs before updating groups", () => {
|
||||
const source = readRouteSource("$id.tsx");
|
||||
|
||||
expect(source).toContain("isReservedTenantChildRouteSlug(slug)");
|
||||
expect(source.indexOf("isReservedTenantChildRouteSlug(slug)")).toBeLessThan(source.indexOf("await updateEntityGroup"));
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,74 @@
|
||||
import { ActionFunctionArgs, LoaderFunctionArgs, redirect, useLoaderData } from "react-router";
|
||||
import { EntityGroupForm } from "~/components/entities/EntityGroupForm";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { EntityWithDetails, getAllEntities } from "~/utils/db/entities/entities.db.server";
|
||||
import { createEntityGroup, getAllEntityGroups } from "~/utils/db/entities/entityGroups.db.server";
|
||||
import { EntityViewWithTenantAndUser, getAllEntityViews } from "~/utils/db/entities/entityViews.db.server";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
|
||||
import { validateCSRFToken } from "~/utils/session.server";
|
||||
import { isReservedTenantChildRouteSlug, normalizeTenantSlug } from "~/utils/services/tenantService";
|
||||
|
||||
type LoaderData = {
|
||||
allEntities: EntityWithDetails[];
|
||||
systemViews: EntityViewWithTenantAndUser[];
|
||||
};
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
await verifyUserHasPermission(request, "admin.entities.create");
|
||||
const data: LoaderData = {
|
||||
allEntities: await getAllEntities({ tenantId: null }),
|
||||
systemViews: (await getAllEntityViews({ type: "system" })).items,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
export const action = async ({ request, params }: ActionFunctionArgs) => {
|
||||
const { t } = await getTranslations(request);
|
||||
await validateCSRFToken(request);
|
||||
const form = await request.formData();
|
||||
const action = form.get("action")?.toString();
|
||||
|
||||
if (action === "create") {
|
||||
await verifyUserHasPermission(request, "admin.entities.create");
|
||||
const slug = normalizeTenantSlug(form.get("slug")?.toString() ?? "");
|
||||
const title = form.get("title")?.toString().trim() ?? "";
|
||||
const icon = form.get("icon")?.toString().trim() ?? "";
|
||||
const collapsible = Boolean(form.get("collapsible"));
|
||||
const section = form.get("section")?.toString() ?? null;
|
||||
const entities: { entityId: string; allViewId: string | null }[] = form.getAll("entities[]").map((f) => JSON.parse(f.toString()));
|
||||
const allGroups = await getAllEntityGroups();
|
||||
let maxOrder = 0;
|
||||
if (allGroups.length > 0) {
|
||||
maxOrder = Math.max(...allGroups.map((f) => f.order ?? 0));
|
||||
}
|
||||
const existing = allGroups.find((f) => f.slug.trim() === slug.trim());
|
||||
if (isReservedTenantChildRouteSlug(slug)) {
|
||||
return Response.json({ error: t("admin.entities.groups.errors.slugConflictsWithWorkspaceRoute") }, { status: 400 });
|
||||
}
|
||||
if (existing) {
|
||||
return Response.json({ error: t("admin.entities.groups.errors.slugAlreadyExists") }, { status: 400 });
|
||||
}
|
||||
await createEntityGroup({
|
||||
order: maxOrder + 1,
|
||||
slug,
|
||||
title,
|
||||
icon,
|
||||
collapsible,
|
||||
section,
|
||||
entities,
|
||||
});
|
||||
return redirect(adminPath("entities/groups", { mode: "host-aware" }));
|
||||
} else {
|
||||
return Response.json({ error: t("shared.invalidForm") }, { status: 400 });
|
||||
}
|
||||
};
|
||||
|
||||
export default function () {
|
||||
const data = useLoaderData<LoaderData>();
|
||||
|
||||
return (
|
||||
<div>
|
||||
<EntityGroupForm item={undefined} allEntities={data.allEntities} systemViews={data.systemViews} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user