@zuplo/zudoku-plugin-monetization 0.0.19 → 0.0.21

package/dist/index.mjs

@@ -391,7 +391,8 @@ const CheckoutConfirmPage = () => {
 							}), /* @__PURE__ */ jsx(Button, {
 								variant: "ghost",
 								className: "w-full",
-								asChild: true,
+								disabled: createSubscriptionMutation.isPending,
+								asChild: !createSubscriptionMutation.isPending,
 								children: /* @__PURE__ */ jsx(Link$1, {
 									to: "/pricing",
 									children: "Cancel"
@@ -1189,7 +1190,12 @@ const ChangeIndicator = ({ change }) => {
 	if (change === "decrease" || change === "removed" || change === "downgraded") return /* @__PURE__ */ jsx(ArrowDownIcon, { className: "w-4 h-4 text-amber-600 shrink-0" });
 	return /* @__PURE__ */ jsx(CheckIcon, { className: "w-4 h-4 text-green-600 shrink-0" });
 };
-const PlanComparisonItem = ({ comparison, subscriptionId, onRequestChange }) => {
+const modeLabelMap = {
+	upgrade: "Upgrade",
+	downgrade: "Downgrade",
+	private: "Switch"
+};
+const PlanComparisonItem = ({ comparison, subscriptionId, mode, onRequestChange }) => {
 	const price = getPriceFromPlan(comparison.plan);
 	const isCustom = comparison.plan.key === "enterprise";
 	const displayPrice = price.monthly;
@@ -1218,14 +1224,14 @@ const PlanComparisonItem = ({ comparison, subscriptionId, onRequestChange }) =>
 				size: "sm",
 				children: "Contact Sales"
 			}) : /* @__PURE__ */ jsx(Button$1, {
-				variant: comparison.isUpgrade ? "default" : "outline",
+				variant: mode === "upgrade" ? "default" : "outline",
 				onClick: () => onRequestChange({
 					subscriptionId,
 					plan: comparison.plan,
-					mode: comparison.isUpgrade ? "upgrade" : "downgrade"
+					mode
 				}),
 				size: "sm",
-				children: comparison.isUpgrade ? "Upgrade" : "Downgrade"
+				children: modeLabelMap[mode]
 			})]
 		}), hasChanges && /* @__PURE__ */ jsxs("div", {
 			className: "space-y-1.5",
@@ -1337,7 +1343,7 @@ const ConfirmSwitchAlert = ({ switchTo, onRequestClose }) => {
 		onSuccess: async (subscription) => {
 			await queryClient.invalidateQueries();
 			navigate(`/subscriptions/${subscription.id}`, { state: { planSwitched: {
-				isUpgrade: switchTo.mode === "upgrade",
+				mode: switchTo.mode,
 				newPlanName: switchTo.plan.name
 			} } });
 			onRequestClose();
@@ -1351,7 +1357,11 @@ const ConfirmSwitchAlert = ({ switchTo, onRequestClose }) => {
 		open: true,
 		onOpenChange: onRequestClose,
 		children: /* @__PURE__ */ jsxs(AlertDialogContent, { children: [/* @__PURE__ */ jsxs(AlertDialogHeader, { children: [
-			/* @__PURE__ */ jsxs(AlertDialogTitle, { children: ["Confirm ", switchTo.mode === "upgrade" ? "upgrade" : "downgrade"] }),
+			/* @__PURE__ */ jsxs(AlertDialogTitle, { children: [
+				"Confirm",
+				" ",
+				switchTo.mode === "private" ? "plan change" : switchTo.mode === "upgrade" ? "upgrade" : "downgrade"
+			] }),
 			mutation.isError && /* @__PURE__ */ jsx(Alert, {
 				variant: "destructive",
 				children: /* @__PURE__ */ jsx(AlertDescription, {
@@ -1359,14 +1369,14 @@ const ConfirmSwitchAlert = ({ switchTo, onRequestClose }) => {
 					children: mutation.error.message
 				})
 			}),
-			/* @__PURE__ */ jsx(AlertDialogDescription, { children: switchTo.mode === "upgrade" ? `Are you sure you want to upgrade to ${switchTo.plan.name}? This will take effect immediately.` : `Are you sure you want to downgrade to ${switchTo.plan.name}? This will take effect at the start of your next billing cycle.` })
+			/* @__PURE__ */ jsx(AlertDialogDescription, { children: switchTo.mode === "private" ? `Are you sure you want to switch to ${switchTo.plan.name}? This will take effect immediately.` : switchTo.mode === "upgrade" ? `Are you sure you want to upgrade to ${switchTo.plan.name}? This will take effect immediately.` : `Are you sure you want to downgrade to ${switchTo.plan.name}? This will take effect at the start of your next billing cycle.` })
 		] }), /* @__PURE__ */ jsxs(AlertDialogFooter, { children: [/* @__PURE__ */ jsx(AlertDialogCancel, {
 			disabled: mutation.isPending,
 			children: "Cancel"
 		}), /* @__PURE__ */ jsx(ActionButton, {
 			isPending: mutation.isPending,
 			onClick: () => mutation.mutate(),
-			children: switchTo.mode === "upgrade" ? "Upgrade" : "Downgrade"
+			children: modeLabelMap[switchTo.mode]
 		})] })] })
 	});
 };
@@ -1375,15 +1385,18 @@ const SwitchPlanModal = ({ subscription, children }) => {
 	const { data: plansData } = usePlans();
 	const [switchTo, setSwitchTo] = useState(null);
 	const currentPlan = plansData?.items.find((p) => p.id === subscription.plan.id);
-	const { upgrades, downgrades } = useMemo(() => {
+	const { upgrades, downgrades, privatePlans } = useMemo(() => {
 		if (!plansData?.items || !currentPlan) return {
 			upgrades: [],
-			downgrades: []
+			downgrades: [],
+			privatePlans: []
 		};
+		const isPrivatePlan = (plan) => plan.metadata?.zuplo_is_private === "true";
 		const allComparisons = plansData.items.filter((p) => p.id !== currentPlan.id).map((plan) => comparePlans(currentPlan, plan));
 		return {
-			upgrades: allComparisons.filter((c) => c.isUpgrade),
-			downgrades: allComparisons.filter((c) => !c.isUpgrade)
+			upgrades: allComparisons.filter((c) => c.isUpgrade && !isPrivatePlan(c.plan)),
+			downgrades: allComparisons.filter((c) => !c.isUpgrade && !isPrivatePlan(c.plan)),
+			privatePlans: allComparisons.filter((c) => isPrivatePlan(c.plan))
 		};
 	}, [plansData?.items, currentPlan]);
 	return /* @__PURE__ */ jsxs(Fragment, { children: [switchTo !== null && /* @__PURE__ */ jsx(ConfirmSwitchAlert, {
@@ -1434,11 +1447,8 @@ const SwitchPlanModal = ({ subscription, children }) => {
 						children: upgrades.map((comparison) => /* @__PURE__ */ jsx(PlanComparisonItem, {
 							comparison,
 							subscriptionId: subscription.id,
-							onRequestChange: ({ subscriptionId, plan }) => setSwitchTo({
-								subscriptionId,
-								plan,
-								mode: "upgrade"
-							})
+							mode: "upgrade",
+							onRequestChange: setSwitchTo
 						}, comparison.plan.id))
 					})] }),
 					downgrades.length > 0 && /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsxs("div", {
@@ -1458,11 +1468,29 @@ const SwitchPlanModal = ({ subscription, children }) => {
 						children: downgrades.map((comparison) => /* @__PURE__ */ jsx(PlanComparisonItem, {
 							comparison,
 							subscriptionId: subscription.id,
-							onRequestChange: ({ subscriptionId, plan }) => setSwitchTo({
-								subscriptionId,
-								plan,
-								mode: "downgrade"
-							})
+							mode: "downgrade",
+							onRequestChange: setSwitchTo
+						}, comparison.plan.id))
+					})] }),
+					privatePlans.length > 0 && /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsxs("div", {
+						className: "flex items-center justify-between mb-3",
+						children: [/* @__PURE__ */ jsxs("div", {
+							className: "flex items-center gap-2",
+							children: [/* @__PURE__ */ jsx(ArrowLeftRightIcon, { className: "size-5 text-muted-foreground" }), /* @__PURE__ */ jsx("span", {
+								className: "font-medium text-foreground",
+								children: "Private Plan Option"
+							})]
+						}), /* @__PURE__ */ jsx("span", {
+							className: "text-sm text-muted-foreground",
+							children: "Takes effect immediately"
+						})]
+					}), /* @__PURE__ */ jsx("div", {
+						className: "space-y-3",
+						children: privatePlans.map((comparison) => /* @__PURE__ */ jsx(PlanComparisonItem, {
+							comparison,
+							subscriptionId: subscription.id,
+							mode: "private",
+							onRequestChange: setSwitchTo
 						}, comparison.plan.id))
 					})] })
 				]
@@ -1719,7 +1747,11 @@ const ActiveSubscription = ({ subscription, deploymentName }) => {
 			variant: "info",
 			children: [
 				/* @__PURE__ */ jsx(CheckCheckIcon, { className: "size-4" }),
-				/* @__PURE__ */ jsxs(AlertTitle, { children: ["Plan ", planSwitched.isUpgrade ? "upgraded" : "downgraded"] }),
+				/* @__PURE__ */ jsxs(AlertTitle, { children: [
+					"Plan",
+					" ",
+					planSwitched.mode === "upgrade" ? "upgraded" : planSwitched.mode === "downgrade" ? "downgraded" : "changed"
+				] }),
 				/* @__PURE__ */ jsxs(AlertDescription, { children: [
 					"You have successfully switched to ",
 					planSwitched.newPlanName,
@@ -1923,20 +1955,21 @@ const zuploMonetizationPlugin = createPlugin((options) => ({
 				{
 					path: "/manage-payment",
 					element: /* @__PURE__ */ jsx(ManagePaymentPage, {})
+				},
+				{
+					path: PRICING_PATH,
+					handle: { layout: "default" },
+					element: /* @__PURE__ */ jsx(PricingPage, {
+						subtitle: options?.pricing?.subtitle,
+						title: options?.pricing?.title
+					})
+				},
+				{
+					handle: { layout: "default" },
+					path: "/subscriptions/:subscriptionId?",
+					element: /* @__PURE__ */ jsx(SubscriptionsPage, {})
 				}
 			]
-		}, {
-			Component: ZuploMonetizationWrapper,
-			children: [{
-				path: "/pricing",
-				element: /* @__PURE__ */ jsx(PricingPage, {
-					subtitle: options?.pricing?.subtitle,
-					title: options?.pricing?.title
-				})
-			}, {
-				path: "/subscriptions/:subscriptionId?",
-				element: /* @__PURE__ */ jsx(SubscriptionsPage, {})
-			}]
 		}];
 	},
 	getProtectedRoutes: () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/zudoku-plugin-monetization",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "repository": {
     "type": "git",
     "url": "https://github.com/zuplo/zudoku",
@@ -27,11 +27,11 @@
     "@testing-library/react": "16.3.2",
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
-    "happy-dom": "20.6.1",
+    "happy-dom": "20.7.0",
     "react": "19.2.4",
     "react-dom": "19.2.4",
     "tsdown": "0.20.3",
-    "zudoku": "0.69.3"
+    "zudoku": "0.70.3"
   },
   "peerDependencies": {
     "react": ">=19.2.0",