Track HiveGrid Cloud planning reference

This commit is contained in:
david committed 2026-06-26 20:48:01 +02:00
1 parent b3d5ea6764
commit e341c5938a
5784 files changed
+1104929 -3

No files matched your search

@@ -0,0 +1,172 @@
import { ActionFunction, LoaderFunctionArgs, MetaFunction, redirect, useActionData, useLoaderData } from "react-router";
import { useParams, useSubmit } from "react-router";
import { useTranslation } from "react-i18next";
import { getTranslations } from "~/locale/i18next.server";
import { RoleWithPermissions, getAllRoles, getRole } from "~/utils/db/permissions/roles.db.server";
import { adminGetAllTenantUsers, adminGetAllUsers, getUser, UserWithRoles } from "~/utils/db/users.db.server";
import UserRolesTable from "~/components/core/roles/UserRolesTable";
import { Tenant } from "@toolctrl/db/prisma-browser";
import { useEffect, useState } from "react";
import InputSearch from "~/components/ui/input/InputSearch";
import { createUserRole, deleteUserRole } from "~/utils/db/permissions/userRoles.db.server";
import { getTenant, getTenantMember } from "~/utils/db/tenants.db.server";
import { createAdminLog } from "~/utils/db/logs.db.server";
import BreadcrumbSimple from "~/components/ui/breadcrumbs/BreadcrumbSimple";
import { useAdminData } from "~/utils/data/useAdminData";
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
import { validateCSRFToken } from "~/utils/session.server";
import { useRootData } from "~/utils/data/useRootData";
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
type LoaderData = {
title: string;
tenant: Tenant;
items: UserWithRoles[];
roles: RoleWithPermissions[];
};
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) {
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);
}
});
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;
};
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 tenant = await getTenant(params.account ?? "");
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 (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({});
} else {
return badRequest({ error: t("shared.invalidForm") });
}
};
export default function AdminAccountUsersFromTenant() {
const { t } = useTranslation();
const data = useLoaderData<LoaderData>();
const actionData = useActionData<ActionData>();
const adminData = useAdminData();
const rootData = useRootData();
const [items, setItems] = useState(data.items);
const submit = useSubmit();
const params = useParams();
const [searchInput, setSearchInput] = useState("");
useEffect(() => {
setItems(data.items);
}, [actionData, 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.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">
<BreadcrumbSimple
home={adminPath(undefined, { mode: "host-aware" })}
menu={[
{
title: t("admin.accounts.rolesAndPermissions.tabs.accountUsers"),
routePath: adminPath("accounts/roles-and-permissions/account-users", { mode: "host-aware" }),
},
{
title: data.tenant.name,
routePath: adminPath(`accounts/roles-and-permissions/account-users/${data.tenant.id}`, { mode: "host-aware" }),
},
]}
/>
<InputSearch value={searchInput} setValue={setSearchInput} />
<UserRolesTable
items={filteredItems()}
roles={data.roles}
onChange={onChange}
tenantId={params.account ?? ""}
disabled={!getUserHasPermission(adminData, "admin.roles.set")}
/>
</div>
);
}
@@ -0,0 +1,114 @@
import { LoaderFunctionArgs, MetaFunction } from "react-router";
import { useLoaderData } from "react-router";
import { getTranslations } from "~/locale/i18next.server";
import { adminGetAllTenants, TenantWithDetails } from "~/utils/db/tenants.db.server";
import { useTranslation } from "react-i18next";
import TableSimple from "~/components/ui/tables/TableSimple";
import { useState } from "react";
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;
tenants: TenantWithDetails[];
};
export const loader = async ({ request }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.update");
const { t } = await getTranslations(request);
const tenants = await adminGetAllTenants();
const data: LoaderData = {
title: `${t("admin.accounts.rolesAndPermissions.tabs.accountUsers")} | ${process.env.APP_NAME}`,
tenants,
};
return data;
};
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
export default function AdminRolesAndPermissionsAccountUsersRoute() {
const { i18n, t } = useTranslation();
const formatters = useLocaleFormatters();
const data = useLoaderData<LoaderData>();
const [searchInput, setSearchInput] = useState("");
const filteredItems = () => {
if (!data.tenants) {
return [];
}
return data.tenants.filter(
(f) =>
f.name?.toString().toUpperCase().includes(searchInput.toUpperCase()) ||
f.users.find(
(x) =>
x.user.email?.toString().toUpperCase().includes(searchInput.toUpperCase()) ||
x.user.firstName?.toString().toUpperCase().includes(searchInput.toUpperCase()) ||
x.user.lastName?.toString().toUpperCase().includes(searchInput.toUpperCase())
)
);
};
return (
<div className="space-y-2">
<InputSearch value={searchInput} setValue={setSearchInput} />
<TableSimple
items={filteredItems()}
headers={[
{
name: "tenant",
title: t("models.tenant.object"),
value: (i) => (
<div className="max-w-sm truncate">
<div className="text-foreground flex items-center space-x-1 truncate font-medium">{i.name}</div>
<div className="text-muted-foreground text-xs">
<span>/{i.slug}</span>
</div>
</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"),
className: "max-w-xs truncate",
value: (i) => i.users.map((f) => f.user.email).join(", "),
href: (i) => adminPath(`accounts/users?tenantId=${i.id}`, { mode: "host-aware" }),
},
{
name: "createdAt",
title: t("shared.createdAt"),
value: (i) => i.createdAt,
formattedValue: (item) => (
<div className="flex flex-col">
<div>{formatters.date(item.createdAt, { dateStyle: "medium" })}</div>
<div className="text-xs">{formatters.relativeDate(item.createdAt)}</div>
</div>
),
},
]}
actions={[
{
title: t("shared.setUserRoles"),
onClickRoute: (_, item) => `${item.id}`,
},
]}
/>
</div>
);
}
@@ -0,0 +1,123 @@
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";
type LoaderData = {
title: string;
items: UserWithDetails[];
roles: RoleWithPermissions[];
};
export const loader = async ({ request }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.update");
const { t } = await getTranslations(request);
const items = (await adminGetAllUsers()).items.filter((f) => f.admin);
const roles = await getAllRoles("admin");
const data: LoaderData = {
title: `${t("admin.accounts.rolesAndPermissions.tabs.adminUsers")} | ${process.env.APP_NAME}`,
items,
roles,
};
return data;
};
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>
);
}
@@ -0,0 +1,129 @@
import { ActionFunctionArgs, LoaderFunctionArgs, 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";
import { useAdminData } from "~/utils/data/useAdminData";
import { getFiltersFromCurrentUrl } from "~/utils/helpers/RowPaginationHelper";
import { getAllRolesNames } from "~/utils/db/permissions/roles.db.server";
import { FilterablePropertyDto } from "~/application/dtos/data/FilterablePropertyDto";
import InputSearchWithURL from "~/components/ui/input/InputSearchWithURL";
import InputFilters from "~/components/ui/input/InputFilters";
import ButtonPrimary from "~/components/ui/buttons/ButtonPrimary";
import { serverTimingHeaders } from "~/modules/metrics/utils/defaultHeaders";
import { createMetrics } from "~/modules/metrics/services/.server/MetricTracker";
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { v2MetaFunction } from "~/utils/compat/v2MetaFunction";
import SlideOverWideEmpty from "~/components/ui/slideOvers/SlideOverWideEmpty";
import { validateCSRFToken } from "~/utils/session.server";
import { useTranslation } from "react-i18next";
export { serverTimingHeaders as headers };
export const meta: v2MetaFunction<LoaderData> = ({ data }) => [{ title: data?.title }];
type LoaderData = {
title: string;
items: PermissionWithRoles[];
filterableProperties: FilterablePropertyDto[];
};
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.view");
const { time, getServerTimingHeader } = await createMetrics({ request, params }, "admin.roles-and-permissions.permissions");
let { t } = await getTranslations(request);
const filterableProperties: FilterablePropertyDto[] = [
{ name: "name", title: "models.permission.name" },
{ name: "description", title: "models.permission.description" },
{
name: "roleId",
title: "models.role.object",
manual: true,
options: (await time(getAllRolesNames(), "getAllRolesNames")).map((item) => {
return {
value: item.id,
name: item.name,
};
}),
},
];
const filters = getFiltersFromCurrentUrl(request, filterableProperties);
const items = await time(getAllPermissions(undefined, filters), "getAllPermissions");
const data: LoaderData = {
title: `${t("models.permission.plural")} | ${process.env.APP_NAME}`,
items,
filterableProperties,
};
return Response.json(data, { headers: getServerTimingHeader() });
};
type ActionData = {
items?: PermissionWithRoles[];
};
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();
if (action === "set-orders") {
const items: { id: string; order: number }[] = form.getAll("orders[]").map((f: FormDataEntryValue) => {
return JSON.parse(f.toString());
});
await Promise.all(
items.map(async ({ id, order }) => {
await updatePermission(id, { order: Number(order) });
})
);
return Response.json({ items: await getAllPermissions() });
} else {
return Response.json({ error: t("shared.invalidForm") }, { status: 400 });
}
};
export default function () {
const data = useLoaderData<LoaderData>();
const actionData = useLoaderData<ActionData>();
const adminData = useAdminData();
const navigate = useNavigate();
const outlet = useOutlet();
const params = useParams();
const { t } = useTranslation();
return (
<div className="space-y-2">
<div className="flex space-x-2">
<div className="grow">
<InputSearchWithURL />
</div>
<InputFilters filters={data.filterableProperties} />
<ButtonPrimary to="new">
<div className="sm:text-sm">+</div>
</ButtonPrimary>
</div>
<PermissionsTable
// canReorder={true}
items={actionData?.items ?? data.items}
canCreate={getUserHasPermission(adminData, "admin.roles.create")}
canUpdate={getUserHasPermission(adminData, "admin.roles.update")}
/>
<SlideOverWideEmpty
title={params.id ? t("shared.edit") : t("shared.new")}
open={!!outlet}
onClose={() => {
navigate(".", { replace: true });
}}
className="sm:max-w-lg"
overflowYScroll={true}
>
<div className="-mx-1 -mt-3">
<div className="space-y-4">{outlet}</div>
</div>
</SlideOverWideEmpty>
</div>
);
}
@@ -0,0 +1,102 @@
import { ActionFunction, LoaderFunctionArgs, MetaFunction, redirect, useLoaderData } from "react-router";
import { useNavigate } from "react-router";
import PermissionForm from "~/components/core/roles/PermissionForm";
import { getTranslations } from "~/locale/i18next.server";
import { useAdminData } from "~/utils/data/useAdminData";
import { createAdminLog } from "~/utils/db/logs.db.server";
import { deletePermission, getPermission, PermissionWithRoles, updatePermission } from "~/utils/db/permissions/permissions.db.server";
import { setPermissionRoles } from "~/utils/db/permissions/rolePermissions.db.server";
import { getAllRoles, RoleWithPermissions } from "~/utils/db/permissions/roles.db.server";
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
import { validateCSRFToken } from "~/utils/session.server";
type LoaderData = {
title: string;
item: PermissionWithRoles;
roles: RoleWithPermissions[];
};
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.view");
const { t } = await getTranslations(request);
const item = await getPermission(params.id ?? "");
if (!item) {
throw redirect(adminPath("accounts/roles-and-permissions/permissions", { mode: "host-aware" }));
}
const roles = await getAllRoles();
const data: LoaderData = {
title: `${item.name} | ${t("models.permission.object")} | ${process.env.APP_NAME}`,
item,
roles,
};
return data;
};
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.update");
const { t } = await getTranslations(request);
const existing = await getPermission(params.id ?? "");
if (!existing) {
return redirect(adminPath("accounts/roles-and-permissions/permissions", { mode: "host-aware" }));
}
await validateCSRFToken(request);
const form = await request.formData();
const action = form.get("action")?.toString() ?? "";
if (action === "edit") {
const name = form.get("name")?.toString() ?? "";
const description = form.get("description")?.toString() ?? "";
const type: "admin" | "app" = form.get("type")?.toString() === "admin" ? "admin" : "app";
const roles = form.getAll("roles[]").map((f) => f.toString());
const data = {
name,
description,
type,
};
await updatePermission(existing.id, data);
await setPermissionRoles(existing.id, roles);
createAdminLog(
request,
"admin.permissions.updated",
`${existing.name}: ${JSON.stringify({
...data,
roles,
})}`
);
} else if (action === "delete") {
await verifyUserHasPermission(request, "admin.roles.delete");
await deletePermission(existing.id);
createAdminLog(request, "admin.permissions.deleted", `${existing.name}`);
} else {
return badRequest({ error: t("shared.invalidForm") });
}
return redirect(adminPath("accounts/roles-and-permissions/permissions", { mode: "host-aware" }));
};
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
export default function AdminEditPermissionRoute() {
const data = useLoaderData<LoaderData>();
const adminData = useAdminData();
const navigate = useNavigate();
function goBack() {
navigate(adminPath("accounts/roles-and-permissions/permissions", { mode: "host-aware" }));
}
return (
<PermissionForm
item={data.item}
roles={data.roles}
onCancel={goBack}
canUpdate={getUserHasPermission(adminData, "admin.roles.update")}
canDelete={getUserHasPermission(adminData, "admin.roles.delete")}
/>
);
}
@@ -0,0 +1,86 @@
import { ActionFunction, LoaderFunctionArgs, MetaFunction, redirect, useLoaderData } from "react-router";
import { useNavigate } from "react-router";
import PermissionForm from "~/components/core/roles/PermissionForm";
import { getTranslations } from "~/locale/i18next.server";
import { createAdminLog } from "~/utils/db/logs.db.server";
import { createPermission, getNextPermissionsOrder, getPermissionName } from "~/utils/db/permissions/permissions.db.server";
import { setPermissionRoles } from "~/utils/db/permissions/rolePermissions.db.server";
import { getAllRoles, RoleWithPermissions } from "~/utils/db/permissions/roles.db.server";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
import { validateCSRFToken } from "~/utils/session.server";
type LoaderData = {
title: string;
roles: RoleWithPermissions[];
};
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.create");
const { t } = await getTranslations(request);
const roles = await getAllRoles();
const data: LoaderData = {
title: `${t("models.permission.object")} | ${process.env.APP_NAME}`,
roles,
};
return data;
};
type ActionData = {
error?: string;
};
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
export const action: ActionFunction = async ({ request }) => {
await verifyUserHasPermission(request, "admin.roles.create");
const { t } = await getTranslations(request);
await validateCSRFToken(request);
const form = await request.formData();
const action = form.get("action")?.toString() ?? "";
if (action === "create") {
const name = form.get("name")?.toString() ?? "";
const description = form.get("description")?.toString() ?? "";
const type: "admin" | "app" = form.get("type")?.toString() === "admin" ? "admin" : "app";
const roles = form.getAll("roles[]").map((f) => f.toString());
const existing = await getPermissionName(name);
if (existing) {
return badRequest({ error: t("admin.accounts.rolesAndPermissions.permissions.errors.existingPermission", { name }) });
}
const order = await getNextPermissionsOrder(type);
const data = {
order,
name,
description,
type,
isDefault: false,
entityId: null,
};
const permission = await createPermission(data);
await setPermissionRoles(permission.id, roles);
createAdminLog(
request,
"admin.permissions.created",
`${JSON.stringify({
...data,
roles,
})}`
);
} else {
return badRequest({ error: t("shared.invalidForm") });
}
return redirect(adminPath("accounts/roles-and-permissions/permissions", { mode: "host-aware" }));
};
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
export default function AdminEditPermissionRoute() {
const data = useLoaderData<LoaderData>();
const navigate = useNavigate();
function goBack() {
navigate(adminPath("accounts/roles-and-permissions/permissions", { mode: "host-aware" }));
}
return <PermissionForm roles={data.roles} onCancel={goBack} />;
}
@@ -0,0 +1,89 @@
import fs from "node:fs";
import path from "node:path";
import { describe, expect, it } from "vitest";
const routeRoot = path.resolve(process.cwd(), "apps/web/app/routes/admin/accounts/roles-and-permissions");
function readRoute(relativePath: string) {
return fs.readFileSync(path.join(routeRoot, relativePath), "utf8");
}
describe("admin role assignment scoping", () => {
it("restricts account user assignments to app roles and tenant members or admins", () => {
const source = readRoute("account-users.$account.tsx");
expect(source).toContain("getTenantMember");
expect(source).toContain('role.type !== "app"');
expect(source).toContain("!user.admin && !tenantMember");
expect(source).toContain("createUserRole(userId, roleId, tenant.id)");
expect(source).toContain("deleteUserRole(userId, roleId, tenant.id)");
expect(source).not.toContain("createUserRole(userId, roleId, params.account)");
expect(source).not.toContain("deleteUserRole(userId, roleId, params.account)");
});
it("restricts admin user assignments to admin users and admin roles", () => {
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)");
});
it("writes clean role assignment audit details", () => {
const adminUsersSource = readRoute("admin-users.tsx");
const accountUsersSource = readRoute("account-users.$account.tsx");
expect(adminUsersSource).not.toContain("${role.name}}");
expect(accountUsersSource).not.toContain("${role.name}}");
expect(adminUsersSource).toContain("`${user.email} - ${role.name}`");
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",
"roles/new.tsx",
"roles/$id.tsx",
];
const actions = routeFiles.flatMap((file) => {
const source = readRoute(file);
return Array.from(source.matchAll(/createAdminLog\s*\(\s*request,\s*"([^"]+)"/gu))
.map((match) => match[1])
.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");
expect(actions).toContain("admin.permissions.created");
expect(actions).toContain("admin.permissions.updated");
expect(actions).toContain("admin.permissions.deleted");
expect(actions).toContain("admin.roles.created");
expect(actions).toContain("admin.roles.deleted");
expect(actions).not.toContain("Create");
expect(actions).not.toContain("Created");
expect(actions).not.toContain("Updated");
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",
"admin.permissions.updated",
"admin.permissions.deleted",
"admin.roles.created",
"admin.roles.updated",
"admin.roles.deleted",
])
);
});
});
@@ -0,0 +1,98 @@
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";
import { useAdminData } from "~/utils/data/useAdminData";
import { FilterablePropertyDto } from "~/application/dtos/data/FilterablePropertyDto";
import { getFiltersFromCurrentUrl } from "~/utils/helpers/RowPaginationHelper";
import InputFilters from "~/components/ui/input/InputFilters";
import InputSearchWithURL from "~/components/ui/input/InputSearchWithURL";
import { getAllPermissionsIdsAndNames } from "~/utils/db/permissions/permissions.db.server";
import ButtonPrimary from "~/components/ui/buttons/ButtonPrimary";
import { createMetrics } from "~/modules/metrics/services/.server/MetricTracker";
import { serverTimingHeaders } from "~/modules/metrics/utils/defaultHeaders";
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { v2MetaFunction } from "~/utils/compat/v2MetaFunction";
import SlideOverWideEmpty from "~/components/ui/slideOvers/SlideOverWideEmpty";
import { useTranslation } from "react-i18next";
export { serverTimingHeaders as headers };
export const meta: v2MetaFunction<LoaderData> = ({ data }) => [{ title: data?.title }];
type LoaderData = {
title: string;
items: RoleWithPermissionsAndUsers[];
filterableProperties: FilterablePropertyDto[];
};
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.view");
const { time, getServerTimingHeader } = await createMetrics({ request, params }, "admin.roles-and-permissions.roles");
let { t } = await getTranslations(request);
const filterableProperties: FilterablePropertyDto[] = [
{ name: "name", title: "models.role.name" },
{ name: "description", title: "models.role.description" },
{
name: "permissionId",
title: "models.permission.object",
manual: true,
options: (await time(getAllPermissionsIdsAndNames(), "getAllPermissionsIdsAndNames")).map((item) => {
return {
value: item.id,
name: item.name,
};
}),
},
];
const filters = getFiltersFromCurrentUrl(request, filterableProperties);
const items = await time(getAllRolesWithUsers(undefined, filters), "getAllRolesWithUsers");
const data: LoaderData = {
title: `${t("models.role.plural")} | ${process.env.APP_NAME}`,
items,
filterableProperties,
};
return Response.json(data, { headers: getServerTimingHeader() });
};
export default function () {
const data = useLoaderData<LoaderData>();
const adminData = useAdminData();
const navigate = useNavigate();
const outlet = useOutlet();
const params = useParams();
const { t } = useTranslation();
return (
<div className="space-y-2">
<div className="flex space-x-2">
<div className="grow">
<InputSearchWithURL />
</div>
<InputFilters filters={data.filterableProperties} />
<ButtonPrimary to="new">
<div className="sm:text-sm">+</div>
</ButtonPrimary>
</div>
{/* <InputSearchWithURL onNewRoute={getUserHasPermission(adminData, "admin.roles.create") ? "new" : undefined} /> */}
<RolesTable items={data.items} canUpdate={getUserHasPermission(adminData, "admin.roles.update")} />
<SlideOverWideEmpty
title={params.id ? t("shared.edit") : t("shared.new")}
open={!!outlet}
onClose={() => {
navigate(".", { replace: true });
}}
className="sm:max-w-lg"
overflowYScroll={true}
>
<div className="-mx-1 -mt-3">
<div className="space-y-4">{outlet}</div>
</div>
</SlideOverWideEmpty>
</div>
);
}
@@ -0,0 +1,123 @@
import { ActionFunction, LoaderFunctionArgs, MetaFunction, redirect, useActionData, useLoaderData } from "react-router";
import { useNavigate } from "react-router";
import RoleForm from "~/components/core/roles/RoleForm";
import { getTranslations } from "~/locale/i18next.server";
import { useAdminData } from "~/utils/data/useAdminData";
import { createAdminLog } from "~/utils/db/logs.db.server";
import { getAllPermissions, PermissionWithRoles } from "~/utils/db/permissions/permissions.db.server";
import { setRolePermissions } from "~/utils/db/permissions/rolePermissions.db.server";
import { deleteRole, getRole, RoleWithPermissions, updateRole } from "~/utils/db/permissions/roles.db.server";
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { useEffect } from "react";
import toast from "react-hot-toast";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
import { validateCSRFToken } from "~/utils/session.server";
type LoaderData = {
title: string;
item: RoleWithPermissions;
permissions: PermissionWithRoles[];
};
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.update");
const { t } = await getTranslations(request);
const item = await getRole(params.id ?? "");
if (!item) {
throw redirect(adminPath("accounts/roles-and-permissions/roles", { mode: "host-aware" }));
}
const permissions = await getAllPermissions();
const data: LoaderData = {
title: `${item.name} | ${t("models.role.object")} | ${process.env.APP_NAME}`,
item,
permissions,
};
return data;
};
type ActionData = {
success?: string;
error?: string;
};
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
export const action: ActionFunction = async ({ request, params }) => {
await verifyUserHasPermission(request, "admin.roles.update");
const { t } = await getTranslations(request);
const existing = await getRole(params.id ?? "");
if (!existing) {
return redirect(adminPath("accounts/roles-and-permissions/roles", { mode: "host-aware" }));
}
await validateCSRFToken(request);
const form = await request.formData();
const action = form.get("action")?.toString() ?? "";
if (action === "edit") {
await verifyUserHasPermission(request, "admin.roles.update");
const name = form.get("name")?.toString() ?? "";
const description = form.get("description")?.toString() ?? "";
const assignToNewUsers = Boolean(form.get("assign-to-new-users"));
const type: "admin" | "app" = form.get("type")?.toString() === "admin" ? "admin" : "app";
const permissions = form.getAll("permissions[]").map((f) => f.toString());
const data = {
name,
description,
assignToNewUsers,
type,
};
try {
await updateRole(existing.id, data);
await setRolePermissions(existing.id, permissions);
createAdminLog(
request,
"admin.roles.updated",
`${existing.name}: ${JSON.stringify({
...data,
permissions,
})}`
);
return Response.json({ success: t("shared.updated") });
} catch {
return Response.json({ error: t("admin.accounts.rolesAndPermissions.roles.errors.updateFailed") }, { status: 400 });
}
} else if (action === "delete") {
await verifyUserHasPermission(request, "admin.roles.delete");
await deleteRole(existing.id);
createAdminLog(request, "admin.roles.deleted", `${existing.name}`);
} else {
return badRequest({ error: t("shared.invalidForm") });
}
return redirect(adminPath("accounts/roles-and-permissions/roles", { mode: "host-aware" }));
};
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
export default function AdminEditRoleRoute() {
const data = useLoaderData<LoaderData>();
const actionData = useActionData<ActionData>();
const adminData = useAdminData();
const navigate = useNavigate();
useEffect(() => {
if (actionData?.success) {
toast.success(actionData.success);
} else if (actionData?.error) {
toast.error(actionData.error);
}
}, [actionData]);
function goBack() {
navigate(adminPath("accounts/roles-and-permissions/roles", { mode: "host-aware" }));
}
return (
<RoleForm
item={data.item}
permissions={data.permissions}
onCancel={goBack}
canUpdate={getUserHasPermission(adminData, "admin.roles.update")}
canDelete={getUserHasPermission(adminData, "admin.roles.delete")}
/>
);
}
@@ -0,0 +1,87 @@
import { ActionFunction, LoaderFunctionArgs, MetaFunction, redirect, useLoaderData } from "react-router";
import { useNavigate } from "react-router";
import RoleForm from "~/components/core/roles/RoleForm";
import { getTranslations } from "~/locale/i18next.server";
import { createAdminLog } from "~/utils/db/logs.db.server";
import { getAllPermissions, PermissionWithRoles } from "~/utils/db/permissions/permissions.db.server";
import { setRolePermissions } from "~/utils/db/permissions/rolePermissions.db.server";
import { createRole, getNextRolesOrder, getRoleByName } from "~/utils/db/permissions/roles.db.server";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
import { validateCSRFToken } from "~/utils/session.server";
type LoaderData = {
title: string;
permissions: PermissionWithRoles[];
};
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.create");
const { t } = await getTranslations(request);
const permissions = await getAllPermissions();
const data: LoaderData = {
title: `${t("models.role.object")} | ${process.env.APP_NAME}`,
permissions,
};
return data;
};
type ActionData = {
error?: string;
};
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
export const action: ActionFunction = async ({ request }) => {
await verifyUserHasPermission(request, "admin.roles.create");
const { t } = await getTranslations(request);
await validateCSRFToken(request);
const form = await request.formData();
const action = form.get("action")?.toString() ?? "";
if (action === "create") {
const name = form.get("name")?.toString() ?? "";
const description = form.get("description")?.toString() ?? "";
const assignToNewUsers = Boolean(form.get("assign-to-new-users"));
const type: "admin" | "app" = form.get("type")?.toString() === "admin" ? "admin" : "app";
const permissions = form.getAll("permissions[]").map((f) => f.toString());
const existing = await getRoleByName(name);
if (existing) {
return badRequest({ error: t("admin.accounts.rolesAndPermissions.roles.errors.existingRole", { name }) });
}
const order = await getNextRolesOrder(type);
const data = {
order,
name,
description,
assignToNewUsers,
type,
isDefault: false,
};
const role = await createRole(data);
await setRolePermissions(role.id, permissions);
createAdminLog(
request,
"admin.roles.created",
`${JSON.stringify({
...data,
permissions,
})}`
);
} else {
return badRequest({ error: t("shared.invalidForm") });
}
return redirect(adminPath("accounts/roles-and-permissions/roles", { mode: "host-aware" }));
};
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
export default function AdminNewRoleRoute() {
const data = useLoaderData<LoaderData>();
const navigate = useNavigate();
function goBack() {
navigate(adminPath("accounts/roles-and-permissions/roles", { mode: "host-aware" }));
}
return <RoleForm permissions={data.permissions} onCancel={goBack} />;
}
@@ -0,0 +1,207 @@
import { ActionFunction, LoaderFunctionArgs, MetaFunction } from "react-router";
import { useActionData, useLoaderData, useSubmit } from "react-router";
import { getTranslations } from "~/locale/i18next.server";
import { useTranslation } from "react-i18next";
import { useEffect, useRef } from "react";
import {
CreatePermissionDto,
CreateRoleDto,
defaultAdminRoles,
defaultAppRoles,
defaultPermissions,
seedRolesAndPermissions,
} from "~/utils/services/rolesAndPermissionsService";
import { useAppOrAdminData } from "~/utils/data/useAppOrAdminData";
import ConfirmModal, { RefConfirmModal } from "~/components/ui/modals/ConfirmModal";
import InputGroup from "~/components/ui/forms/InputGroup";
import ButtonSecondary from "~/components/ui/buttons/ButtonSecondary";
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
import ServerError from "~/components/ui/errors/ServerError";
import { getAllRolesNames } from "~/utils/db/permissions/roles.db.server";
import { getAllPermissionsIdsAndNames } from "~/utils/db/permissions/permissions.db.server";
import TableSimple from "~/components/ui/tables/TableSimple";
import EditPageLayout from "~/components/ui/layouts/EditPageLayout";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { toast } from "sonner";
import { validateCSRFToken } from "~/utils/session.server";
import { appendCSRFToken } from "~/utils/csrf";
type LoaderData = {
title: string;
roles: {
all: CreateRoleDto[];
missing: CreateRoleDto[];
};
permissions: {
all: CreatePermissionDto[];
missing: CreatePermissionDto[];
};
};
export const loader = async ({ request }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.roles.view");
const { t } = await getTranslations(request);
const roles: { all: CreateRoleDto[]; missing: CreateRoleDto[] } = {
all: [...defaultAppRoles, ...defaultAdminRoles],
missing: [],
};
const createdRoles = await getAllRolesNames();
roles.all.forEach((role) => {
const existing = createdRoles.find((r) => r.name === role.name);
if (!existing) {
roles.missing.push(role);
}
});
const permissions: { all: CreatePermissionDto[]; missing: CreatePermissionDto[] } = {
all: defaultPermissions,
missing: [],
};
const createdPermissions = await getAllPermissionsIdsAndNames();
permissions.all.forEach((permission) => {
const existing = createdPermissions.find((r) => r.name === permission.name);
if (!existing) {
permissions.missing.push(permission);
}
});
const data: LoaderData = {
title: t("admin.accounts.rolesAndPermissions.seed.metaTitle", { appName: process.env.APP_NAME }),
roles,
permissions,
};
return data;
};
type ActionData = {
success?: string;
error?: string;
};
export const action: ActionFunction = async ({ request }) => {
await verifyUserHasPermission(request, "admin.roles.update");
const { t } = await getTranslations(request);
await validateCSRFToken(request);
const form = await request.formData();
const action = form.get("action");
if (action === "seed") {
try {
await seedRolesAndPermissions();
return Response.json({ success: t("admin.accounts.rolesAndPermissions.seed.actions.seeded") }, { status: 200 });
} catch (error) {
// eslint-disable-next-line no-console
console.error(error);
return Response.json({ error: t("shared.unexpectedError") }, { status: 500 });
}
} else {
return Response.json({ error: t("shared.invalidForm") }, { status: 400 });
}
};
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
export default function () {
const { t } = useTranslation();
const data = useLoaderData<LoaderData>();
const actionData = useActionData<ActionData>();
const appOrAdminData = useAppOrAdminData();
const submit = useSubmit();
const modalConfirmSeed = useRef<RefConfirmModal>(null);
useEffect(() => {
if (actionData?.success) {
toast.success(actionData?.success);
} else if (actionData?.error) {
toast.error(actionData?.error);
}
}, [actionData]);
function onSeed() {
modalConfirmSeed.current?.show(
t("admin.accounts.rolesAndPermissions.seed.confirm.title"),
t("shared.confirm"),
t("shared.back"),
t("admin.accounts.rolesAndPermissions.seed.confirm.description")
);
}
function onConfirmSeed() {
const form = new FormData();
appendCSRFToken(form);
form.set("action", "seed");
submit(form, {
method: "post",
});
}
return (
<EditPageLayout>
<InputGroup title={t("admin.accounts.rolesAndPermissions.seed.missingTitle")}>
<div className="space-y-2">
<h3 className="text-foreground text-lg font-medium">{t("models.role.plural")}</h3>
<TableSimple
items={data.roles.missing}
headers={[
{
name: "type",
title: t("shared.type"),
value: (i) => i.type,
},
{
name: "name",
title: t("shared.name"),
value: (i) => i.name,
className: "w-full",
},
]}
/>
<h3 className="text-foreground text-lg font-medium">{t("models.permission.plural")}</h3>
<TableSimple
items={data.permissions.missing}
headers={[
{
name: "type",
title: t("shared.type"),
value: (i) => i.type,
},
{
name: "name",
title: t("shared.name"),
value: (i) => i.name,
},
{
name: "description",
title: t("shared.description"),
value: (i) => i.description,
className: "w-full",
},
{
name: "inRoles",
title: t("models.permission.inRoles"),
value: (i) => i.inRoles.join(", "),
},
]}
/>
<div className="flex justify-end">
<ButtonSecondary disabled={!getUserHasPermission(appOrAdminData, "admin.roles.update")} destructive onClick={onSeed}>
{t("admin.accounts.rolesAndPermissions.seed.button", {
rolesMissing: data.roles.missing.length,
rolesTotal: data.roles.all.length,
permissionsMissing: data.permissions.missing.length,
permissionsTotal: data.permissions.all.length,
})}
</ButtonSecondary>
</div>
</div>
</InputGroup>
<ConfirmModal ref={modalConfirmSeed} onYes={onConfirmSeed} />
</EditPageLayout>
);
}
export function ErrorBoundary() {
return <ServerError />;
}