Update hivegrid-cloud reference to latest main

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
davidandClaude Fable 5 committed 2026-07-08 16:15:37 +02:00
1 parent e98d38e716
commit 7b21524c86
3781 files changed
+373484 -225607

No files matched your search

@@ -1,40 +1,25 @@
import ConfirmModal, { RefConfirmModal } from "~/components/ui/modals/ConfirmModal";
import ErrorModal, { RefErrorModal } from "~/components/ui/modals/ErrorModal";
import { Fragment, useEffect, useMemo, useRef, useState } from "react";
import { getTenant, getTenantMember, getTenantUsers, TenantUserWithUser } from "~/utils/db/tenants.db.server";
import { useEffect } from "react";
import { ActionFunction, LoaderFunctionArgs, MetaFunction, redirect, useActionData, useLoaderData } from "react-router";
import { useNavigate, useOutlet, useParams } from "react-router";
import { useNavigate, useNavigation, useOutlet, useParams, useSubmit } from "react-router";
import { useTranslation } from "react-i18next";
import toast from "react-hot-toast";
import { buildMembersListVM, type MembersListVM, type MemberStatus } from "@hivegrid/view-models";
import { getTenant, getTenantMember, getTenantUsers } from "~/utils/db/tenants.db.server";
import { deleteUserInvitation, getUserInvitation, getUserInvitations } from "~/utils/db/tenantUserInvitations.db.server";
import MemberInvitationsListAndTable from "~/components/core/settings/members/MemberInvitationsListAndTable";
import { getTranslations } from "~/locale/i18next.server";
import { useLocaleFormatters } from "~/locale/format";
import UrlUtils from "~/utils/app/UrlUtils";
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
import InputSearch from "~/components/ui/input/InputSearch";
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
import { getUserPermission, verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { useAppData } from "~/utils/data/useAppData";
import EditPageLayout from "~/components/ui/layouts/EditPageLayout";
import SettingSection from "~/components/ui/sections/SettingSection";
import { RoleWithPermissions, getAllRoles, getTenantAssignableAppRole } from "~/utils/db/permissions/roles.db.server";
import { Permission } from "@toolctrl/db/prisma-browser";
import { getUser, getUserTotpStatus } from "~/utils/db/users.db.server";
import { useTranslation } from "react-i18next";
import { getTenantAssignableAppRole, getTenantAssignableAppRoles } from "~/utils/db/permissions/roles.db.server";
import { getEnabledTotpUserIds, getUser, getUserTotpStatus } from "~/utils/db/users.db.server";
import { createAdminLog } from "~/utils/db/logs.db.server";
import { createUserRole, deleteUserRole } from "~/utils/db/permissions/userRoles.db.server";
import { createImpersonationStartedAt, createUserSession, getUserInfo, getUserSession, setLoggedUser, validateCSRFToken } from "~/utils/session.server";
import MembersListView from "~/modules/users/components/MembersListView";
import Modal from "~/components/ui/modals/Modal";
import TableSimple from "~/components/ui/tables/TableSimple";
import RoleBadge from "~/components/core/roles/RoleBadge";
import { permissionDisplayDescription, permissionDisplayName, roleDisplayName } from "~/components/core/roles/roleDisplay";
import RolesAndPermissionsMatrix from "~/components/core/roles/RolesAndPermissionsMatrix";
import { getAllPermissions } from "~/utils/db/permissions/permissions.db.server";
import { GroupWithDetails, getAllGroups, getMyGroups } from "~/utils/db/permissions/groups.db.server";
import GroupsTable from "~/components/core/roles/GroupsTable";
import SlideOverWideEmpty from "~/components/ui/slideOvers/SlideOverWideEmpty";
import { deactivateTenantUser, reactivateTenantUser } from "~/utils/services/tenantUserLifecycle.server";
import EditPageLayout from "~/components/ui/layouts/EditPageLayout";
import { MembersPage, type MembersActions } from "~/components/screens/users/MembersPage";
import { Dialog } from "~/ui/components/Dialog";
import { DefaultAppRoles } from "~/application/dtos/shared/DefaultAppRoles";
import ActionResultModal from "~/components/ui/modals/ActionResultModal";
import { useRootData } from "~/utils/data/useRootData";
import EventsService from "~/modules/events/services/.server/EventsService";
import { RoleAssignedDto } from "~/modules/events/dtos/RoleAssignedDto";
@@ -42,57 +27,77 @@ import { RoleUnassignedDto } from "~/modules/events/dtos/RoleUnassignedDto";
import { enforceAdminMfa } from "~/utils/auth/mfa/enforcement.server";
import { checkMfaStepUpState } from "~/utils/auth/mfa/step-up.server";
import { appPath } from "~/utils/app/CanonicalUrlUtils";
import { loadRequiredWebConfig } from "@toolctrl/config";
import { loadRequiredWebConfig } from "@hivegrid/config";
import { absoluteAdminPath, absoluteAppPath } from "~/utils/app/CrossHostUrls";
import { TenantUserStatus } from "~/application/enums/tenants/TenantUserStatus";
type LoaderData = {
title: string;
users: TenantUserWithUser[];
mfaEnabledUserIds: string[];
pendingInvitations: Awaited<ReturnType<typeof getUserInvitations>>;
roles: RoleWithPermissions[];
permissions: Permission[];
groups: GroupWithDetails[];
vm: MembersListVM;
canViewRoles: boolean;
};
function toMemberStatus(status: TenantUserStatus): MemberStatus {
if (status === TenantUserStatus.ACTIVE) return "active";
if (status === TenantUserStatus.INACTIVE) return "inactive";
return "invited";
}
async function hasPermission(userId: string, permissionName: string, tenantId: string): Promise<boolean> {
const { permission, userPermission } = await getUserPermission({ userId, permissionName, tenantId });
return !permission || Boolean(userPermission);
}
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
const { t } = await getTranslations(request);
const tenantId = await getTenantIdFromUrl(params);
const userInfo = await getUserInfo(request);
await verifyUserHasPermission(request, "app.settings.members.view", tenantId);
const [users, pendingInvitations, roles, permissions, groupAccess] = await Promise.all([
getTenantUsers(tenantId),
// Deactivated members stay visible with status "Deaktiviert" (David's S01/M03).
const [users, pendingInvitations, roles, canInvite, canEditRoles, canManageMembers, canViewRoles] = await Promise.all([
getTenantUsers(tenantId, { includeInactive: true }),
getUserInvitations(tenantId),
getAllRoles("app"),
getAllPermissions("app"),
getUserPermission({
userId: userInfo.userId,
permissionName: "app.settings.groups.full",
tenantId: tenantId,
}),
// Assignable defaults + the tenant's own custom/SHK roles (D01 dropdown).
getTenantAssignableAppRoles(tenantId),
hasPermission(userInfo.userId, "app.settings.members.create", tenantId),
hasPermission(userInfo.userId, "app.settings.roles.set", tenantId),
hasPermission(userInfo.userId, "app.settings.members.update", tenantId),
hasPermission(userInfo.userId, "app.settings.roles.view", tenantId),
]);
const { permission, userPermission } = groupAccess;
let groups: GroupWithDetails[];
if (!permission || userPermission) {
groups = await getAllGroups(tenantId);
} else {
groups = await getMyGroups(userInfo.userId, tenantId);
}
const mfaEnabledUserIds = new Set(await getEnabledTotpUserIds(users.map((member) => member.user.id)));
const mfaEnabledUserIds = (
await Promise.all(users.map(async (member) => ((await getUserTotpStatus(member.user.id))?.enabled ? member.user.id : null)))
).filter((id): id is string => id !== null);
const vm = buildMembersListVM({
rows: users.map((member) => ({
tenantUserId: member.id,
userId: member.userId,
firstName: member.user.firstName,
lastName: member.user.lastName,
email: member.user.email,
phone: member.user.phone,
status: toMemberStatus(member.status),
mfaEnabled: mfaEnabledUserIds.has(member.user.id),
roles: member.user.roles
.filter((userRole) => userRole.tenantId === tenantId)
.map((userRole) => ({ id: userRole.role.id, name: userRole.role.name, description: userRole.role.description })),
})),
pendingInvitations: pendingInvitations.map((invitation) => ({
id: invitation.id,
email: invitation.email,
name: [invitation.firstName, invitation.lastName].filter(Boolean).join(" "),
createdAtIso: null,
})),
assignableRoles: roles.map((role) => ({ id: role.id, name: role.name, description: role.description })),
currentUserId: userInfo.userId,
canInvite,
canEditRoles,
canManageMembers,
});
const data: LoaderData = {
title: `${t("settings.members.title")} | ${process.env.APP_NAME}`,
users,
mfaEnabledUserIds,
pendingInvitations,
roles,
permissions,
groups,
vm,
canViewRoles,
};
return data;
};
@@ -100,6 +105,8 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
type ActionData = {
success?: string;
error?: string;
/** Machine-readable guard code — "last-admin" opens the V01 blocker dialog. */
code?: string;
};
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
export const action: ActionFunction = async ({ request, params }) => {
@@ -127,6 +134,33 @@ export const action: ActionFunction = async ({ request, params }) => {
await deleteUserInvitation(invitation.id, tenantId);
return Response.json({ success: t("settings.members.success.invitationDeleted") });
}
if (action === "deactivate" || action === "reactivate") {
// R-P2b user lifecycle (M03/V01): soft-deactivation via the lifecycle service.
// Reassign-on-deactivate stays Backlog/V2 (David) — the service keeps the option.
const userId = form.get("user-id")?.toString() ?? "";
const tenant = await getTenant(tenantId);
const tenantMember = await getTenantMember(userId, tenantId);
if (!tenant || !tenantMember) {
return badRequest({ error: t("shared.invalidForm") });
}
if (action === "deactivate") {
const result = await deactivateTenantUser({ tenantId, targetUserId: userId });
if (!result.ok) {
if (result.reason === "last-admin") {
return badRequest({ error: t("settings.members.errors.lastAdminBody"), code: "last-admin" });
}
return badRequest({ error: t("shared.invalidForm") });
}
createAdminLog(request, "settings.members.deactivated", `[${tenant.name}] ${tenantMember.user.email}`);
return Response.json({ success: t("settings.members.success.deactivated") });
}
const result = await reactivateTenantUser({ tenantId, targetUserId: userId });
if (!result.ok) {
return badRequest({ error: t("shared.invalidForm") });
}
createAdminLog(request, "settings.members.reactivated", `[${tenant.name}] ${tenantMember.user.email}`);
return Response.json({ success: t("settings.members.success.reactivated") });
}
if (action === "edit") {
await verifyUserHasPermission(request, "app.settings.roles.set", tenantId);
const userId = form.get("user-id")?.toString() ?? "";
@@ -147,8 +181,10 @@ export const action: ActionFunction = async ({ request, params }) => {
const activeMembers = allMembers.filter((member) => member.status === TenantUserStatus.ACTIVE);
const superAdmins = activeMembers.filter((m) => m.user.roles.some((r) => r.tenantId === tenantId && r.role.name === DefaultAppRoles.SuperUser));
if (superAdmins.length === 1 && !add) {
// Same guard family as deactivation: the workspace must keep an admin (V01).
return badRequest({
error: t("settings.members.errors.atLeastOneSuperAdmin"),
code: "last-admin",
});
}
if (userId === userInfo.userId) {
@@ -239,184 +275,67 @@ export const action: ActionFunction = async ({ request, params }) => {
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
export default function () {
export default function MembersSettingsRoute() {
const { t } = useTranslation();
const formatters = useLocaleFormatters();
const params = useParams();
const data = useLoaderData<LoaderData>();
const actionData = useActionData<ActionData>();
const rootData = useRootData();
const appData = useAppData();
const navigate = useNavigate();
const navigation = useNavigation();
const outlet = useOutlet();
const submit = useSubmit();
const errorModal = useRef<RefErrorModal>(null);
const confirmUpgrade = useRef<RefConfirmModal>(null);
const [searchInput, setSearchInput] = useState("");
const [permissionsModalOpen, setPermissionsModalOpen] = useState(false);
const [selectedRole, setSelectedRole] = useState<RoleWithPermissions>();
const [showRolesAndPermissions, setShowRolesAndPermissions] = useState(false);
const formatPermissionCount = (count: number | undefined) => {
const value = count ?? 0;
return t("models.permission.count", { count: value, formattedCount: formatters.number(value) });
};
const submitting = navigation.state === "submitting";
const lastAdminBlocked = actionData?.code === "last-admin";
useEffect(() => {
setPermissionsModalOpen(selectedRole !== undefined);
}, [selectedRole]);
useEffect(() => {
if (!permissionsModalOpen) {
setSelectedRole(undefined);
if (actionData?.success) {
toast.success(actionData.success);
} else if (actionData?.error && actionData.code !== "last-admin") {
toast.error(actionData.error);
}
}, [permissionsModalOpen]);
}, [actionData]);
function yesUpdateSubscription() {
navigate(UrlUtils.currentTenantUrl(params, `settings/subscription`));
function post(fields: Record<string, string>) {
const formData = new FormData();
if (rootData.csrf) formData.set("csrf", rootData.csrf);
for (const [name, value] of Object.entries(fields)) {
formData.set(name, value);
}
submit(formData, { method: "post" });
}
const sortedItems = useMemo(() => {
if (!data.users) {
return [];
}
const normalizedSearch = searchInput.toUpperCase();
return data.users
.filter(
(f) =>
f.user.firstName?.toString().toUpperCase().includes(normalizedSearch) ||
f.user.lastName?.toString().toUpperCase().includes(normalizedSearch) ||
f.user.email?.toString().toUpperCase().includes(normalizedSearch) ||
f.user.phone?.toString().toUpperCase().includes(normalizedSearch)
)
.slice()
.sort((x, y) => {
return x.type > y.type ? 1 : -1;
});
}, [data.users, searchInput]);
const actions: MembersActions = {
onToggleRole: ({ userId, roleId, add }) => post({ action: "edit", "user-id": userId, "role-id": roleId, add: String(add) }),
onDeactivate: ({ userId }) => post({ action: "deactivate", "user-id": userId }),
onReactivate: ({ userId }) => post({ action: "reactivate", "user-id": userId }),
onDeleteInvitation: ({ invitationId }) => post({ action: "delete-invitation", "invitation-id": invitationId }),
onInvite: () => navigate(UrlUtils.currentTenantUrl(params, "settings/members/new")),
};
return (
<EditPageLayout>
<div data-ui-id="ui.settings.members.page" className="contents">
<SettingSection
size="lg"
title={t("settings.members.title")}
description={
<div className="flex flex-col space-y-1">
<div>{t("settings.members.description")}</div>
<div>
<button type="button" className="text-left underline" onClick={() => setShowRolesAndPermissions(true)}>
{t("settings.members.viewRolesAndPermissions")}
</button>
</div>
</div>
}
className="p-1"
>
<div className="grid grid-cols-1 space-y-2">
<div data-ui-id="ui.settings.members.search">
<InputSearch
value={searchInput}
setValue={setSearchInput}
onNewRoute={!getUserHasPermission(appData, "app.settings.members.create") ? "" : UrlUtils.currentTenantUrl(params, "settings/members/new")}
/>
</div>
<div className="space-y-2">
<div data-ui-id="ui.settings.members.table">
<MembersListView
items={sortedItems}
mfaEnabledUserIds={data.mfaEnabledUserIds}
tenantId={appData.currentTenant.id}
canEdit={getUserHasPermission(appData, "app.settings.roles.set")}
editRouteFor={(tenantUserId) => UrlUtils.currentTenantUrl(params, `settings/members/edit/${tenantUserId}`)}
rolesUrl={UrlUtils.currentTenantUrl(params, "settings/roles-and-permissions/users")}
/>
</div>
<MembersPage
vm={data.vm}
actions={actions}
rolesTabHref={data.canViewRoles ? UrlUtils.currentTenantUrl(params, "settings/roles-and-permissions/roles") : null}
editRouteFor={(tenantUserId) => UrlUtils.currentTenantUrl(params, `settings/members/edit/${tenantUserId}`)}
submitting={submitting}
lastAdminBlocked={lastAdminBlocked}
/>
<Modal open={permissionsModalOpen} setOpen={setPermissionsModalOpen}>
<div className="space-y-2">
<div className="flex items-baseline justify-between space-x-2">
<h4 className="text-lg font-bold">{selectedRole ? roleDisplayName(selectedRole, t) : undefined}</h4>
<p className="text-muted-foreground text-sm">{formatPermissionCount(selectedRole?.permissions.length)}</p>
</div>
<div className="h-96 max-h-96 overflow-y-scroll p-1">
<TableSimple
headers={[
{
name: "name",
title: t("models.permission.name"),
value: (i) => permissionDisplayName(i.permission, t),
formattedValue: (i) => <RoleBadge item={i.permission} kind="permission" />,
},
{
name: "description",
title: t("models.permission.description"),
value: (i) => permissionDisplayDescription(i.permission, t) ?? "",
},
]}
items={selectedRole?.permissions ?? []}
/>
</div>
</div>
</Modal>
<Modal size="4xl" open={showRolesAndPermissions} setOpen={setShowRolesAndPermissions}>
<div className="space-y-2">
<div className="flex items-baseline justify-between space-x-2">
<h4 className="text-lg font-bold">{t("app.sidebar.rolesAndPermissions")}</h4>
<p className="text-muted-foreground text-sm">{formatPermissionCount(data.permissions.length)}</p>
</div>
<div className="p-1">
<RolesAndPermissionsMatrix roles={data.roles} permissions={data.permissions} className="h-96 max-h-96 overflow-y-scroll" />
</div>
</div>
</Modal>
{data.pendingInvitations.length > 0 && (
<div className="space-y-1">
<label className="text-foreground/80 block text-sm font-medium">{t("settings.members.pendingInvitations")}</label>
<MemberInvitationsListAndTable items={data.pendingInvitations} canDelete={getUserHasPermission(appData, "app.settings.members.delete")} />
</div>
)}
</div>
</div>
</SettingSection>
{rootData.featureFlags?.includes("row-groups") && (
<Fragment>
{/*Separator */}
<div className="block">
<div className="py-5">
<div className="border-border border-t"></div>{" "}
</div>
</div>
<SettingSection size="lg" title={t("settings.members.groups.title")} description={t("settings.members.groups.description")} className="p-1">
<GroupsTable items={data.groups} onNewRoute="groups/new" />
</SettingSection>
</Fragment>
)}
<SlideOverWideEmpty
title={params.id ? t("settings.members.form.editTitle") : t("settings.members.form.newTitle")}
{/* Child routes (M01 invite, member edit, group forms) render in a real Dialog (S 560). */}
<Dialog
open={!!outlet}
onClose={() => {
navigate(".", { replace: true });
onOpenChange={(open: boolean) => {
if (!open) navigate(".", { replace: true });
}}
className="sm:max-w-sm"
overflowYScroll={true}
>
<div className="-mx-1 -mt-3">
<div className="space-y-4">{outlet}</div>
</div>
</SlideOverWideEmpty>
<ActionResultModal actionData={actionData} showSuccess={false} />
<ErrorModal ref={errorModal} />
<ConfirmModal ref={confirmUpgrade} onYes={yesUpdateSubscription} />
</div>
<Dialog.Content className="w-[560px] max-w-[90vw] p-6" aria-label={t("settings.members.form.newTitle")}>
<div className="w-full">{outlet}</div>
</Dialog.Content>
</Dialog>
</EditPageLayout>
);
}