Refresh HiveGrid Cloud reference snapshot

This commit is contained in:
david committed 2026-08-03 15:31:14 +02:00
1 parent 5e99e14772
commit 7f88026f79
5955 files changed
+1177325 -188362

No files matched your search

@@ -18,6 +18,8 @@ import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsServ
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
import { validateCSRFToken } from "~/utils/session.server";
import { useRootData } from "~/utils/data/useRootData";
import { runWithRlsContext } from "@hivegrid/db/rls-context.server";
import { useSaveToast } from "~/hooks/use-save-toast";
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
@@ -31,44 +33,52 @@ type LoaderData = {
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.set");
const { t } = await getTranslations(request);
const tenant = await getTenant(params.account!);
if (!tenant) {
const tenantId = params.account;
if (!tenantId) {
throw redirect(adminPath("accounts/roles-and-permissions/account-users", { mode: "host-aware" }));
}
const adminUsers = (await adminGetAllUsers()).items.filter((f) => f.admin);
const tenantUsers = await adminGetAllTenantUsers(params.account ?? "");
const roles = await getAllRoles("app");
const items: UserWithRoles[] = [];
adminUsers.forEach((user) => {
if (!items.find((f) => f.id === user.id)) {
items.push(user);
return runWithRlsContext({ tenantId }, async () => {
const tenant = await getTenant(tenantId);
if (!tenant) {
throw redirect(adminPath("accounts/roles-and-permissions/account-users", { mode: "host-aware" }));
}
});
tenantUsers.forEach((user) => {
if (!items.find((f) => f.id === user.id)) {
items.push(user);
}
});
const data: LoaderData = {
title: `${t("admin.accounts.rolesAndPermissions.tabs.accountUsers")} | ${process.env.APP_NAME}`,
items,
roles,
tenant,
};
return data;
const adminUsers = (await adminGetAllUsers()).items.filter((f) => f.admin);
const tenantUsers = await adminGetAllTenantUsers(tenantId);
const roles = await getAllRoles("app");
const items: UserWithRoles[] = [];
adminUsers.forEach((user) => {
if (!items.find((f) => f.id === user.id)) {
items.push(user);
}
});
tenantUsers.forEach((user) => {
if (!items.find((f) => f.id === user.id)) {
items.push(user);
}
});
const data: LoaderData = {
title: `${t("admin.accounts.rolesAndPermissions.tabs.accountUsers")} | ${process.env.APP_NAME}`,
items,
roles,
tenant,
};
return data;
});
};
type ActionData = {
error?: string;
intent?: string;
ok?: boolean;
messageKey?: string;
errorKey?: string;
};
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
export const action: ActionFunction = async ({ request, params }) => {
await verifyUserHasPermission(request, "admin.roles.set");
const { t } = await getTranslations(request);
await validateCSRFToken(request);
const form = await request.formData();
@@ -77,27 +87,37 @@ export const action: ActionFunction = async ({ request, params }) => {
const userId = form.get("user-id")?.toString() ?? "";
const roleId = form.get("role-id")?.toString() ?? "";
const add = form.get("add") === "true";
const tenantId = params.account;
if (!tenantId) return badRequest({ intent: action, errorKey: "shared.notFound" });
const tenant = await getTenant(params.account ?? "");
const user = await getUser(userId);
const role = await getRole(roleId);
const tenantMember = await getTenantMember(userId, tenant?.id);
return runWithRlsContext({ tenantId }, async () => {
const tenant = await getTenant(tenantId);
const user = await getUser(userId);
const role = await getRole(roleId);
const tenantMember = await getTenantMember(userId, tenant?.id);
if (!tenant || !user || !role || role.type !== "app" || (!user.admin && !tenantMember)) {
return badRequest({ error: t("shared.notFound") });
}
if (!tenant || !user || !role || role.type !== "app" || (!user.admin && !tenantMember)) {
return badRequest({ intent: action, errorKey: "shared.notFound" });
}
if (add) {
await createUserRole(userId, roleId, tenant.id);
await createAdminLog(request, "admin.accountUserRoles.created", `[${tenant.name}] ${user.email} - ${role.name}`);
} else {
await deleteUserRole(userId, roleId, tenant.id);
await createAdminLog(request, "admin.accountUserRoles.deleted", `[${tenant.name}] ${user.email} - ${role.name}`);
}
if (add) {
await createUserRole(userId, roleId, tenant.id);
await createAdminLog(request, "admin.accountUserRoles.created", `[${tenant.name}] ${user.email} - ${role.name}`);
} else {
await deleteUserRole(userId, roleId, tenant.id);
await createAdminLog(request, "admin.accountUserRoles.deleted", `[${tenant.name}] ${user.email} - ${role.name}`);
}
return Response.json({});
return Response.json({
intent: action,
ok: true,
messageKey: add
? "admin.accounts.rolesAndPermissions.accountUsers.toast.roleAssigned"
: "admin.accounts.rolesAndPermissions.accountUsers.toast.roleRemoved",
} satisfies ActionData);
});
} else {
return badRequest({ error: t("shared.invalidForm") });
return badRequest({ intent: action, errorKey: "shared.invalidForm" });
}
};
@@ -110,6 +130,7 @@ export default function AdminAccountUsersFromTenant() {
const [items, setItems] = useState(data.items);
const submit = useSubmit();
const params = useParams();
useSaveToast(actionData);
const [searchInput, setSearchInput] = useState("");
@@ -9,7 +9,6 @@ import InputSearch from "~/components/ui/input/InputSearch";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
import { useLocaleFormatters } from "~/locale/format";
import { translateLabel } from "~/utils/i18n/translateLabel";
type LoaderData = {
title: string;
@@ -32,7 +31,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
export default function AdminRolesAndPermissionsAccountUsersRoute() {
const { i18n, t } = useTranslation();
const { t } = useTranslation();
const formatters = useLocaleFormatters();
const data = useLoaderData<LoaderData>();
@@ -73,16 +72,6 @@ export default function AdminRolesAndPermissionsAccountUsersRoute() {
</div>
),
},
{
name: "types",
title: t("shared.types"),
value: (i) =>
i.types.length === 0 ? (
<span className="text-muted-foreground">{t("shared.default")}</span>
) : (
i.types.map((f) => translateLabel(t, i18n, f.title)).join(", ")
),
},
{
name: "users",
title: t("models.user.plural"),
@@ -1,123 +1,22 @@
import { ActionFunction, LoaderFunctionArgs, MetaFunction, useLoaderData } from "react-router";
import { useSubmit } from "react-router";
import { getTranslations } from "~/locale/i18next.server";
import { getAllRoles, getRole, RoleWithPermissions } from "~/utils/db/permissions/roles.db.server";
import { adminGetAllUsers, getUser, UserWithDetails, UserWithRoles } from "~/utils/db/users.db.server";
import UserRolesTable from "~/components/core/roles/UserRolesTable";
import { useEffect, useState } from "react";
import InputSearch from "~/components/ui/input/InputSearch";
import { createUserRole, deleteUserRole } from "~/utils/db/permissions/userRoles.db.server";
import { createAdminLog } from "~/utils/db/logs.db.server";
import { useAdminData } from "~/utils/data/useAdminData";
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { validateCSRFToken } from "~/utils/session.server";
import { useRootData } from "~/utils/data/useRootData";
import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";
import { redirect } from "react-router";
type LoaderData = {
title: string;
items: UserWithDetails[];
roles: RoleWithPermissions[];
};
import { requireAdminIdentityPermission } from "~/services/admin/admin-identity.server";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
export const loader = async ({ request }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.update");
const { t } = await getTranslations(request);
async function redirectToAdminRoleBundles(request: Request) {
await requireAdminIdentityPermission(request, "admin_identity.roles.read");
throw redirect(adminPath("settings/admin-roles", { mode: "host-aware" }), 303);
}
const items = (await adminGetAllUsers()).items.filter((f) => f.admin);
const roles = await getAllRoles("admin");
export function loader({ request }: LoaderFunctionArgs) {
return redirectToAdminRoleBundles(request);
}
const data: LoaderData = {
title: `${t("admin.accounts.rolesAndPermissions.tabs.adminUsers")} | ${process.env.APP_NAME}`,
items,
roles,
};
return data;
};
export function action({ request }: ActionFunctionArgs) {
return redirectToAdminRoleBundles(request);
}
type ActionData = {
error?: string;
};
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
export const action: ActionFunction = async ({ request, params }) => {
await verifyUserHasPermission(request, "admin.roles.set");
const { t } = await getTranslations(request);
await validateCSRFToken(request);
const form = await request.formData();
const action = form.get("action")?.toString() ?? "";
if (action === "edit") {
const userId = form.get("user-id")?.toString() ?? "";
const roleId = form.get("role-id")?.toString() ?? "";
const add = form.get("add") === "true";
const user = await getUser(userId);
const role = await getRole(roleId);
if (!user || !user.admin || !role || role.type !== "admin") {
return badRequest({ error: t("shared.notFound") });
}
if (add) {
await createUserRole(userId, roleId);
await createAdminLog(request, "admin.adminUserRoles.created", `${user.email} - ${role.name}`);
} else {
await deleteUserRole(userId, roleId);
await createAdminLog(request, "admin.adminUserRoles.deleted", `${user.email} - ${role.name}`);
}
return Response.json({});
} else {
return badRequest({ error: t("shared.invalidForm") });
}
};
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
export default function AdminRolesAndPermissionsAdminUsersRoute() {
const data = useLoaderData<LoaderData>();
const adminData = useAdminData();
const rootData = useRootData();
const [items, setItems] = useState(data.items);
const submit = useSubmit();
const [searchInput, setSearchInput] = useState("");
useEffect(() => {
setItems(data.items);
}, [data]);
const filteredItems = () => {
if (!items) {
return [];
}
return items.filter(
(f) =>
f.email?.toString().toUpperCase().includes(searchInput.toUpperCase()) ||
f.firstName?.toString().toUpperCase().includes(searchInput.toUpperCase()) ||
f.lastName?.toString().toUpperCase().includes(searchInput.toUpperCase()) ||
f.tenants.find((f) => f.tenant.name.toUpperCase().includes(searchInput.toUpperCase())) ||
f.roles.find(
(f) => f.role.name.toUpperCase().includes(searchInput.toUpperCase()) || f.role.description.toUpperCase().includes(searchInput.toUpperCase())
)
);
};
function onChange(item: UserWithRoles, role: RoleWithPermissions, add: any) {
const form = new FormData();
form.set("action", "edit");
form.set("user-id", item.id);
form.set("role-id", role.id);
form.set("add", add ? "true" : "false");
form.set("csrf", rootData.csrf ?? "");
submit(form, {
method: "post",
});
}
return (
<div className="space-y-2">
<InputSearch value={searchInput} setValue={setSearchInput} />
<UserRolesTable items={filteredItems()} roles={data.roles} onChange={onChange} disabled={!getUserHasPermission(adminData, "admin.roles.set")} />
</div>
);
export default function LegacyAdminRoleAssignmentRedirect() {
return null;
}
@@ -1,4 +1,4 @@
import { ActionFunctionArgs, LoaderFunctionArgs, useLoaderData, useNavigate, useOutlet, useParams } from "react-router";
import { ActionFunctionArgs, LoaderFunctionArgs, useActionData, useLoaderData, useNavigate, useOutlet, useParams } from "react-router";
import { getTranslations } from "~/locale/i18next.server";
import { getAllPermissions, PermissionWithRoles, updatePermission } from "~/utils/db/permissions/permissions.db.server";
import PermissionsTable from "~/components/core/roles/PermissionsTable";
@@ -17,6 +17,7 @@ import { v2MetaFunction } from "~/utils/compat/v2MetaFunction";
import SlideOverWideEmpty from "~/components/ui/slideOvers/SlideOverWideEmpty";
import { validateCSRFToken } from "~/utils/session.server";
import { useTranslation } from "react-i18next";
import { useSaveToast } from "~/hooks/use-save-toast";
export { serverTimingHeaders as headers };
export const meta: v2MetaFunction<LoaderData> = ({ data }) => [{ title: data?.title }];
@@ -60,10 +61,13 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
type ActionData = {
items?: PermissionWithRoles[];
intent?: string;
ok?: boolean;
messageKey?: string;
errorKey?: string;
};
export const action = async ({ request }: ActionFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.update");
const { t } = await getTranslations(request);
await validateCSRFToken(request);
const form = await request.formData();
const action = form.get("action")?.toString();
@@ -78,20 +82,26 @@ export const action = async ({ request }: ActionFunctionArgs) => {
await updatePermission(id, { order: Number(order) });
})
);
return Response.json({ items: await getAllPermissions() });
return Response.json({
items: await getAllPermissions(),
intent: action,
ok: true,
messageKey: "admin.accounts.rolesAndPermissions.permissions.toast.orderSaved",
} satisfies ActionData);
} else {
return Response.json({ error: t("shared.invalidForm") }, { status: 400 });
return Response.json({ intent: action, errorKey: "shared.invalidForm" } satisfies ActionData, { status: 400 });
}
};
export default function () {
const data = useLoaderData<LoaderData>();
const actionData = useLoaderData<ActionData>();
const actionData = useActionData<ActionData>();
const adminData = useAdminData();
const navigate = useNavigate();
const outlet = useOutlet();
const params = useParams();
const { t } = useTranslation();
useSaveToast(actionData);
return (
<div className="space-y-2">
@@ -78,7 +78,9 @@ export const action: ActionFunction = async ({ request, params }) => {
} else {
return badRequest({ error: t("shared.invalidForm") });
}
return redirect(adminPath("accounts/roles-and-permissions/permissions", { mode: "host-aware" }));
const toastKey =
action === "delete" ? "admin.accounts.rolesAndPermissions.permissions.toast.deleted" : "admin.accounts.rolesAndPermissions.permissions.toast.updated";
return redirect(`${adminPath("accounts/roles-and-permissions/permissions", { mode: "host-aware" })}?toast=${encodeURIComponent(toastKey)}`);
};
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
@@ -15,7 +15,7 @@ type LoaderData = {
roles: RoleWithPermissions[];
};
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
export const loader = async ({ request, params: _params }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.create");
const { t } = await getTranslations(request);
@@ -70,7 +70,9 @@ export const action: ActionFunction = async ({ request }) => {
} else {
return badRequest({ error: t("shared.invalidForm") });
}
return redirect(adminPath("accounts/roles-and-permissions/permissions", { mode: "host-aware" }));
return redirect(
`${adminPath("accounts/roles-and-permissions/permissions", { mode: "host-aware" })}?toast=${encodeURIComponent("admin.accounts.rolesAndPermissions.permissions.toast.created")}`
);
};
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
@@ -21,13 +21,13 @@ describe("admin role assignment scoping", () => {
expect(source).not.toContain("deleteUserRole(userId, roleId, params.account)");
});
it("restricts admin user assignments to admin users and admin roles", () => {
it("retires legacy UserRole-based admin assignments in favor of AdminRBAC", () => {
const source = readRoute("admin-users.tsx");
expect(source).toContain("!user.admin");
expect(source).toContain('role.type !== "admin"');
expect(source).toContain("createUserRole(userId, roleId)");
expect(source).toContain("deleteUserRole(userId, roleId)");
expect(source).toContain("admin_identity.roles.read");
expect(source).toContain('adminPath("settings/admin-roles"');
expect(source).not.toContain("createUserRole");
expect(source).not.toContain("deleteUserRole");
});
it("writes clean role assignment audit details", () => {
@@ -36,13 +36,12 @@ describe("admin role assignment scoping", () => {
expect(adminUsersSource).not.toContain("${role.name}}");
expect(accountUsersSource).not.toContain("${role.name}}");
expect(adminUsersSource).toContain("`${user.email} - ${role.name}`");
expect(adminUsersSource).not.toContain("createAdminLog");
expect(accountUsersSource).toContain("`[${tenant.name}] ${user.email} - ${role.name}`");
});
it("uses render-translated stable audit action values", () => {
const routeFiles = [
"admin-users.tsx",
"account-users.$account.tsx",
"permissions/new.tsx",
"permissions/$id.tsx",
@@ -57,8 +56,6 @@ describe("admin role assignment scoping", () => {
.filter((action): action is string => typeof action === "string");
});
expect(actions).toContain("admin.adminUserRoles.created");
expect(actions).toContain("admin.adminUserRoles.deleted");
expect(actions).toContain("admin.accountUserRoles.created");
expect(actions).toContain("admin.accountUserRoles.deleted");
expect(actions).toContain("admin.roles.updated");
@@ -73,8 +70,6 @@ describe("admin role assignment scoping", () => {
expect(actions).not.toContain("Deleted");
expect(new Set(actions)).toEqual(
new Set([
"admin.adminUserRoles.created",
"admin.adminUserRoles.deleted",
"admin.accountUserRoles.created",
"admin.accountUserRoles.deleted",
"admin.permissions.created",
@@ -1,5 +1,4 @@
import { LoaderFunctionArgs, useLoaderData, useNavigate, useOutlet, useParams } from "react-router";
import { Outlet } from "react-router";
import { getTranslations } from "~/locale/i18next.server";
import RolesTable from "~/components/core/roles/RolesTable";
import { getAllRolesWithUsers, RoleWithPermissionsAndUsers } from "~/utils/db/permissions/roles.db.server";
@@ -10,7 +10,7 @@ import { deleteRole, getRole, RoleWithPermissions, updateRole } from "~/utils/db
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { useEffect } from "react";
import toast from "react-hot-toast";
import { toast } from "sonner";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
import { validateCSRFToken } from "~/utils/session.server";
@@ -78,7 +78,7 @@ export const action: ActionFunction = async ({ request, params }) => {
permissions,
})}`
);
return Response.json({ success: t("shared.updated") });
return Response.json({ success: t("admin.accounts.rolesAndPermissions.roles.toast.updated") });
} catch {
return Response.json({ error: t("admin.accounts.rolesAndPermissions.roles.errors.updateFailed") }, { status: 400 });
}
@@ -89,7 +89,9 @@ export const action: ActionFunction = async ({ request, params }) => {
} else {
return badRequest({ error: t("shared.invalidForm") });
}
return redirect(adminPath("accounts/roles-and-permissions/roles", { mode: "host-aware" }));
return redirect(
`${adminPath("accounts/roles-and-permissions/roles", { mode: "host-aware" })}?toast=${encodeURIComponent("admin.accounts.rolesAndPermissions.roles.toast.deleted")}`
);
};
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
@@ -15,7 +15,7 @@ type LoaderData = {
permissions: PermissionWithRoles[];
};
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
export const loader = async ({ request, params: _params }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.create");
const { t } = await getTranslations(request);
@@ -72,7 +72,9 @@ export const action: ActionFunction = async ({ request }) => {
} else {
return badRequest({ error: t("shared.invalidForm") });
}
return redirect(adminPath("accounts/roles-and-permissions/roles", { mode: "host-aware" }));
return redirect(
`${adminPath("accounts/roles-and-permissions/roles", { mode: "host-aware" })}?toast=${encodeURIComponent("admin.accounts.rolesAndPermissions.roles.toast.created")}`
);
};
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];