@lukoweb/apitogo-plugin-dev-portal-billing 0.1.89 → 0.1.91

package/dist/index.d.mts

@@ -75,6 +75,7 @@ declare const ApiKeysPanel: ({
 //#endregion
 //#region src/paths.d.ts
 declare const PRICING_PATH = "/pricing";
+declare const ACCOUNT_PLANS_PATH = "/account/plans";
 declare const CHECKOUT_PATH = "/checkout";
 declare const SUBSCRIPTIONS_PATH = "/account/subscriptions";
 declare const CREDENTIALS_PATH = "/account/credentials";
@@ -201,4 +202,4 @@ declare function useCreateApiKey(): _tanstack_react_query0.UseMutationResult<Dev
 }, unknown>;
 declare function useRevokeApiKey(): _tanstack_react_query0.UseMutationResult<void, Error, string, unknown>;
 //#endregion
-export { API_KEY_CAP_REACHED, AccountPlansPage, ApiKeysPanel, CHECKOUT_PATH, CREDENTIALS_PATH, OverviewDashboardPage, PRICING_PATH, SUBSCRIPTIONS_PATH, USAGE_PATH, devPortalBillingPlugin, useApiKeys, useCreateApiKey, useRevokeApiKey };
+export { ACCOUNT_PLANS_PATH, API_KEY_CAP_REACHED, AccountPlansPage, ApiKeysPanel, CHECKOUT_PATH, CREDENTIALS_PATH, OverviewDashboardPage, PRICING_PATH, SUBSCRIPTIONS_PATH, USAGE_PATH, devPortalBillingPlugin, useApiKeys, useCreateApiKey, useRevokeApiKey };

package/dist/index.mjs

@@ -252,14 +252,6 @@ const PricingCard = ({ plan, mode = "public", subscriptionStatus, isSubscribed =
 						to: `/checkout?planSku=${encodeURIComponent(plan.sku)}`,
 						children: isPlanFree(plan) ? "Get started" : "Subscribe"
 					})
-				}) : isActive ? /* @__PURE__ */ jsx(Button, {
-					variant: "secondary",
-					className: "w-full",
-					asChild: true,
-					children: /* @__PURE__ */ jsx(Link$1, {
-						to: "/account/subscriptions",
-						children: "Manage subscription"
-					})
 				}) : /* @__PURE__ */ jsx(Button, {
 					variant: featured ? "default" : "outline",
 					className: "w-full",
@@ -814,6 +806,7 @@ function useUsageRecent(limit = 20) {
 //#endregion
 //#region src/paths.ts
 const PRICING_PATH = "/pricing";
+const ACCOUNT_PLANS_PATH = "/account/plans";
 const CHECKOUT_PATH = "/checkout";
 const SUBSCRIPTIONS_PATH = "/account/subscriptions";
 const CREDENTIALS_PATH = "/account/credentials";
@@ -1266,7 +1259,6 @@ const RedirectPage = ({ icon: Icon, title, description, url, children }) => {
 
 //#endregion
 //#region src/pages/CheckoutPage.tsx
-const ACCOUNT_PLANS_PATH = "/account/plans";
 const CheckoutPage = () => {
 	const [searchParams] = useSearchParams();
 	const planSku = searchParams.get("planSku") ?? "";
@@ -1472,7 +1464,7 @@ const CredentialsPage = () => {
 					className: "mt-4",
 					asChild: true,
 					children: /* @__PURE__ */ jsx(Link$1, {
-						to: "/account/plans",
+						to: ACCOUNT_PLANS_PATH,
 						children: "View plans"
 					})
 				})]
@@ -1490,7 +1482,7 @@ const CredentialsPage = () => {
 					className: "mt-4",
 					asChild: true,
 					children: /* @__PURE__ */ jsx(Link$1, {
-						to: "/account/plans",
+						to: ACCOUNT_PLANS_PATH,
 						children: "View plans"
 					})
 				})]
@@ -1506,7 +1498,7 @@ const CredentialsPage = () => {
 						className: "mt-4",
 						asChild: true,
 						children: /* @__PURE__ */ jsx(Link$1, {
-							to: "/account/plans",
+							to: ACCOUNT_PLANS_PATH,
 							children: "View plans"
 						})
 					})]
@@ -1630,23 +1622,16 @@ const DEFAULT_FAQS = [{
 }];
 const PricingPage = () => {
 	const { pricing, previewPlans } = useDevPortalBillingConfig();
-	const auth = useAuth();
 	const isPreview = useDevPortalPreviewMode();
 	const pricingEnabled = isPreviewPricingEnabled() || isPreview;
 	const livePlans = usePlans();
 	const catalog = isPreview ? parseManifestPlans(previewPlans) : livePlans.data;
 	const isLoading = isPreview ? false : livePlans.isLoading;
 	const isError = isPreview ? false : livePlans.isError;
-	const { data: me } = useMySubscriptions();
 	if (!pricingEnabled) return /* @__PURE__ */ jsx(Navigate, {
 		to: "/",
 		replace: true
 	});
-	if (auth.sessionChecked && auth.isAuthenticated && !isPreview) return /* @__PURE__ */ jsx(Navigate, {
-		to: "/account/plans",
-		replace: true
-	});
-	const activeSkus = new Set((me?.subscriptions ?? []).filter((sub) => isActiveSubscription(sub.status)).map((sub) => sub.planSku));
 	const title = pricing?.title ?? "Pay for what you call";
 	const subtitle = pricing?.subtitle ?? "Every plan includes the full endpoint catalog. Higher tiers raise your request quota, rate limit, and support level.";
 	const plans = catalog?.plans ?? [];
@@ -1702,7 +1687,6 @@ const PricingPage = () => {
 						children: plans.map((plan) => /* @__PURE__ */ jsx(PricingCard, {
 							plan,
 							mode: "public",
-							isSubscribed: activeSkus.has(plan.sku),
 							featured: plan.sku === featuredSku
 						}, plan.sku))
 					}) : !isLoading && !isError ? /* @__PURE__ */ jsxs("div", {
@@ -1904,7 +1888,7 @@ const SubscriptionsPage = () => {
 					className: "mt-4",
 					asChild: true,
 					children: /* @__PURE__ */ jsx(Link$1, {
-						to: "/account/plans",
+						to: ACCOUNT_PLANS_PATH,
 						children: "View plans"
 					})
 				})]
