fix(dashboard): resolve pinned license plan version

Author: charlietlamb

vite/src/hooks/queries/usePlanLicensesQuery.tsx

@@ -3,19 +3,22 @@ import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useQueryKeyFactory } from "@/hooks/common/useQueryKeyFactory";
 import { useAxiosInstance } from "@/services/useAxiosInstance";
 
-const EMPTY_PLAN_LICENSES: PlanLicense[] = [];
+export type VersionedPlanLicense = PlanLicense & { version: number };
+
+const EMPTY_PLAN_LICENSES: VersionedPlanLicense[] = [];
 
 const toPlanLicenses = ({
 	parentPlanId,
 	licenses,
 }: {
 	parentPlanId: string;
 	licenses: NonNullable<ApiPlanV1["licenses"]>;
-}): PlanLicense[] =>
+}): VersionedPlanLicense[] =>
 	licenses.map((link) => ({
 		id: `${parentPlanId}:${link.license_plan_id}`,
 		parent_plan_id: parentPlanId,
 		license_plan_id: link.license_plan_id,
+		version: link.version,
 		included: link.included,
 		prepaid_only: link.prepaid_only,
 		customize: link.customize ?? null,
@@ -45,7 +48,7 @@ export const usePlanLicensesQuery = (parentPlanId?: string) => {
 		});
 	};
 
-	const { data, isLoading, error, refetch } = useQuery<PlanLicense[]>({
+	const { data, isLoading, error, refetch } = useQuery<VersionedPlanLicense[]>({
 		queryKey: buildKey(["plan_licenses", parentPlanId ?? null]),
 		queryFn: () => fetchPlanLicenses(parentPlanId as string),
 		enabled: Boolean(parentPlanId),

vite/src/views/products/plan/components/plan-licenses/resolvePlanLicenseProduct.ts

@@ -0,0 +1,14 @@
+import type { ProductV2 } from "@autumn/shared";
+
+export const resolvePlanLicenseProduct = ({
+	products,
+	planId,
+	version,
+}: {
+	products: ProductV2[];
+	planId: string;
+	version: number;
+}) =>
+	products.find(
+		(product) => product.id === planId && product.version === version,
+	);

vite/src/views/products/plan/components/plan-licenses/useResolvedPlanLicenses.ts

@@ -12,6 +12,7 @@ import {
 	pendingPlanLicense,
 	usePendingLicenseLinks,
 } from "./PendingLicenseLinksContext";
+import { resolvePlanLicenseProduct } from "./resolvePlanLicenseProduct";
 
 export interface ResolvedPlanLicense {
 	planLicense: PlanLicense;
@@ -33,7 +34,7 @@ export function useResolvedPlanLicenses(): ResolvedPlanLicense[] {
 	const { planLicenses: fallbackPlanLicenses } = usePlanLicensesQuery(
 		isLicense || pageCatalogLicenses ? undefined : product?.id,
 	);
-	const { products } = useProductsQuery();
+	const { products } = useProductsQuery({ allVersions: true });
 	const { pendingLicenseIds } = usePendingLicenseLinks();
 	const initialPatches = useInitialLicensePatches();
 
@@ -44,10 +45,20 @@ export function useResolvedPlanLicenses(): ResolvedPlanLicense[] {
 		const licenseById = new Map(
 			products.map((license) => [license.id, license]),
 		);
+		for (const license of products) {
+			const latest = licenseById.get(license.id);
+			if (!latest || license.version > latest.version) {
+				licenseById.set(license.id, license);
+			}
+		}
 		const persistedLicenses = pageCatalogLicenses
 			? pageCatalogLicenses.map((entry) => ({ ...entry, isPendingLink: false }))
 			: fallbackPlanLicenses.flatMap((planLicense) => {
-					const license = licenseById.get(planLicense.license_plan_id);
+					const license = resolvePlanLicenseProduct({
+						products,
+						planId: planLicense.license_plan_id,
+						version: planLicense.version,
+					});
 					return license
 						? [{ planLicense, license, isPendingLink: false }]
 						: [];

vite/tests/views/products/plan/resolve-plan-license-product.test.ts

@@ -0,0 +1,15 @@
+import { expect, test } from "bun:test";
+import type { ProductV2 } from "@autumn/shared";
+import { resolvePlanLicenseProduct } from "@/views/products/plan/components/plan-licenses/resolvePlanLicenseProduct";
+
+test("resolves the license version pinned by the parent plan", () => {
+	const products = [
+		{ id: "team_seat", version: 1, name: "$54" },
+		{ id: "team_seat", version: 5, name: "$72" },
+	] as ProductV2[];
+
+	expect(
+		resolvePlanLicenseProduct({ products, planId: "team_seat", version: 1 })
+			?.name,
+	).toBe("$54");
+});