Refresh HiveGrid Cloud reference snapshot
This commit is contained in:
1 parent
5e99e14772
commit
7f88026f79
5955 files changed
+1177325
-188362
No files matched your search
+198
-99
@@ -1,37 +1,41 @@
|
||||
import { randomUUID } from "node:crypto";
|
||||
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { ActionFunctionArgs, LoaderFunctionArgs, useLoaderData } from "react-router";
|
||||
import { adminGetAllTenantsWithUsage, createTenantUser, TenantSimple, TenantWithUsage, updateTenantDeactivated } from "~/utils/db/tenants.db.server";
|
||||
import { ActionFunctionArgs, Link, LoaderFunctionArgs, useLoaderData } from "react-router";
|
||||
import { adminGetAllTenantsWithUsage, getTenantSimple, TenantSimple, TenantWithUsage, updateTenantDeactivated } from "~/utils/db/tenants.db.server";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import TenantsTable from "~/components/core/tenants/TenantsTable";
|
||||
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
|
||||
import { getFiltersFromCurrentUrl, getPaginationFromCurrentUrl } from "~/utils/helpers/RowPaginationHelper";
|
||||
import InputFilters from "~/components/ui/input/InputFilters";
|
||||
import { FilterablePropertyDto } from "~/application/dtos/data/FilterablePropertyDto";
|
||||
import { adminGetAllUsersNames } from "~/utils/db/users.db.server";
|
||||
import { adminGetAllUsersNames, getUser } from "~/utils/db/users.db.server";
|
||||
import { PaginationDto } from "~/application/dtos/data/PaginationDto";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useActionData, useNavigation, useSubmit } from "react-router";
|
||||
import ActionResultModal from "~/components/ui/modals/ActionResultModal";
|
||||
import { createMetrics } from "~/modules/metrics/services/.server/MetricTracker";
|
||||
import { serverTimingHeaders } from "~/modules/metrics/utils/defaultHeaders";
|
||||
import { getAllTenantTypes } from "~/utils/db/tenants/tenantTypes.db.server";
|
||||
import EditPageLayout from "~/components/ui/layouts/EditPageLayout";
|
||||
import { AdminPageHeader } from "~/components/screens/admin/AdminPageHeader";
|
||||
import SlideOverWideEmpty from "~/components/ui/slideOvers/SlideOverWideEmpty";
|
||||
import { useAppOrAdminData } from "~/utils/data/useAppOrAdminData";
|
||||
import { TenantsApi } from "~/utils/api/.server/TenantsApi";
|
||||
import { getAllRoles } from "~/utils/db/permissions/roles.db.server";
|
||||
import { TenantUserType } from "~/application/enums/tenants/TenantUserType";
|
||||
import InputCheckboxWithDescription from "~/components/ui/input/InputCheckboxWithDescription";
|
||||
import FormGroup from "~/components/ui/forms/FormGroup";
|
||||
import InputText, { RefInputText } from "~/components/ui/input/InputText";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { getExistingSlug } from "~/utils/services/tenantService";
|
||||
import DeactivateTenantModal from "~/components/core/tenants/DeactivateTenantModal";
|
||||
import { v2MetaFunction } from "~/utils/compat/v2MetaFunction";
|
||||
import { Button } from "~/components/ui/button";
|
||||
import { validateCSRFToken } from "~/utils/session.server";
|
||||
import { requireUserId, validateCSRFToken } from "~/utils/session.server";
|
||||
import { appendCSRFToken } from "~/utils/csrf";
|
||||
import { runWithRlsContext } from "@hivegrid/db/rls-context.server";
|
||||
import { CatalogError } from "@hivegrid/foundation";
|
||||
import { reserveTenantWithoutOwner } from "~/domain/tenant-bootstrap/tenantBootstrapService.server";
|
||||
import { TENANT_PENDING_OWNER_REASON } from "~/domain/tenant-bootstrap/tenantBootstrap.constants";
|
||||
import { prepareReservedOwnerInvitation } from "~/domain/tenant-bootstrap/ownerInvitationIssuance.server";
|
||||
import { getReservedOwnerInvitationReissueTarget, reissueReservedOwnerInvitation } from "~/domain/tenant-bootstrap/ownerInvitationReissue.server";
|
||||
import UserValidationUtils from "~/utils/app/UserValidationUtils";
|
||||
import { useSaveToast } from "~/hooks/use-save-toast";
|
||||
export { serverTimingHeaders as headers };
|
||||
|
||||
export const meta: v2MetaFunction<LoaderData> = ({ data }) => [{ title: data?.title }];
|
||||
@@ -41,16 +45,17 @@ type LoaderData = {
|
||||
items: TenantWithUsage[];
|
||||
filterableProperties: FilterablePropertyDto[];
|
||||
pagination: PaginationDto;
|
||||
reservationRequestKey: string;
|
||||
ownerInvitationReissueKey: string;
|
||||
};
|
||||
|
||||
const RESERVATION_REQUEST_KEY_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const { time, getServerTimingHeader } = await createMetrics({ request, params }, "admin.accounts");
|
||||
await time(verifyUserHasPermission(request, "admin.accounts.view"), "verifyUserHasPermission");
|
||||
let { t } = await time(getTranslations(request), "getTranslations");
|
||||
const [userOptions, tenantTypes] = await Promise.all([
|
||||
time(adminGetAllUsersNames(), "adminGetAllUsersNames"),
|
||||
time(getAllTenantTypes(), "getAllTenantTypes"),
|
||||
]);
|
||||
const userOptions = await time(adminGetAllUsersNames(), "adminGetAllUsersNames");
|
||||
|
||||
const filterableProperties = [
|
||||
{ name: "name", title: "models.tenant.name" },
|
||||
@@ -66,20 +71,6 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
};
|
||||
}),
|
||||
},
|
||||
{
|
||||
name: "typeId",
|
||||
title: t("shared.type"),
|
||||
manual: true,
|
||||
options: [
|
||||
{ value: "null", name: t("admin.accounts.filters.defaultType") },
|
||||
...tenantTypes.map((item) => {
|
||||
return {
|
||||
value: item.id,
|
||||
name: t(item.title),
|
||||
};
|
||||
}),
|
||||
],
|
||||
},
|
||||
];
|
||||
const filters = getFiltersFromCurrentUrl(request, filterableProperties);
|
||||
const urlSearchParams = new URL(request.url).searchParams;
|
||||
@@ -90,18 +81,21 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
items: items.sort((a, b) => (a.createdAt > b.createdAt ? -1 : 1)),
|
||||
filterableProperties,
|
||||
pagination,
|
||||
reservationRequestKey: randomUUID(),
|
||||
ownerInvitationReissueKey: randomUUID(),
|
||||
};
|
||||
return Response.json(data, { headers: getServerTimingHeader() });
|
||||
};
|
||||
|
||||
type ActionData = {
|
||||
error?: string;
|
||||
success?: string;
|
||||
intent?: string;
|
||||
ok?: boolean;
|
||||
messageKey?: string;
|
||||
errorKey?: string;
|
||||
createdTenantId?: string;
|
||||
};
|
||||
export const action = async ({ request }: ActionFunctionArgs) => {
|
||||
await verifyUserHasPermission(request, "admin.accounts.view");
|
||||
const { t } = await getTranslations(request);
|
||||
|
||||
await validateCSRFToken(request);
|
||||
const form = await request.formData();
|
||||
@@ -110,46 +104,119 @@ export const action = async ({ request }: ActionFunctionArgs) => {
|
||||
if (action === "deactivate" && id) {
|
||||
const deactivatedReason = form.get("reason")?.toString();
|
||||
if (!deactivatedReason) {
|
||||
return Response.json({ error: t("admin.accounts.actions.missingDeactivationReason") }, { status: 400 });
|
||||
return Response.json({ intent: action, errorKey: "admin.accounts.actions.missingDeactivationReason" } satisfies ActionData, { status: 400 });
|
||||
}
|
||||
await updateTenantDeactivated(id, {
|
||||
active: false,
|
||||
deactivatedReason,
|
||||
if (deactivatedReason === TENANT_PENDING_OWNER_REASON) {
|
||||
return Response.json({ intent: action, errorKey: "admin.accounts.actions.reservationRequiresOwner" } satisfies ActionData, { status: 409 });
|
||||
}
|
||||
const deactivationBlocked = await runWithRlsContext({ tenantId: id }, async () => {
|
||||
const tenant = await getTenantSimple(id);
|
||||
if (!tenant || tenant.deactivatedReason === TENANT_PENDING_OWNER_REASON) {
|
||||
return true;
|
||||
}
|
||||
await updateTenantDeactivated(id, {
|
||||
active: false,
|
||||
deactivatedReason,
|
||||
});
|
||||
return false;
|
||||
});
|
||||
return Response.json({ success: t("admin.accounts.actions.tenantDeactivated") });
|
||||
if (deactivationBlocked) {
|
||||
return Response.json({ intent: action, errorKey: "admin.accounts.actions.reservationRequiresOwner" } satisfies ActionData, { status: 409 });
|
||||
}
|
||||
return Response.json({ intent: action, ok: true, messageKey: "admin.accounts.toast.deactivated" } satisfies ActionData);
|
||||
} else if (action === "activate" && id) {
|
||||
await updateTenantDeactivated(id, {
|
||||
active: true,
|
||||
deactivatedReason: null,
|
||||
const activationBlocked = await runWithRlsContext({ tenantId: id }, async () => {
|
||||
const tenant = await getTenantSimple(id);
|
||||
if (!tenant || tenant.deactivatedReason === TENANT_PENDING_OWNER_REASON) {
|
||||
return true;
|
||||
}
|
||||
await updateTenantDeactivated(id, {
|
||||
active: true,
|
||||
deactivatedReason: null,
|
||||
});
|
||||
return false;
|
||||
});
|
||||
return Response.json({});
|
||||
if (activationBlocked) {
|
||||
return Response.json({ intent: action, errorKey: "admin.accounts.actions.reservationRequiresOwner" } satisfies ActionData, { status: 409 });
|
||||
}
|
||||
return Response.json({ intent: action, ok: true, messageKey: "admin.accounts.toast.activated" } satisfies ActionData);
|
||||
} else if (action === "resend-owner-invitation" && id) {
|
||||
await verifyUserHasPermission(request, "admin.accounts.create");
|
||||
const issuanceKey = form.get("issuanceKey")?.toString() ?? "";
|
||||
if (!RESERVATION_REQUEST_KEY_PATTERN.test(issuanceKey)) {
|
||||
return Response.json({ intent: action, errorKey: "shared.invalidForm" } satisfies ActionData, { status: 400 });
|
||||
}
|
||||
const operatorUserId = await requireUserId(request);
|
||||
const operator = await getUser(operatorUserId);
|
||||
if (!operator) {
|
||||
return Response.json({ intent: action, errorKey: "shared.invalidForm" } satisfies ActionData, { status: 400 });
|
||||
}
|
||||
try {
|
||||
const target = await getReservedOwnerInvitationReissueTarget({ tenantId: id, operatorUserId });
|
||||
const ownerInvitation = await prepareReservedOwnerInvitation({
|
||||
request,
|
||||
issuanceKey,
|
||||
tenantName: target.tenantName,
|
||||
email: target.email,
|
||||
firstName: target.firstName,
|
||||
lastName: target.lastName,
|
||||
issuer: { id: operator.id, firstName: operator.firstName, locale: operator.locale },
|
||||
});
|
||||
await reissueReservedOwnerInvitation({
|
||||
tenantId: id,
|
||||
operatorUserId,
|
||||
sourceInvitationId: target.invitationId,
|
||||
ownerInvitation,
|
||||
});
|
||||
return Response.json({ intent: action, ok: true, messageKey: "admin.accounts.toast.ownerInvitationResent" } satisfies ActionData);
|
||||
} catch (error) {
|
||||
if (error instanceof CatalogError) {
|
||||
return Response.json({ intent: action, errorKey: "admin.accounts.actions.ownerInvitationResendFailed" } satisfies ActionData, { status: 409 });
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
} else if (action === "create") {
|
||||
await verifyUserHasPermission(request, "admin.accounts.create");
|
||||
const name = form.get("name")?.toString() ?? "";
|
||||
const name = form.get("name")?.toString().trim() ?? "";
|
||||
const slug = form.get("slug")?.toString() ?? "";
|
||||
const existingSlug = await getExistingSlug(slug);
|
||||
if (!slug || existingSlug) {
|
||||
return Response.json({ error: t("shared.slugTaken") }, { status: 400 });
|
||||
const reservationRequestKey = form.get("reservationRequestKey")?.toString() ?? "";
|
||||
const ownerEmail = form.get("ownerEmail")?.toString().trim().toLowerCase() ?? "";
|
||||
const ownerFirstName = form.get("ownerFirstName")?.toString().trim() ?? "";
|
||||
const ownerLastName = form.get("ownerLastName")?.toString().trim() ?? "";
|
||||
if (
|
||||
!name ||
|
||||
!slug ||
|
||||
!RESERVATION_REQUEST_KEY_PATTERN.test(reservationRequestKey) ||
|
||||
!UserValidationUtils.validateEmail(ownerEmail) ||
|
||||
!ownerFirstName ||
|
||||
!ownerLastName
|
||||
) {
|
||||
return Response.json({ intent: action, errorKey: "shared.invalidForm" } satisfies ActionData, { status: 400 });
|
||||
}
|
||||
const { tenant, user } = await TenantsApi.create({ request, name, slug });
|
||||
const addMySelf = Boolean(form.get("addMySelf"));
|
||||
if (addMySelf) {
|
||||
const roles = await getAllRoles("app");
|
||||
await createTenantUser(
|
||||
{
|
||||
tenantId: tenant.id,
|
||||
userId: user.id,
|
||||
type: TenantUserType.OWNER,
|
||||
},
|
||||
roles
|
||||
);
|
||||
const operatorUserId = await requireUserId(request);
|
||||
const operator = await getUser(operatorUserId);
|
||||
if (!operator) {
|
||||
return Response.json({ intent: action, errorKey: "shared.invalidForm" } satisfies ActionData, { status: 400 });
|
||||
}
|
||||
const ownerInvitation = await prepareReservedOwnerInvitation({
|
||||
request,
|
||||
issuanceKey: reservationRequestKey,
|
||||
tenantName: name,
|
||||
email: ownerEmail,
|
||||
firstName: ownerFirstName,
|
||||
lastName: ownerLastName,
|
||||
issuer: { id: operator.id, firstName: operator.firstName, locale: operator.locale },
|
||||
});
|
||||
const tenant = await reserveTenantWithoutOwner({ name, slug, operatorUserId, reservationRequestKey, ownerInvitation });
|
||||
const data: ActionData = {
|
||||
intent: action,
|
||||
ok: true,
|
||||
createdTenantId: tenant.id,
|
||||
messageKey: "admin.accounts.toast.ownerInvitationSent",
|
||||
};
|
||||
return data;
|
||||
} else {
|
||||
return Response.json({ error: t("shared.invalidForm") }, { status: 400 });
|
||||
return Response.json({ intent: action, errorKey: "shared.invalidForm" } satisfies ActionData, { status: 400 });
|
||||
}
|
||||
};
|
||||
|
||||
@@ -160,6 +227,7 @@ export default function AdminTenantsRoute() {
|
||||
const { t } = useTranslation();
|
||||
const submit = useSubmit();
|
||||
const navigation = useNavigation();
|
||||
useSaveToast(actionData);
|
||||
|
||||
const [deactivatingTenant, setDeactivatingTenant] = useState<TenantWithUsage>();
|
||||
const [creatingNewAccount, setCreatingNewAccount] = useState(false);
|
||||
@@ -191,36 +259,62 @@ export default function AdminTenantsRoute() {
|
||||
setDeactivatingTenant(undefined);
|
||||
}
|
||||
|
||||
function onResendOwnerInvitation(item: TenantWithUsage) {
|
||||
const form = new FormData();
|
||||
appendCSRFToken(form);
|
||||
form.set("action", "resend-owner-invitation");
|
||||
form.set("id", item.id);
|
||||
form.set("issuanceKey", data.ownerInvitationReissueKey);
|
||||
submit(form, { method: "post" });
|
||||
}
|
||||
|
||||
return (
|
||||
<EditPageLayout
|
||||
title={t("models.tenant.plural")}
|
||||
buttons={
|
||||
<>
|
||||
<InputFilters size="sm" filters={data.filterableProperties} />
|
||||
<Button
|
||||
type="button"
|
||||
variant="default"
|
||||
size="sm"
|
||||
disabled={!getUserHasPermission(appOrAdminData, "admin.accounts.create")}
|
||||
onClick={() => setCreatingNewAccount(true)}
|
||||
>
|
||||
{t("shared.new")}
|
||||
</Button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
<TenantsTable
|
||||
items={data.items}
|
||||
pagination={data.pagination}
|
||||
actions={[
|
||||
{
|
||||
renderTitle: (i) => (!i.deactivatedReason ? t("shared.deactivate") : t("shared.activate")),
|
||||
onClick: (_idx, item) => onToggleActive(item),
|
||||
disabled: () => navigation.state === "submitting",
|
||||
renderIsDestructive: (i) => !i.deactivatedReason,
|
||||
},
|
||||
]}
|
||||
<div className="flex w-full flex-col">
|
||||
<AdminPageHeader
|
||||
title={t("models.tenant.plural")}
|
||||
description={t("admin.accounts.pageDescription")}
|
||||
actions={
|
||||
<>
|
||||
<InputFilters size="sm" filters={data.filterableProperties} />
|
||||
<Button type="button" variant="outline" size="sm" disabled={!getUserHasPermission(appOrAdminData, "admin.accounts.create")} asChild>
|
||||
<Link to={adminPath("accounts/new", { mode: "host-aware" })}>{t("admin.accounts.create.fullCreateLink")}</Link>
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
variant="default"
|
||||
size="sm"
|
||||
disabled={!getUserHasPermission(appOrAdminData, "admin.accounts.create")}
|
||||
onClick={() => setCreatingNewAccount(true)}
|
||||
>
|
||||
{t("shared.new")}
|
||||
</Button>
|
||||
</>
|
||||
}
|
||||
/>
|
||||
<div className="mobile:px-4 flex w-full flex-col gap-3 px-6 py-6">
|
||||
<TenantsTable
|
||||
items={data.items}
|
||||
pagination={data.pagination}
|
||||
actions={[
|
||||
{
|
||||
renderTitle: (i) => (!i.deactivatedReason ? t("shared.deactivate") : t("shared.activate")),
|
||||
onClick: (_idx, item) => onToggleActive(item),
|
||||
disabled: (item) => navigation.state === "submitting" || item.deactivatedReason === TENANT_PENDING_OWNER_REASON,
|
||||
renderIsDestructive: (i) => !i.deactivatedReason,
|
||||
},
|
||||
{
|
||||
title: t("admin.accounts.actions.resendOwnerInvitation"),
|
||||
onClick: (_idx, item) => onResendOwnerInvitation(item),
|
||||
hidden: (item) => item.deactivatedReason !== TENANT_PENDING_OWNER_REASON || !getUserHasPermission(appOrAdminData, "admin.accounts.create"),
|
||||
disabled: () => navigation.state === "submitting",
|
||||
confirmation: () => ({
|
||||
title: t("admin.accounts.actions.resendOwnerInvitation"),
|
||||
description: t("admin.accounts.actions.resendOwnerInvitationConfirmation"),
|
||||
}),
|
||||
},
|
||||
]}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<DeactivateTenantModal
|
||||
open={!!deactivatingTenant}
|
||||
@@ -240,22 +334,22 @@ export default function AdminTenantsRoute() {
|
||||
>
|
||||
<div className="-mx-1 -mt-3">
|
||||
<div className="space-y-4">
|
||||
<CreateTenantForm />
|
||||
<CreateTenantForm reservationRequestKey={data.reservationRequestKey} />
|
||||
</div>
|
||||
</div>
|
||||
</SlideOverWideEmpty>
|
||||
|
||||
<ActionResultModal actionData={actionData} />
|
||||
</EditPageLayout>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function CreateTenantForm() {
|
||||
function CreateTenantForm({ reservationRequestKey }: { reservationRequestKey: string }) {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const [name, setName] = useState("");
|
||||
const [slug, setSlug] = useState("");
|
||||
const [addMySelf, setAddMySelf] = useState(true);
|
||||
const [ownerEmail, setOwnerEmail] = useState("");
|
||||
const [ownerFirstName, setOwnerFirstName] = useState("");
|
||||
const [ownerLastName, setOwnerLastName] = useState("");
|
||||
|
||||
useEffect(() => {
|
||||
setSlug(UrlUtils.slugify(name));
|
||||
@@ -275,16 +369,21 @@ function CreateTenantForm() {
|
||||
}}
|
||||
withErrorModal={false}
|
||||
>
|
||||
<input type="hidden" name="reservationRequestKey" value={reservationRequestKey} readOnly />
|
||||
<div className="space-y-3">
|
||||
<InputText ref={firstInput} autoFocus name="name" title={t("shared.name")} value={name} setValue={setName} required />
|
||||
<InputText name="slug" title={t("shared.slug")} value={slug} setValue={setSlug} required onBlur={() => setSlug(UrlUtils.slugify(slug))} />
|
||||
<InputCheckboxWithDescription
|
||||
name="addMySelf"
|
||||
title={t("admin.accounts.create.addMyselfAsOwner")}
|
||||
description={t("admin.accounts.create.addMyselfAsOwnerDescription")}
|
||||
value={addMySelf}
|
||||
setValue={setAddMySelf}
|
||||
<InputText
|
||||
type="email"
|
||||
name="ownerEmail"
|
||||
title={t("models.user.email")}
|
||||
help={t("admin.accounts.create.ownerInvitationDescription")}
|
||||
value={ownerEmail}
|
||||
setValue={setOwnerEmail}
|
||||
required
|
||||
/>
|
||||
<InputText name="ownerFirstName" title={t("models.user.firstName")} value={ownerFirstName} setValue={setOwnerFirstName} required />
|
||||
<InputText name="ownerLastName" title={t("models.user.lastName")} value={ownerLastName} setValue={setOwnerLastName} required />
|
||||
</div>
|
||||
</FormGroup>
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user