@@ -1943,7 +1927,7 @@ const SubscriptionsPage = () => {
 						variant: "outline",
 						asChild: true,
 						children: /* @__PURE__ */ jsx(Link$1, {
-							to: "/account/plans",
+							to: ACCOUNT_PLANS_PATH,
 							children: "Change plan"
 						})
 					}),
@@ -2193,8 +2177,11 @@ function withoutLoginNavigation(items) {
 
 //#endregion
 //#region src/utils/navigation-plans.ts
+function isPricingLink(item) {
+	return typeof item !== "string" && item.to === PRICING_PATH;
+}
 function hasPricingLink(items) {
-	return items.some((item) => typeof item !== "string" && item.type === "link" && item.to === PRICING_PATH);
+	return items.some(isPricingLink);
 }
 function withPricingNavigation(items) {
 	const current = items ?? [];
@@ -2205,11 +2192,26 @@ function withPricingNavigation(items) {
 		label: "Pricing"
 	}];
 }
+/** Header nav uses `{ label, to }` (no `type`). Insert before Docs when present. */
+function withHeaderPricingNavigation(items) {
+	const current = [...items ?? []];
+	if (hasPricingLink(current)) return current;
+	const pricingItem = {
+		label: "Pricing",
+		to: PRICING_PATH
+	};
+	const docsIndex = current.findIndex((item) => typeof item !== "string" && (item.to === "/introduction" || item.label === "Docs"));
+	if (docsIndex >= 0) {
+		current.splice(docsIndex, 0, pricingItem);
+		return current;
+	}
+	return [...current, pricingItem];
+}
 function withoutPricingNavigation(items) {
 	if (!items?.length) return [];
 	return items.map((item) => {
 		if (typeof item === "string") return item;
-		if (item.type === "link" && item.to === PRICING_PATH) return null;
+		if (isPricingLink(item)) return null;
 		if (item.items?.length) {
 			const filteredItems = withoutPricingNavigation(item.items);
 			return {
@@ -2225,7 +2227,7 @@ function withoutPricingNavigation(items) {
 //#region src/utils/header-navigation.ts
 function buildDevPortalHeaderNavigation({ navigation, pricingEnabled, authNavEnabled }) {
 	let items = [...navigation ?? []];
-	if (!pricingEnabled) items = withoutPricingNavigation(items);
+	items = pricingEnabled ? withHeaderPricingNavigation(items) : withoutPricingNavigation(items);
 	if (!authNavEnabled) items = withoutLoginNavigation(items);
 	return items;
 }
@@ -2308,6 +2310,7 @@ const devPortalBillingPlugin = createPlugin((options = {}) => ({
 	}],
 	getProtectedRoutes: () => [
 		CHECKOUT_PATH,
+		ACCOUNT_PLANS_PATH,
 		SUBSCRIPTIONS_PATH,
 		CREDENTIALS_PATH,
 		USAGE_PATH
@@ -2315,4 +2318,4 @@ const devPortalBillingPlugin = createPlugin((options = {}) => ({
 }));
 
 //#endregion
-export { API_KEY_CAP_REACHED, AccountPlansPage, ApiKeysPanel, CHECKOUT_PATH, CREDENTIALS_PATH, OverviewDashboardPage, PRICING_PATH, SUBSCRIPTIONS_PATH, USAGE_PATH, devPortalBillingPlugin, useApiKeys, useCreateApiKey, useRevokeApiKey };
+export { ACCOUNT_PLANS_PATH, API_KEY_CAP_REACHED, AccountPlansPage, ApiKeysPanel, CHECKOUT_PATH, CREDENTIALS_PATH, OverviewDashboardPage, PRICING_PATH, SUBSCRIPTIONS_PATH, USAGE_PATH, devPortalBillingPlugin, useApiKeys, useCreateApiKey, useRevokeApiKey };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lukoweb/apitogo-plugin-dev-portal-billing",
-  "version": "0.1.89",
+  "version": "0.1.91",
   "repository": {
     "type": "git",
     "url": "https://github.com/zuplo/zudoku",
@@ -46,8 +46,8 @@
     "react": "19.2.4",
     "react-dom": "19.2.4",
     "tsdown": "0.20.3",
-    "@lukoweb/apitogo": "0.1.89",
-    "@lukoweb/apitogo-module-user-panel": "0.1.89"
+    "@lukoweb/apitogo": "0.1.91",
+    "@lukoweb/apitogo-module-user-panel": "0.1.91"
   },
   "peerDependencies": {
     "react": ">=19.2.0",