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,4 +1,4 @@
import { Tenant } from "@toolctrl/db/prisma-browser";
import { Tenant } from "@hivegrid/db/prisma-browser";
import { ActionFunction, LoaderFunctionArgs, redirect, useLoaderData } from "react-router";
import { useNavigate } from "react-router";
import ApiKeyForm from "~/components/core/apiKeys/ApiKeyForm";
@@ -9,7 +9,6 @@ import { RedactedApiKeyWithDetails, adminGetApiKeyById, deleteApiKey, getApiKeys
import { createAdminLog } from "~/utils/db/logs.db.server";
import { adminGetAllTenants } from "~/utils/db/tenants.db.server";
import { getUser } from "~/utils/db/users.db.server";
import { getApiKeyEntityPermissions } from "~/utils/helpers/.server/ApiKeyHelperService";
import EventsService from "~/modules/events/services/.server/EventsService";
import { getUserInfo, validateCSRFToken } from "~/utils/session.server";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
@@ -55,11 +54,6 @@ export const action: ActionFunction = async ({ request, params }) => {
}
if (action === "edit") {
await verifyUserHasPermission(request, "admin.apiKeys.update");
const entities: { entityId: string; create: boolean; read: boolean; update: boolean; delete: boolean }[] = form
.getAll("entities[]")
.map((f: FormDataEntryValue) => {
return JSON.parse(f.toString());
});
let expirationDate: Date | null = null;
let expires = form.get("expires")?.toString();
if (expires) {
@@ -72,17 +66,13 @@ export const action: ActionFunction = async ({ request, params }) => {
return badRequest({ error: t("models.apiKey.errors.aliasExists", { alias }) });
}
const active = Boolean(form.get("active"));
await updateApiKey(
params.id ?? "",
{
tenantId,
alias,
expires: expirationDate,
active,
},
entities
);
await createAdminLog(request, "admin.apiKeys.updated", JSON.stringify({ tenantId, alias, expirationDate, active, entities }));
await updateApiKey(params.id ?? "", {
tenantId,
alias,
expires: expirationDate,
active,
});
await createAdminLog(request, "admin.apiKeys.updated", JSON.stringify({ tenantId, alias, expirationDate, active }));
await EventsService.create({
request,
event: "api_key.updated",
@@ -94,13 +84,11 @@ export const action: ActionFunction = async ({ request, params }) => {
alias: alias,
expires: expirationDate,
active: active,
entities: await getApiKeyEntityPermissions(entities),
},
old: {
alias: existing.alias,
expires: existing.expires,
active: existing.active,
entities: await getApiKeyEntityPermissions(existing.entities),
},
user: { id: currentUser?.id ?? "", email: currentUser?.email ?? "" },
} satisfies ApiKeyUpdatedDto,
@@ -120,7 +108,6 @@ export const action: ActionFunction = async ({ request, params }) => {
alias: existing.alias,
expires: existing.expires,
active: existing.active,
entities: await getApiKeyEntityPermissions(existing.entities),
user: { id: currentUser?.id ?? "", email: currentUser?.email ?? "" },
} satisfies ApiKeyDeletedDto,
});
@@ -138,7 +125,6 @@ export default function AdminApiEditKeyRoute() {
<>
<OpenModal className="sm:max-w-xl" onClose={() => navigate(adminPath(`api/keys`, { mode: "host-aware" }))}>
<ApiKeyForm
entities={adminData.entities}
tenants={data.tenants}
item={data.item}
canUpdate={getUserHasPermission(adminData, "admin.apiKeys.update")}
@@ -1,16 +1,14 @@
import { Tenant } from "@toolctrl/db/prisma-browser";
import { Tenant } from "@hivegrid/db/prisma-browser";
import { ActionFunction, LoaderFunctionArgs, redirect, useLoaderData } from "react-router";
import { useActionData, useNavigate } from "react-router";
import ApiKeyCreatedModal from "~/components/core/apiKeys/ApiKeyCreatedModal";
import ApiKeyForm from "~/components/core/apiKeys/ApiKeyForm";
import OpenModal from "~/components/ui/modals/OpenModal";
import { getTranslations } from "~/locale/i18next.server";
import { useAdminData } from "~/utils/data/useAdminData";
import { createApiKey, getApiKeyByAlias } from "~/utils/db/apiKeys.db.server";
import { createAdminLog } from "~/utils/db/logs.db.server";
import { adminGetAllTenants } from "~/utils/db/tenants.db.server";
import { getUser } from "~/utils/db/users.db.server";
import { getApiKeyEntityPermissions } from "~/utils/helpers/.server/ApiKeyHelperService";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import EventsService from "~/modules/events/services/.server/EventsService";
import { getUserInfo, validateCSRFToken } from "~/utils/session.server";
@@ -47,11 +45,6 @@ export const action: ActionFunction = async ({ request, params }) => {
const form = await request.formData();
const action = form.get("action")?.toString() ?? "";
if (action === "create") {
const entities: { entityId: string; create: boolean; read: boolean; update: boolean; delete: boolean }[] = form
.getAll("entities[]")
.map((f: FormDataEntryValue) => {
return JSON.parse(f.toString());
});
let expirationDate: Date | null = null;
let expires = form.get("expires")?.toString();
if (expires) {
@@ -64,17 +57,14 @@ export const action: ActionFunction = async ({ request, params }) => {
return badRequest({ error: t("models.apiKey.errors.aliasExists", { alias }) });
}
const active = Boolean(form.get("active"));
const apiKey = await createApiKey(
{
tenantId,
createdByUserId: userInfo.userId,
alias,
expires: expirationDate,
active,
},
entities
);
await createAdminLog(request, "admin.apiKeys.created", JSON.stringify({ id: apiKey.id, tenantId, alias, expirationDate, active, entities }));
const apiKey = await createApiKey({
tenantId,
createdByUserId: userInfo.userId,
alias,
expires: expirationDate,
active,
});
await createAdminLog(request, "admin.apiKeys.created", JSON.stringify({ id: apiKey.id, tenantId, alias, expirationDate, active }));
await EventsService.create({
request,
event: "api_key.created",
@@ -85,7 +75,6 @@ export const action: ActionFunction = async ({ request, params }) => {
alias: apiKey.alias,
expires: expirationDate,
active: active,
entities: await getApiKeyEntityPermissions(entities),
user: { id: currentUser?.id ?? "", email: currentUser?.email ?? "" },
} satisfies ApiKeyCreatedDto,
});
@@ -100,11 +89,10 @@ export default function AdminApiNewKeyRoute() {
const data = useLoaderData<LoaderData>();
const actionData = useActionData<ActionData>();
const navigate = useNavigate();
const adminData = useAdminData();
return (
<>
<OpenModal className="sm:max-w-xl" onClose={() => navigate(adminPath(`api/keys`, { mode: "host-aware" }))}>
<ApiKeyForm entities={adminData.entities} tenants={data.tenants} />
<ApiKeyForm tenants={data.tenants} />
{actionData?.apiKey !== undefined && <ApiKeyCreatedModal apiKey={actionData?.apiKey} redirectTo={adminPath("api/keys", { mode: "host-aware" })} />}
</OpenModal>
</>