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
+98
-159
@@ -1,18 +1,17 @@
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Fragment, useEffect, useRef, useState } from "react";
|
||||
import plans from "~/application/pricing/plans.server";
|
||||
import { ActionFunction, Link, LoaderFunctionArgs, MetaFunction, useActionData, useLoaderData } from "react-router";
|
||||
import { Form, Outlet, useSubmit, useNavigation } from "react-router";
|
||||
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
|
||||
import {
|
||||
getAllSubscriptionProducts,
|
||||
getAllSubscriptionProductsWithTenants,
|
||||
getSubscriptionProductTenantUsageCounts,
|
||||
getSubscriptionProduct,
|
||||
updateSubscriptionProduct,
|
||||
} from "@hivegrid/db/subscriptions.server";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { SubscriptionProductDto } from "~/application/dtos/subscriptions/SubscriptionProductDto";
|
||||
import { createPlans, deletePlan, syncPlan } from "~/utils/services/.server/pricingService";
|
||||
import { deletePlan, syncPlan } from "~/utils/services/.server/pricingService";
|
||||
import ButtonSecondary from "~/components/ui/buttons/ButtonSecondary";
|
||||
import ButtonPrimary from "~/components/ui/buttons/ButtonPrimary";
|
||||
import { createAdminLog } from "~/utils/db/logs.db.server";
|
||||
@@ -21,24 +20,26 @@ import { SubscriptionFeatureDto } from "~/application/dtos/subscriptions/Subscri
|
||||
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { useAdminData } from "~/utils/data/useAdminData";
|
||||
import InputSelect from "~/components/ui/input/InputSelect";
|
||||
import WarningBanner from "~/components/ui/banners/WarningBanner";
|
||||
import TableSimple from "~/components/ui/tables/TableSimple";
|
||||
import SimpleBadge from "~/components/ui/badges/SimpleBadge";
|
||||
import { Colors } from "~/application/enums/shared/Colors";
|
||||
import ButtonTertiary from "~/components/ui/buttons/ButtonTertiary";
|
||||
import toast from "react-hot-toast";
|
||||
import { toast } from "sonner";
|
||||
import { getPossibleBillingPeriods } from "~/utils/helpers/PricingHelper";
|
||||
import { SubscriptionBillingPeriod } from "~/application/enums/subscriptions/SubscriptionBillingPeriod";
|
||||
import clsx from "clsx";
|
||||
import TrashIcon from "~/components/ui/icons/TrashIcon";
|
||||
import ConfirmModal, { RefConfirmModal } from "~/components/ui/modals/ConfirmModal";
|
||||
import EditPageLayout from "~/components/ui/layouts/EditPageLayout";
|
||||
import BackButtonWithTitle from "~/components/ui/buttons/BackButtonWithTitle";
|
||||
import { validateCSRFToken } from "~/utils/session.server";
|
||||
import { appendCSRFToken } from "~/utils/csrf";
|
||||
import { useLocaleFormatters } from "~/locale/format";
|
||||
import { HIVEGRID_SUBSCRIPTION_PRICING_MODELS, isHiveGridSubscriptionPricingModel } from "~/application/pricing/pricingModelPolicy";
|
||||
import { isManagedBillingCatalogProduct } from "~/application/pricing/adminCatalogPolicy";
|
||||
import { createScopedLogger } from "~/utils/logger.server";
|
||||
import { toSafeErrorLog } from "~/utils/safeErrorLog.server";
|
||||
|
||||
const logger = createScopedLogger("admin.pricing");
|
||||
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
|
||||
|
||||
type LoaderData = {
|
||||
@@ -46,25 +47,29 @@ type LoaderData = {
|
||||
items: SubscriptionProductDto[];
|
||||
};
|
||||
|
||||
async function getAdminSubscriptionProducts(): Promise<SubscriptionProductDto[]> {
|
||||
const [items, usageCounts] = await Promise.all([getAllSubscriptionProductsWithTenants(), getSubscriptionProductTenantUsageCounts()]);
|
||||
return items.map((item) => ({
|
||||
...item,
|
||||
tenantProductCount: item.id ? (usageCounts[item.id] ?? 0) : 0,
|
||||
}));
|
||||
}
|
||||
|
||||
export const loader = async ({ request }: LoaderFunctionArgs) => {
|
||||
await verifyUserHasPermission(request, "admin.pricing.view");
|
||||
const { t } = await getTranslations(request);
|
||||
const data: LoaderData = {
|
||||
title: `${t("admin.pricing.title")} | ${process.env.APP_NAME}`,
|
||||
items: await getAllSubscriptionProductsWithTenants(),
|
||||
items: await getAdminSubscriptionProducts(),
|
||||
};
|
||||
|
||||
if (data.items.length === 0) {
|
||||
data.items = plans;
|
||||
}
|
||||
|
||||
return data;
|
||||
};
|
||||
|
||||
export type PricingPlansActionData = {
|
||||
error?: string;
|
||||
success?: string;
|
||||
items?: Awaited<ReturnType<typeof getAllSubscriptionProducts>>;
|
||||
items?: SubscriptionProductDto[];
|
||||
};
|
||||
const badRequest = (data: PricingPlansActionData) => Response.json(data, { status: 400 });
|
||||
export const action: ActionFunction = async ({ request }) => {
|
||||
@@ -74,47 +79,15 @@ export const action: ActionFunction = async ({ request }) => {
|
||||
await validateCSRFToken(request);
|
||||
const form = await request.formData();
|
||||
const action = form.get("action")?.toString();
|
||||
if (action === "create-all-plans") {
|
||||
await verifyUserHasPermission(request, "admin.pricing.create");
|
||||
const model = Number(form.get("model")) as PricingModel;
|
||||
if (model !== PricingModel.ALL && !isHiveGridSubscriptionPricingModel(model)) {
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
}
|
||||
const items = await getAllSubscriptionProducts();
|
||||
if (items.length > 0) {
|
||||
return Response.json({
|
||||
items,
|
||||
});
|
||||
}
|
||||
|
||||
await Promise.all(
|
||||
plans
|
||||
.filter((f) => f.model === model || model === PricingModel.ALL)
|
||||
.map(async (plan) => {
|
||||
plan.translatedTitle = t(plan.title);
|
||||
plan.usageBasedPrices?.forEach((usageBasedPrice) => {
|
||||
usageBasedPrice.unitTitle = t(usageBasedPrice.unitTitle);
|
||||
usageBasedPrice.unitTitlePlural = t(usageBasedPrice.unitTitlePlural);
|
||||
});
|
||||
})
|
||||
);
|
||||
|
||||
try {
|
||||
await createPlans(plans.filter((f) => f.model === model || model === PricingModel.ALL));
|
||||
await createAdminLog(request, "admin.pricing.createdPlans", plans.map((f) => t(f.title)).join(", "));
|
||||
|
||||
return Response.json({
|
||||
items: await getAllSubscriptionProducts(),
|
||||
});
|
||||
} catch (e: any) {
|
||||
return badRequest({ error: e?.toString() });
|
||||
}
|
||||
} else if (action === "sync-plan-with-payment-provider") {
|
||||
if (action === "sync-plan-with-payment-provider") {
|
||||
const id = form.get("id")?.toString() ?? "";
|
||||
const item = await getSubscriptionProduct(id);
|
||||
if (!item) {
|
||||
return badRequest({ error: t("admin.pricing.errors.planNotFound") });
|
||||
}
|
||||
if (isManagedBillingCatalogProduct(item)) {
|
||||
return badRequest({ error: t("admin.pricing.errors.managedCatalogProduct") });
|
||||
}
|
||||
try {
|
||||
item.translatedTitle = t(item.title);
|
||||
await syncPlan(
|
||||
@@ -129,10 +102,11 @@ export const action: ActionFunction = async ({ request }) => {
|
||||
})
|
||||
);
|
||||
return Response.json({
|
||||
items: await getAllSubscriptionProducts(),
|
||||
items: await getAdminSubscriptionProducts(),
|
||||
});
|
||||
} catch (error: any) {
|
||||
return badRequest({ error: error.message });
|
||||
} catch (error) {
|
||||
logger.error({ event: "admin.pricing.sync_failed", ...toSafeErrorLog(error) }, "Admin pricing plan sync failed");
|
||||
return badRequest({ error: t("admin.pricing.errors.syncFailed") });
|
||||
}
|
||||
} else if (action === "toggle") {
|
||||
const id = form.get("id")?.toString() ?? "";
|
||||
@@ -140,6 +114,9 @@ export const action: ActionFunction = async ({ request }) => {
|
||||
if (!item) {
|
||||
return badRequest({ error: t("admin.pricing.errors.planNotFound") });
|
||||
}
|
||||
if (isManagedBillingCatalogProduct(item)) {
|
||||
return badRequest({ error: t("admin.pricing.errors.managedCatalogProduct") });
|
||||
}
|
||||
try {
|
||||
await updateSubscriptionProduct(id, {
|
||||
public: !item.public,
|
||||
@@ -149,27 +126,34 @@ export const action: ActionFunction = async ({ request }) => {
|
||||
status: t(!item.public ? "admin.pricing.status.public" : "admin.pricing.status.private"),
|
||||
}),
|
||||
});
|
||||
} catch (error: any) {
|
||||
return badRequest({ error: error.message });
|
||||
} catch (error) {
|
||||
logger.error({ event: "admin.pricing.visibility_update_failed", ...toSafeErrorLog(error) }, "Admin pricing visibility update failed");
|
||||
return badRequest({ error: t("admin.pricing.errors.visibilityUpdateFailed") });
|
||||
}
|
||||
} else if (action === "bulk-delete") {
|
||||
await verifyUserHasPermission(request, "admin.pricing.delete");
|
||||
const ids = form.getAll("ids[]");
|
||||
const items = await getAllSubscriptionProducts();
|
||||
const items = await getAdminSubscriptionProducts();
|
||||
const itemsToDelete = items.filter((f) => ids.includes(f.id?.toString() ?? ""));
|
||||
await Promise.all(
|
||||
itemsToDelete.map(async (item) => {
|
||||
if (item.tenantProducts && item.tenantProducts.length > 0) {
|
||||
throw new Error(t("admin.pricing.errors.activeSubscriptions", { plans: t(item.title) }));
|
||||
}
|
||||
await createAdminLog(request, "admin.pricing.deletedPlan", item.id!);
|
||||
})
|
||||
);
|
||||
await Promise.all(
|
||||
itemsToDelete.map(async (item) => {
|
||||
if (itemsToDelete.some(isManagedBillingCatalogProduct)) {
|
||||
return badRequest({ error: t("admin.pricing.errors.managedCatalogProduct") });
|
||||
}
|
||||
const usedItem = itemsToDelete.find((item) => (item.tenantProductCount ?? 0) > 0);
|
||||
if (usedItem) {
|
||||
return badRequest({ error: t("admin.pricing.errors.activeSubscriptions", { plans: t(usedItem.title) }) });
|
||||
}
|
||||
try {
|
||||
for (const item of itemsToDelete) {
|
||||
await deletePlan(item);
|
||||
})
|
||||
);
|
||||
await createAdminLog(request, "admin.pricing.deletedPlan", item.id!);
|
||||
}
|
||||
} catch (error) {
|
||||
if (error && typeof error === "object" && "code" in error && error.code === "P2003") {
|
||||
return badRequest({ error: t("admin.pricing.errors.activeSubscriptions", { plans: itemsToDelete.map((item) => t(item.title)).join(", ") }) });
|
||||
}
|
||||
logger.error({ event: "admin.pricing.bulk_delete_failed", ...toSafeErrorLog(error) }, "Admin pricing bulk delete failed");
|
||||
return badRequest({ error: t("admin.pricing.errors.deleteFailed") });
|
||||
}
|
||||
return Response.json({ success: t("shared.deleted") });
|
||||
}
|
||||
};
|
||||
@@ -186,13 +170,12 @@ export default function AdminPricingRoute() {
|
||||
|
||||
const [selectedItems, setSelectedItems] = useState<SubscriptionProductDto[]>([]);
|
||||
|
||||
const [model, setModel] = useState<PricingModel>(PricingModel.FLAT_RATE);
|
||||
const [items, setItems] = useState<SubscriptionProductDto[]>([]);
|
||||
const [, setAllFeatures] = useState<SubscriptionFeatureDto[]>([]);
|
||||
useEffect(() => {
|
||||
updateItems(data.items);
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [data.items, model]);
|
||||
}, [data.items]);
|
||||
|
||||
useEffect(() => {
|
||||
if (actionData?.error) {
|
||||
@@ -206,11 +189,7 @@ export default function AdminPricingRoute() {
|
||||
}, [actionData]);
|
||||
|
||||
function updateItems(items: SubscriptionProductDto[]) {
|
||||
if (items.filter((f) => f.id).length > 0) {
|
||||
setItems(items);
|
||||
} else {
|
||||
setItems(items.filter((f) => f.model === model || model === PricingModel.ALL));
|
||||
}
|
||||
setItems(items);
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
@@ -239,15 +218,6 @@ export default function AdminPricingRoute() {
|
||||
// });
|
||||
// };
|
||||
|
||||
function createAllPlans() {
|
||||
const form = new FormData();
|
||||
appendCSRFToken(form);
|
||||
form.set("action", "create-all-plans");
|
||||
form.set("model", model.toString());
|
||||
submit(form, {
|
||||
method: "post",
|
||||
});
|
||||
}
|
||||
// function syncPlanWithPaymentProvider(item: SubscriptionProductDto) {
|
||||
// const form = new FormData();
|
||||
// form.set("action", "sync-plan-with-payment-provider");
|
||||
@@ -269,10 +239,6 @@ export default function AdminPricingRoute() {
|
||||
// });
|
||||
// }
|
||||
|
||||
function createdPlans() {
|
||||
return data.items.filter((f) => f.id).length;
|
||||
}
|
||||
|
||||
// function getFeatureValue(item: SubscriptionProductDto, name: string) {
|
||||
// return item.features.find((f) => f.name === name);
|
||||
// }
|
||||
@@ -289,7 +255,6 @@ export default function AdminPricingRoute() {
|
||||
|
||||
return (
|
||||
<EditPageLayout
|
||||
title={<BackButtonWithTitle href={adminPath("settings", { mode: "host-aware" })}>{t("admin.pricing.title")}</BackButtonWithTitle>}
|
||||
buttons={
|
||||
<>
|
||||
<Form method="post" className="flex h-9 items-center space-x-2">
|
||||
@@ -335,45 +300,13 @@ export default function AdminPricingRoute() {
|
||||
}
|
||||
>
|
||||
<div className="space-y-6">
|
||||
{createdPlans() === 0 && (
|
||||
<WarningBanner title={t("shared.warning")} text={t("admin.pricing.thesePricesAreFromFiles")}>
|
||||
<div className="mt-2 flex items-center space-x-2">
|
||||
<div className="w-44">
|
||||
<InputSelect
|
||||
name="model"
|
||||
title={t("models.subscriptionProduct.model")}
|
||||
withLabel={false}
|
||||
value={model}
|
||||
setValue={(e) => {
|
||||
setModel(Number(e));
|
||||
}}
|
||||
options={[
|
||||
...HIVEGRID_SUBSCRIPTION_PRICING_MODELS.map((value) => ({
|
||||
name: t("pricing." + PricingModel[value]),
|
||||
value,
|
||||
})),
|
||||
{
|
||||
name: t("shared.all"),
|
||||
value: PricingModel.ALL,
|
||||
},
|
||||
]}
|
||||
/>
|
||||
</div>
|
||||
<ButtonSecondary
|
||||
type="button"
|
||||
onClick={createAllPlans}
|
||||
disabled={loading || createdPlans() > 0 || !getUserHasPermission(adminData, "admin.pricing.create")}
|
||||
className="bg-yellow-500 text-yellow-900 hover:bg-yellow-400"
|
||||
>
|
||||
{t("admin.pricing.generateFromFiles")}
|
||||
</ButtonSecondary>
|
||||
</div>
|
||||
</WarningBanner>
|
||||
)}
|
||||
{data.items.some(isManagedBillingCatalogProduct) ? (
|
||||
<WarningBanner title={t("admin.pricing.managedBadge")} text={t("admin.pricing.catalogManaged")} />
|
||||
) : null}
|
||||
|
||||
<TableSimple
|
||||
selectedRows={selectedItems}
|
||||
onSelected={(items) => setSelectedItems(items)}
|
||||
onSelected={(items) => setSelectedItems(items.filter((item) => !isManagedBillingCatalogProduct(item)))}
|
||||
items={items}
|
||||
headers={[
|
||||
{
|
||||
@@ -384,14 +317,22 @@ export default function AdminPricingRoute() {
|
||||
{
|
||||
name: "title",
|
||||
title: t("models.subscriptionProduct.title"),
|
||||
value: (item) => (
|
||||
<div className="group flex items-center gap-1">
|
||||
<Link to={"edit/" + item.id} className="group-hover:underline">
|
||||
{t(item.title)}
|
||||
</Link>
|
||||
{item.badge && <div className="border-border bg-theme-50 text-theme-800 ml-1 rounded-md border px-1 py-0.5 text-xs">{t(item.badge)}</div>}
|
||||
</div>
|
||||
),
|
||||
value: (item) => {
|
||||
const managed = isManagedBillingCatalogProduct(item);
|
||||
return (
|
||||
<div className="group flex items-center gap-1">
|
||||
{managed ? (
|
||||
<span>{t(item.title)}</span>
|
||||
) : (
|
||||
<Link to={"edit/" + item.id} className="group-hover:underline">
|
||||
{t(item.title)}
|
||||
</Link>
|
||||
)}
|
||||
{managed ? <SimpleBadge title={t("admin.pricing.managedBadge")} color={Colors.BLUE} /> : null}
|
||||
{item.badge && <div className="border-border bg-theme-50 text-theme-800 ml-1 rounded-md border px-1 py-0.5 text-xs">{t(item.badge)}</div>}
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "model",
|
||||
@@ -422,8 +363,8 @@ export default function AdminPricingRoute() {
|
||||
value: (item) => (
|
||||
<div className="text-muted-foreground lowercase">
|
||||
{t("admin.pricing.subscriptionCount", {
|
||||
count: item.tenantProducts?.length ?? 0,
|
||||
formattedCount: formatters.number(item.tenantProducts?.length ?? 0),
|
||||
count: item.tenantProductCount ?? 0,
|
||||
formattedCount: formatters.number(item.tenantProductCount ?? 0),
|
||||
})}
|
||||
</div>
|
||||
),
|
||||
@@ -431,34 +372,32 @@ export default function AdminPricingRoute() {
|
||||
{
|
||||
name: "active",
|
||||
title: t("models.subscriptionProduct.status"),
|
||||
value: (item) => (
|
||||
<>
|
||||
{item.active ? (
|
||||
<>
|
||||
<button type="button" onClick={() => onToggle(item)} className="hover:underline">
|
||||
{item.public ? (
|
||||
<SimpleBadge title={t("models.subscriptionProduct.public")} color={Colors.TEAL} underline />
|
||||
) : (
|
||||
<SimpleBadge title={t("models.subscriptionProduct.custom")} color={Colors.ORANGE} underline />
|
||||
)}
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<SimpleBadge title={t("shared.inactive")} color={Colors.RED} />
|
||||
)}
|
||||
</>
|
||||
),
|
||||
value: (item) => {
|
||||
const status = item.public
|
||||
? <SimpleBadge title={t("models.subscriptionProduct.public")} color={Colors.TEAL} underline={!isManagedBillingCatalogProduct(item)} />
|
||||
: <SimpleBadge title={t("models.subscriptionProduct.custom")} color={Colors.ORANGE} underline={!isManagedBillingCatalogProduct(item)} />;
|
||||
if (!item.active) return <SimpleBadge title={t("shared.inactive")} color={Colors.RED} />;
|
||||
if (isManagedBillingCatalogProduct(item)) return status;
|
||||
return (
|
||||
<button type="button" onClick={() => onToggle(item)} className="hover:underline">
|
||||
{status}
|
||||
</button>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "actions",
|
||||
title: t("shared.actions"),
|
||||
value: (item) => (
|
||||
<div className="flex items-center space-x-2">
|
||||
<ButtonTertiary disabled={!item.id} to={"edit/" + item.id}>
|
||||
{t("shared.edit")}
|
||||
</ButtonTertiary>
|
||||
</div>
|
||||
),
|
||||
value: (item) =>
|
||||
isManagedBillingCatalogProduct(item) ? (
|
||||
<span className="text-muted-foreground text-xs">{t("admin.pricing.managedReadOnly")}</span>
|
||||
) : (
|
||||
<div className="flex items-center space-x-2">
|
||||
<ButtonTertiary disabled={!item.id} to={"edit/" + item.id}>
|
||||
{t("shared.edit")}
|
||||
</ButtonTertiary>
|
||||
</div>
|
||||
),
|
||||
},
|
||||
]}
|
||||
/>
|
||||
@@ -474,7 +413,7 @@ function DeleteIconButton({ onClick, items }: { onClick: () => void; items: Subs
|
||||
const navigation = useNavigation();
|
||||
const confirmModal = useRef<RefConfirmModal>(null);
|
||||
function onDeleting() {
|
||||
const hasWithSub = items.some((f) => (f.tenantProducts?.length ?? 0) > 0);
|
||||
const hasWithSub = items.some((f) => (f.tenantProductCount ?? 0) > 0);
|
||||
if (hasWithSub) {
|
||||
toast.error(t("admin.pricing.errors.activeSubscriptions", { plans: items.map((f) => t(f.title ?? "")).join(", ") }));
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user