comi-logic/cfw-autumn
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/useautumn/autumn

Browse Source
This commit is contained in:
John Yeo
2025-11-06 16:57:08 +00:00
parent 363bf64445 799b14118f
commit 5be475a4ee
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/internal/customers/attach/handleAttachPreview/getNewProductPreview.ts
View File

@@ -119,6 +119,10 @@ export const getNewProductPreview = async ({
});
}
if (config.disableTrial) {
attachParams.freeTrial = null;
}
const items = await getItemsForNewProduct({
newProduct,
attachParams,

4
vite/src/views/products/plan/components/EditPlanHeader.tsx
View File

@@ -28,7 +28,9 @@ import { PlanToolbar } from "./PlanToolbar.tsx";
export const EditPlanHeader = () => {
const { product, numVersions } = useProductQuery();
const { counts } = useProductCountsQuery();
const { counts } = useProductCountsQuery(
product.version ? { version: product.version } : {},
);
const { refetch: refetchMigrations } = useMigrationsQuery();
const { queryStates, setQueryStates } = useProductQueryState();
const axiosInstance = useAxiosInstance();

14
vite/src/views/products/product/hooks/queries/useProductCountsQuery.tsx
View File

@@ -1,10 +1,14 @@
import { useQuery } from "@tanstack/react-query";
import { useParams } from "react-router-dom";
import { useAxiosInstance } from "@/services/useAxiosInstance";
import { useProductStore } from "@/hooks/stores/useProductStore";
import { useAxiosInstance } from "@/services/useAxiosInstance";
import { useProductQueryState } from "../useProductQuery";
export const useProductCountsQuery = () => {
export const useProductCountsQuery = ({
version,
}: {
version?: number;
} = {}) => {
const axiosInstance = useAxiosInstance();
const { product_id } = useParams();
const { queryStates } = useProductQueryState();
@@ -17,12 +21,14 @@ export const useProductCountsQuery = () => {
if (!productId) return null;
// Always get counts for the latest version (don't pass version param)
// This ensures we check if the CURRENT version has customers, not older versions
const { data } = await axiosInstance.get(`/products/${productId}/count`);
const { data } = await axiosInstance.get(`/products/${productId}/count`, {
...(version ? { params: { version } } : {}),
});
return data;
};
const { data, isLoading, error, refetch } = useQuery({
queryKey: ["product_counts", productId],
queryKey: ["product_counts", productId, version],
queryFn: fetchProductCounts,
retry: false, // Don't retry on error (e.g., product not found)
enabled: !!productId, // Only run query if productId exists