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,308 @@
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useEffect, useRef } from "react";
|
||||
import { TenantUserType } from "~/application/enums/tenants/TenantUserType";
|
||||
import ConfirmModal, { RefConfirmModal } from "~/components/ui/modals/ConfirmModal";
|
||||
import ErrorModal, { RefErrorModal } from "~/components/ui/modals/ErrorModal";
|
||||
import SuccessModal, { RefSuccessModal } from "~/components/ui/modals/SuccessModal";
|
||||
import { useEscapeKeypress } from "~/utils/shared/KeypressUtils";
|
||||
import type { TenantUser, User } from "@toolctrl/db/prisma-browser";
|
||||
import { ActionFunction, LoaderFunctionArgs, MetaFunction, redirect, useLoaderData } from "react-router";
|
||||
import { Form, useActionData, useParams, useSubmit, useNavigation, useNavigate } from "react-router";
|
||||
import { deleteTenantUser, getTenantUser, getTenantUsers } from "~/utils/db/tenants.db.server";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import clsx from "clsx";
|
||||
import { useAppData } from "~/utils/data/useAppData";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import ButtonSecondary from "~/components/ui/buttons/ButtonSecondary";
|
||||
import InputText from "~/components/ui/input/InputText";
|
||||
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
|
||||
import { MetaTagsDto } from "~/application/dtos/seo/MetaTagsDto";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getUserInfo, validateCSRFToken } from "~/utils/session.server";
|
||||
import { useRootData } from "~/utils/data/useRootData";
|
||||
import { DefaultAppRoles } from "~/application/dtos/shared/DefaultAppRoles";
|
||||
import { TenantUserStatus } from "~/application/enums/tenants/TenantUserStatus";
|
||||
|
||||
type LoaderData = {
|
||||
metatags: MetaTagsDto;
|
||||
member: (TenantUser & { user: User }) | null;
|
||||
};
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.members.update", tenantId);
|
||||
const { t } = await getTranslations(request);
|
||||
|
||||
const member = await getTenantUser(params.id, tenantId);
|
||||
const data: LoaderData = {
|
||||
metatags: [{ title: `${t("settings.members.actions.edit")} | ${process.env.APP_NAME}` }],
|
||||
member,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
type ActionData = {
|
||||
error?: string;
|
||||
success?: string;
|
||||
fields?: {
|
||||
email: string;
|
||||
firstName: string;
|
||||
lastName: string;
|
||||
role: number;
|
||||
};
|
||||
};
|
||||
|
||||
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
|
||||
export const action: ActionFunction = async ({ request, params }) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.members.update", tenantId);
|
||||
await validateCSRFToken(request);
|
||||
const { t } = await getTranslations(request);
|
||||
const userInfo = await getUserInfo(request);
|
||||
// const tenantId = await getTenantIdFromUrl(params);
|
||||
|
||||
const { id } = params;
|
||||
if (!id) {
|
||||
return badRequest({
|
||||
error: t("shared.notFound"),
|
||||
});
|
||||
}
|
||||
const form = await request.formData();
|
||||
const action = form.get("action")?.toString();
|
||||
// const email = form.get("email")?.toString().toLowerCase().trim();
|
||||
// const firstName = form.get("firstName")?.toString() ?? "";
|
||||
// const lastName = Number(form.get("lastName")) ?? "";
|
||||
|
||||
// const tenantUsers = await getTenantUsers(tenantId);
|
||||
// const owners = tenantUsers?.filter((f) => f.type === TenantUserType.OWNER);
|
||||
// if (owners?.length === 1 && owners?.find((f) => f.user.email === email) && type !== TenantUserType.OWNER) {
|
||||
// return badRequest({
|
||||
// error: t("api.errors.cannotBeWithoutOwner"),
|
||||
// });
|
||||
// }
|
||||
|
||||
if (action === "edit") {
|
||||
const tenantUser = await getTenantUser(id, tenantId);
|
||||
if (!tenantUser) {
|
||||
return badRequest({
|
||||
error: t("shared.notFound"),
|
||||
});
|
||||
}
|
||||
|
||||
return redirect(UrlUtils.currentTenantUrl(params, "settings/members"));
|
||||
} else if (action === "delete") {
|
||||
await verifyUserHasPermission(request, "app.settings.members.delete", tenantId);
|
||||
const tenantUser = await getTenantUser(id, tenantId);
|
||||
if (!tenantUser) {
|
||||
return badRequest({
|
||||
error: t("shared.notFound"),
|
||||
});
|
||||
}
|
||||
if (tenantUser.userId === userInfo.userId) {
|
||||
return badRequest({
|
||||
error: t("settings.members.errors.cannotRemoveSelf"),
|
||||
});
|
||||
}
|
||||
|
||||
const allMembers = await getTenantUsers(tenantId);
|
||||
const targetMember = allMembers.find((member) => member.id === tenantUser.id);
|
||||
const targetIsSuperUser = targetMember?.user.roles.some((role) => role.tenantId === tenantId && role.role.name === DefaultAppRoles.SuperUser) ?? false;
|
||||
if (targetIsSuperUser) {
|
||||
const activeMembers = allMembers.filter((member) => member.status === TenantUserStatus.ACTIVE);
|
||||
const superUsers = activeMembers.filter((member) =>
|
||||
member.user.roles.some((role) => role.tenantId === tenantId && role.role.name === DefaultAppRoles.SuperUser)
|
||||
);
|
||||
if (superUsers.length <= 1) {
|
||||
return badRequest({
|
||||
error: t("settings.members.errors.atLeastOneSuperAdmin"),
|
||||
});
|
||||
}
|
||||
}
|
||||
try {
|
||||
const deleted = await deleteTenantUser(id, tenantId);
|
||||
if ("count" in deleted && deleted.count !== 1) {
|
||||
return badRequest({
|
||||
error: t("shared.notFound"),
|
||||
});
|
||||
}
|
||||
} catch (e: any) {
|
||||
return badRequest({
|
||||
error: e.toString(),
|
||||
});
|
||||
}
|
||||
return redirect(UrlUtils.currentTenantUrl(params, "settings/members"));
|
||||
}
|
||||
};
|
||||
|
||||
export const meta: MetaFunction<typeof loader> = ({ data }) => data?.metatags ?? [];
|
||||
|
||||
interface Props {
|
||||
maxSize?: string;
|
||||
}
|
||||
|
||||
export default function EditMemberRoute({ maxSize = "sm:max-w-lg" }: Props) {
|
||||
const params = useParams();
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const actionData = useActionData<ActionData>();
|
||||
const appData = useAppData();
|
||||
const rootData = useRootData();
|
||||
const { t } = useTranslation();
|
||||
const navigate = useNavigate();
|
||||
const submit = useSubmit();
|
||||
const navigation = useNavigation();
|
||||
const loading = navigation.state === "submitting";
|
||||
|
||||
const errorModal = useRef<RefErrorModal>(null);
|
||||
const successModal = useRef<RefSuccessModal>(null);
|
||||
const confirmRemove = useRef<RefConfirmModal>(null);
|
||||
|
||||
// const [item, setItem] = useState<TenantUserDto | null>(null);
|
||||
// const [loading, setLoading] = useState(false);
|
||||
// const [email, setEmail] = useState("");
|
||||
// const [firstName, setFirstName] = useState("");
|
||||
// const [lastName, setLastName] = useState("");
|
||||
// const [phone, setPhone] = useState("");
|
||||
|
||||
useEffect(() => {
|
||||
if (actionData?.error) {
|
||||
errorModal.current?.show(actionData.error);
|
||||
}
|
||||
if (actionData?.success) {
|
||||
successModal.current?.show(t("shared.success"), actionData.success);
|
||||
}
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [actionData]);
|
||||
|
||||
function close() {
|
||||
navigate(UrlUtils.currentTenantUrl(params, "settings/members"));
|
||||
}
|
||||
function remove() {
|
||||
if (!data.member) {
|
||||
return;
|
||||
}
|
||||
confirmRemove.current?.show(
|
||||
t("shared.confirmRemove"),
|
||||
t("shared.remove"),
|
||||
t("shared.cancel"),
|
||||
t("settings.members.actions.removeConfirm", { email: data.member?.user.email })
|
||||
);
|
||||
}
|
||||
function yesRemove() {
|
||||
if (appData.currentRole === TenantUserType.MEMBER) {
|
||||
errorModal.current?.show(t("account.tenant.onlyAdmin"));
|
||||
} else {
|
||||
const form = new FormData();
|
||||
form.set("action", "delete");
|
||||
if (rootData.csrf) {
|
||||
form.set("csrf", rootData.csrf);
|
||||
}
|
||||
submit(form, {
|
||||
method: "post",
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
useEscapeKeypress(close);
|
||||
return (
|
||||
<div>
|
||||
{(() => {
|
||||
if (!data.member) {
|
||||
return <div>{t("shared.notFound")}</div>;
|
||||
} else if (data.member) {
|
||||
return (
|
||||
<Form method="post" className="space-y-4">
|
||||
<input hidden type="text" name="action" value="edit" readOnly />
|
||||
{rootData.csrf && <input type="hidden" name="csrf" value={rootData.csrf} />}
|
||||
<div className="grid grid-cols-2 gap-2">
|
||||
{/*Email */}
|
||||
<InputText
|
||||
className="col-span-2"
|
||||
disabled={!getUserHasPermission(appData, "app.settings.members.update")}
|
||||
name="email"
|
||||
title={t("models.user.email")}
|
||||
autoComplete="off"
|
||||
readOnly
|
||||
defaultValue={data.member?.user.email || actionData?.fields?.email}
|
||||
/>
|
||||
{/*Email: End */}
|
||||
|
||||
{/*User First Name */}
|
||||
<InputText
|
||||
type="text"
|
||||
disabled={!getUserHasPermission(appData, "app.settings.members.update")}
|
||||
name="first-name"
|
||||
title={t("models.user.firstName")}
|
||||
autoComplete="off"
|
||||
readOnly
|
||||
defaultValue={data.member?.user.firstName || actionData?.fields?.firstName}
|
||||
/>
|
||||
{/*User First Name: End */}
|
||||
|
||||
{/*User Last Name */}
|
||||
<InputText
|
||||
disabled={!getUserHasPermission(appData, "app.settings.members.update")}
|
||||
type="text"
|
||||
title={t("models.user.lastName")}
|
||||
name="last-name"
|
||||
autoComplete="off"
|
||||
readOnly
|
||||
defaultValue={data.member?.user.lastName || actionData?.fields?.lastName}
|
||||
/>
|
||||
{/*User Last Name: End */}
|
||||
</div>
|
||||
|
||||
<div className="mt-4 flex items-center justify-between">
|
||||
{(() => {
|
||||
if (loading) {
|
||||
return (
|
||||
<div className="text-theme-700 text-sm">
|
||||
<div>{t("shared.loading")}...</div>
|
||||
</div>
|
||||
);
|
||||
} else {
|
||||
return (
|
||||
<div>
|
||||
<ButtonSecondary
|
||||
destructive
|
||||
disabled={!getUserHasPermission(appData, "app.settings.members.delete")}
|
||||
onClick={remove}
|
||||
isLoading={loading}
|
||||
>
|
||||
<div>{t("shared.remove")}</div>
|
||||
</ButtonSecondary>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
})()}
|
||||
|
||||
<div className="flex items-center space-x-2">
|
||||
<ButtonSecondary
|
||||
disabled={loading}
|
||||
className={clsx(
|
||||
"focus:ring-ring hover:bg-secondary border-border bg-background text-foreground/80 inline-flex items-center space-x-2 border px-3 py-2 font-medium shadow-2xs focus:outline-hidden focus:ring-2 focus:ring-offset-2 sm:rounded-md sm:text-sm",
|
||||
loading && "bg-secondary/90 cursor-not-allowed"
|
||||
)}
|
||||
type="button"
|
||||
onClick={close}
|
||||
>
|
||||
<div>{t("shared.cancel")}</div>
|
||||
</ButtonSecondary>
|
||||
{/* <ButtonPrimary disabled={loading || !getUserHasPermission( appData,"app.settings.members.update")} type="submit">
|
||||
<div>{t("shared.save")}</div>
|
||||
</ButtonPrimary> */}
|
||||
</div>
|
||||
</div>
|
||||
</Form>
|
||||
);
|
||||
} else {
|
||||
return <div></div>;
|
||||
}
|
||||
})()}
|
||||
|
||||
<ConfirmModal ref={confirmRemove} onYes={yesRemove} />
|
||||
<ErrorModal ref={errorModal} />
|
||||
<SuccessModal ref={successModal} onClosed={close} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
import { ActionFunction, LoaderFunctionArgs, MetaFunction, redirect, useLoaderData } from "react-router";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useNavigate, useParams } from "react-router";
|
||||
import GroupForm from "~/components/core/roles/GroupForm";
|
||||
import SlideOverWideEmpty from "~/components/ui/slideOvers/SlideOverWideEmpty";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { useAppData } from "~/utils/data/useAppData";
|
||||
import { createLog } from "~/utils/db/logs.db.server";
|
||||
import { deleteGroup, getGroup, GroupWithDetails, updateGroup } from "~/utils/db/permissions/groups.db.server";
|
||||
import { createUserGroup, deleteGroupUsers } from "~/utils/db/permissions/userGroups.db.server";
|
||||
import { getTenantUsers, TenantUserWithUser } from "~/utils/db/tenants.db.server";
|
||||
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
|
||||
import { getUserPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { requireAuth } from "~/utils/loaders.middleware";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { validateCSRFToken } from "~/utils/session.server";
|
||||
|
||||
type LoaderData = {
|
||||
title: string;
|
||||
item: GroupWithDetails;
|
||||
tenantUsers: TenantUserWithUser[];
|
||||
};
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const userInfo = await requireAuth({ request, params });
|
||||
const { t } = await getTranslations(request);
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
|
||||
const item = await getGroup(params.id ?? "", tenantId);
|
||||
if (!item) {
|
||||
throw redirect(UrlUtils.currentTenantUrl(params, "settings/members"));
|
||||
}
|
||||
const { userPermission: canManageGroups } = await getUserPermission({
|
||||
userId: userInfo.userId,
|
||||
tenantId,
|
||||
permissionName: "app.settings.groups.full",
|
||||
});
|
||||
if (!canManageGroups && item.createdByUserId !== userInfo.userId) {
|
||||
throw Response.json({ error: t("models.group.errors.manageForbidden") }, { status: 403 });
|
||||
}
|
||||
const data: LoaderData = {
|
||||
title: `${item.name} | ${t("models.group.object")} | ${process.env.APP_NAME}`,
|
||||
item,
|
||||
tenantUsers: await getTenantUsers(tenantId),
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
type ActionData = {
|
||||
error?: string;
|
||||
};
|
||||
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
|
||||
export const action: ActionFunction = async ({ request, params }) => {
|
||||
const userInfo = await requireAuth({ request, params });
|
||||
await validateCSRFToken(request);
|
||||
const { t } = await getTranslations(request);
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
|
||||
const existing = await getGroup(params.id ?? "", tenantId);
|
||||
if (!existing) {
|
||||
throw redirect(UrlUtils.currentTenantUrl(params, "settings/members"));
|
||||
}
|
||||
|
||||
const form = await request.formData();
|
||||
const action = form.get("action")?.toString() ?? "";
|
||||
const { userPermission: canManageGroups } = await getUserPermission({
|
||||
userId: userInfo.userId,
|
||||
tenantId,
|
||||
permissionName: "app.settings.groups.full",
|
||||
});
|
||||
if (!canManageGroups && existing.createdByUserId !== userInfo.userId) {
|
||||
throw Response.json({ error: t("models.group.errors.manageForbidden") }, { status: 403 });
|
||||
}
|
||||
if (action === "edit") {
|
||||
const data = {
|
||||
tenantId: tenantId,
|
||||
name: form.get("name")?.toString() ?? "",
|
||||
description: form.get("description")?.toString() ?? "",
|
||||
color: Number(form.get("color")),
|
||||
};
|
||||
const updated = await updateGroup(existing.id, data, tenantId);
|
||||
if ("count" in updated && updated.count !== 1) {
|
||||
return badRequest({ error: t("shared.notFound") });
|
||||
}
|
||||
await deleteGroupUsers(existing.id, tenantId);
|
||||
const userIds = form.getAll("users[]").map((f) => f.toString());
|
||||
const tenantUsers = await getTenantUsers(tenantId);
|
||||
const users = tenantUsers.filter((tenantUser) => userIds.includes(tenantUser.userId)).map((tenantUser) => tenantUser.user);
|
||||
if (users.length !== userIds.length) {
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
}
|
||||
await Promise.all(
|
||||
users.map(async (user) => {
|
||||
return await createUserGroup(user.id, existing.id);
|
||||
})
|
||||
);
|
||||
await createLog(request, tenantId, "settings.groups.updated", `${existing.name}: ${JSON.stringify({ ...data, users: users.map((f) => f.email) })}`);
|
||||
} else if (action === "delete") {
|
||||
const deleted = await deleteGroup(existing.id, tenantId);
|
||||
if ("count" in deleted && deleted.count !== 1) {
|
||||
return badRequest({ error: t("shared.notFound") });
|
||||
}
|
||||
await createLog(request, tenantId, "settings.groups.deleted", `${existing.name}`);
|
||||
} else {
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
}
|
||||
return redirect(UrlUtils.currentTenantUrl(params, "settings/members"));
|
||||
};
|
||||
|
||||
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
|
||||
|
||||
export default function AdminEditGroupRoute() {
|
||||
const { t } = useTranslation();
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const appData = useAppData();
|
||||
const navigate = useNavigate();
|
||||
const params = useParams();
|
||||
|
||||
return (
|
||||
<SlideOverWideEmpty
|
||||
title={t("settings.members.groups.editTitle")}
|
||||
open={true}
|
||||
className="sm:max-w-sm"
|
||||
onClose={() => navigate(UrlUtils.currentTenantUrl(params, "settings/members"))}
|
||||
>
|
||||
<GroupForm
|
||||
allUsers={data.tenantUsers}
|
||||
item={data.item}
|
||||
canUpdate={getUserHasPermission(appData, "app.settings.groups.full") || data.item.createdByUserId === appData.user.id}
|
||||
canDelete={getUserHasPermission(appData, "app.settings.groups.full") || data.item.createdByUserId === appData.user.id}
|
||||
/>
|
||||
</SlideOverWideEmpty>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
import { ActionFunction, LoaderFunctionArgs, redirect, useLoaderData } from "react-router";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useNavigate, useParams } from "react-router";
|
||||
import GroupForm from "~/components/core/roles/GroupForm";
|
||||
import SlideOverWideEmpty from "~/components/ui/slideOvers/SlideOverWideEmpty";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { createLog } from "~/utils/db/logs.db.server";
|
||||
import { createGroup } from "~/utils/db/permissions/groups.db.server";
|
||||
import { createUserGroup } from "~/utils/db/permissions/userGroups.db.server";
|
||||
import { getTenantUsers, TenantUserWithUser } from "~/utils/db/tenants.db.server";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { requireAuth } from "~/utils/loaders.middleware";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { getUserInfo, validateCSRFToken } from "~/utils/session.server";
|
||||
|
||||
type LoaderData = {
|
||||
tenantUsers: TenantUserWithUser[];
|
||||
};
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
await requireAuth({ request, params });
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.groups.full", tenantId);
|
||||
const data: LoaderData = {
|
||||
tenantUsers: await getTenantUsers(tenantId),
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
type ActionData = {
|
||||
error?: string;
|
||||
};
|
||||
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
|
||||
export const action: ActionFunction = async ({ request, params }) => {
|
||||
await requireAuth({ request, params });
|
||||
const { t } = await getTranslations(request);
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.groups.full", tenantId);
|
||||
await validateCSRFToken(request);
|
||||
const userInfo = await getUserInfo(request);
|
||||
const form = await request.formData();
|
||||
const action = form.get("action")?.toString() ?? "";
|
||||
if (action === "create") {
|
||||
const data = {
|
||||
createdByUserId: userInfo.userId,
|
||||
tenantId: tenantId,
|
||||
name: form.get("name")?.toString() ?? "",
|
||||
description: form.get("description")?.toString() ?? "",
|
||||
color: Number(form.get("color")),
|
||||
};
|
||||
const group = await createGroup(data);
|
||||
const userIds = form.getAll("users[]").map((f) => f.toString());
|
||||
const selectedUserIds = new Set(userIds);
|
||||
const tenantUsers = await getTenantUsers(tenantId);
|
||||
const users = tenantUsers.filter((tenantUser) => selectedUserIds.has(tenantUser.userId)).map((tenantUser) => tenantUser.user);
|
||||
if (users.length !== userIds.length) {
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
}
|
||||
await Promise.all(
|
||||
users.map(async (user) => {
|
||||
return await createUserGroup(user.id, group.id);
|
||||
})
|
||||
);
|
||||
await createLog(
|
||||
request,
|
||||
tenantId,
|
||||
"settings.groups.created",
|
||||
`${JSON.stringify({
|
||||
...data,
|
||||
users: users.map((f) => f.email),
|
||||
})}`
|
||||
);
|
||||
return redirect(UrlUtils.currentTenantUrl(params, "settings/members"));
|
||||
} else {
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
}
|
||||
};
|
||||
|
||||
export default function NewGroupRoute() {
|
||||
const { t } = useTranslation();
|
||||
const navigate = useNavigate();
|
||||
const params = useParams();
|
||||
const data = useLoaderData<LoaderData>();
|
||||
|
||||
return (
|
||||
<SlideOverWideEmpty
|
||||
title={t("settings.members.groups.createTitle")}
|
||||
open={true}
|
||||
className="sm:max-w-sm"
|
||||
onClose={() => navigate(UrlUtils.currentTenantUrl(params, "settings/members"))}
|
||||
>
|
||||
<GroupForm allUsers={data.tenantUsers} />
|
||||
</SlideOverWideEmpty>
|
||||
);
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
import { readFileSync } from "node:fs";
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
const sourcePath = "apps/web/app/routes/app.$tenant/settings/members/new.tsx";
|
||||
const source = readFileSync(sourcePath, "utf8");
|
||||
|
||||
describe("new member invitation mail outbox wiring", () => {
|
||||
it("publishes the invitation email through the transactional outbox inside invite creation", () => {
|
||||
expect(source).toContain("await db.$transaction");
|
||||
expect(source.indexOf("const created = await createWorkspaceInvite")).toBeLessThan(source.indexOf("await publishOutboxEvent"));
|
||||
expect(source).toContain('type: "mail.transactional.send"');
|
||||
expect(source).toContain("`mail:workspace-invite:${created.id}`");
|
||||
expect(source).toContain('priorityOverride: "critical"');
|
||||
});
|
||||
|
||||
it("does not send invitation mail directly from the web action", () => {
|
||||
expect(source).not.toContain("sendEmail({");
|
||||
expect(source).not.toContain("sendEmailMailjet");
|
||||
});
|
||||
|
||||
it("does not return raw exception messages to the member invitation UI", () => {
|
||||
expect(source).not.toContain("error?.message");
|
||||
expect(source).not.toContain("error.message");
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,168 @@
|
||||
import { ActionFunction, LoaderFunctionArgs, redirect, MetaFunction, useLoaderData } from "react-router";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { getTenant, getTenantMember } from "~/utils/db/tenants.db.server";
|
||||
import { getUser, getUserByEmail } from "~/utils/db/users.db.server";
|
||||
import { createWorkspaceInvite, WorkspaceInviteError } from "@toolctrl/db/workspace-invites.server";
|
||||
import { getDbClient } from "@toolctrl/db/client.server";
|
||||
import { publishOutboxEvent, type OutboxPublisherTransaction } from "@toolctrl/db/outbox";
|
||||
import type { Prisma } from "@toolctrl/db/prisma-browser";
|
||||
import NewMember from "~/components/core/settings/members/NewMember";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { PlanFeatureUsageDto } from "~/application/dtos/subscriptions/PlanFeatureUsageDto";
|
||||
import { getPlanFeatureUsage } from "~/utils/services/.server/subscriptionService";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { DefaultFeatures } from "~/application/dtos/shared/DefaultFeatures";
|
||||
import { getAbsoluteUrl } from "~/utils/url.server";
|
||||
import { TenantUserType } from "~/application/enums/tenants/TenantUserType";
|
||||
import ServerError from "~/components/ui/errors/ServerError";
|
||||
import EventsService from "~/modules/events/services/.server/EventsService";
|
||||
import { MemberInvitationCreatedDto } from "~/modules/events/dtos/MemberInvitationCreatedDto";
|
||||
import { getUserInfo } from "~/utils/session.server";
|
||||
import EmailTemplates from "~/modules/emails/utils/EmailTemplates";
|
||||
import { getMailTranslator } from "~/locale/mail-translator.server";
|
||||
import { getAppConfiguration } from "~/utils/db/appConfiguration.db.server";
|
||||
import { appPath } from "~/utils/app/CanonicalUrlUtils";
|
||||
import { validateCSRFToken } from "~/utils/session.server";
|
||||
|
||||
export type NewMemberLoaderData = {
|
||||
title: string;
|
||||
featurePlanUsage: PlanFeatureUsageDto | undefined;
|
||||
};
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const { t } = await getTranslations(request);
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.members.create", tenantId);
|
||||
const featurePlanUsage = await getPlanFeatureUsage(tenantId, DefaultFeatures.Users);
|
||||
const data: NewMemberLoaderData = {
|
||||
title: `${t("settings.members.actions.new")} | ${process.env.APP_NAME}`,
|
||||
featurePlanUsage,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
export type NewMemberActionData = {
|
||||
error?: string;
|
||||
success?: string;
|
||||
fields?: {
|
||||
email: string;
|
||||
firstName: string;
|
||||
lastName: string;
|
||||
role: number;
|
||||
};
|
||||
};
|
||||
|
||||
export const action: ActionFunction = async ({ request, params }) => {
|
||||
const { t } = await getTranslations(request);
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await validateCSRFToken(request);
|
||||
await verifyUserHasPermission(request, "app.settings.members.create", tenantId);
|
||||
const { userId } = await getUserInfo(request);
|
||||
|
||||
const fromUser = await getUser(userId);
|
||||
const tenant = await getTenant(tenantId);
|
||||
if (!tenant || !fromUser) {
|
||||
return Response.json({ error: t("settings.members.errors.tenantOrUserNotFound") });
|
||||
}
|
||||
|
||||
const form = await request.formData();
|
||||
|
||||
const email = form.get("email")?.toString().toLowerCase().trim() ?? "";
|
||||
const firstName = form.get("first-name")?.toString() ?? "";
|
||||
const lastName = form.get("last-name")?.toString() ?? "";
|
||||
const sendInvitationEmail = Boolean(form.get("send-invitation-email"));
|
||||
|
||||
try {
|
||||
const user = await getUserByEmail(email);
|
||||
if (user) {
|
||||
const tenantUser = await getTenantMember(user.id, tenantId);
|
||||
if (tenantUser) {
|
||||
return Response.json({ error: t("settings.members.errors.userAlreadyInOrganization") });
|
||||
}
|
||||
}
|
||||
|
||||
const mailTranslator = sendInvitationEmail ? await getMailTranslator(fromUser.locale) : null;
|
||||
const appConfiguration = sendInvitationEmail ? await getAppConfiguration({ request }) : null;
|
||||
const db = getDbClient();
|
||||
const invitation = await db.$transaction(async (tx) => {
|
||||
const created = await createWorkspaceInvite(
|
||||
{
|
||||
tenantId,
|
||||
email,
|
||||
firstName,
|
||||
lastName,
|
||||
type: TenantUserType.MEMBER,
|
||||
fromUserId: fromUser?.id ?? null,
|
||||
// DoD "Einladung 48h": kein expliziter Wert mehr -> createWorkspaceInvite setzt den
|
||||
// 48h-Default (WORKSPACE_INVITE_TTL_MS) als Single Source of Truth.
|
||||
},
|
||||
tx
|
||||
);
|
||||
|
||||
if (sendInvitationEmail && mailTranslator && appConfiguration) {
|
||||
const rendered = EmailTemplates.USER_INVITATION_EMAIL.parse({
|
||||
appConfiguration,
|
||||
data: {
|
||||
name: firstName,
|
||||
invite_sender_name: fromUser.firstName,
|
||||
invite_sender_organization: tenant.name,
|
||||
action_url: getAbsoluteUrl(request, `/invitation/${created.token}`),
|
||||
},
|
||||
t: mailTranslator.t,
|
||||
locale: mailTranslator.locale,
|
||||
});
|
||||
await publishOutboxEvent(tx as OutboxPublisherTransaction, {
|
||||
tenantId: tenant.id,
|
||||
type: "mail.transactional.send",
|
||||
dispatchKey: `mail:workspace-invite:${created.id}`,
|
||||
payload: {
|
||||
tenantId: tenant.id,
|
||||
to: [email],
|
||||
subject: rendered.subject,
|
||||
html: rendered.body,
|
||||
priorityOverride: "critical",
|
||||
metadata: {
|
||||
source: "workspace-invitation",
|
||||
alias: "user-invitation",
|
||||
invitationId: created.id,
|
||||
},
|
||||
} satisfies Prisma.InputJsonValue,
|
||||
});
|
||||
}
|
||||
|
||||
return created;
|
||||
});
|
||||
|
||||
await EventsService.create({
|
||||
request,
|
||||
event: "member.invitation.created",
|
||||
tenantId: tenant.id,
|
||||
userId: fromUser.id,
|
||||
data: {
|
||||
user: { email: invitation.email, firstName: invitation.firstName, lastName: invitation.lastName, type: TenantUserType[invitation.type] },
|
||||
tenant: { id: tenant.id, name: tenant.name },
|
||||
fromUser: { id: fromUser!.id, email: fromUser!.email },
|
||||
} satisfies MemberInvitationCreatedDto,
|
||||
});
|
||||
|
||||
return redirect(appPath({ tenantSlug: params.tenant ?? "", path: "settings/members", mode: "host-aware" }));
|
||||
} catch (error: any) {
|
||||
if (error instanceof WorkspaceInviteError && error.code === "duplicate_active_invite") {
|
||||
return Response.json({ error: t("settings.members.errors.invitationAlreadyExists") }, { status: 400 });
|
||||
}
|
||||
// eslint-disable-next-line no-console
|
||||
console.error(error);
|
||||
return Response.json({ error: t("settings.members.errors.createInvitationFailed") }, { status: 400 });
|
||||
}
|
||||
};
|
||||
|
||||
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
|
||||
|
||||
export default function NewMemberRoute() {
|
||||
const data = useLoaderData<NewMemberLoaderData>();
|
||||
return <NewMember featurePlanUsage={data.featurePlanUsage} />;
|
||||
}
|
||||
|
||||
export function ErrorBoundary() {
|
||||
return <ServerError />;
|
||||
}
|
||||
Reference in new issue
Block a user