Skip to content

feat: autumn migration #902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaheshtheDev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: autumn migration #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/app/auth/connect/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ function AuthConnectContent() {
setIsUpgrading(true)
const safeSuccessUrl = `${window.location.origin}${window.location.pathname}?callback=${encodeURIComponent(callback ?? "")}&client=${encodeURIComponent(validClient ?? "")}`
await autumn.attach({
productId: "api_pro",
planId: "api_pro",
successUrl: safeSuccessUrl,
})
} catch (err) {
Expand Down
10 changes: 5 additions & 5 deletions apps/web/components/add-document/connections.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ interface ConnectContentProps {
export function ConnectContent({ selectedProject }: ConnectContentProps) {
const queryClient = useQueryClient()
const autumn = useCustomer()
const isProUser = hasActivePlan(autumn.customer?.products, "api_pro")
const isProUser = hasActivePlan(autumn.data?.subscriptions, "api_pro")
const [connectingProvider, setConnectingProvider] =
useState<ConnectorProvider | null>(null)
const [gdriveSyncScope, setGdriveSyncScope] =
Expand All @@ -244,7 +244,7 @@ export function ConnectContent({ selectedProject }: ConnectContentProps) {
setIsUpgrading(true)
try {
await autumn.attach({
productId: "api_pro",
planId: "api_pro",
successUrl: window.location.href,
})
} catch (error) {
Expand All @@ -254,9 +254,9 @@ export function ConnectContent({ selectedProject }: ConnectContentProps) {
}
}

const connectionsFeature = autumn.customer?.features?.connections
const connectionsUsed = connectionsFeature?.usage ?? 0
const connectionsLimit = connectionsFeature?.included_usage ?? 10
const connectionsBalance = autumn.data?.balances?.connections
const connectionsUsed = connectionsBalance?.usage ?? 0
const connectionsLimit = connectionsBalance?.granted ?? 10
const canAddConnection = connectionsUsed < connectionsLimit

// Fetch connections
Expand Down
61 changes: 16 additions & 45 deletions apps/web/components/add-document/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { toast } from "sonner"
import { useDocumentMutations } from "../../hooks/use-document-mutations"
import { useCustomer } from "autumn-js/react"
import { useTokenUsage } from "@/hooks/use-token-usage"
import { tokensToCredits, formatUsageNumber } from "@/lib/billing-utils"
import { formatUsageNumber } from "@/lib/billing-utils"
import { SpaceSelector } from "../space-selector"
import { useIsMobile } from "@hooks/use-mobile"
import { addDocumentParam } from "@/lib/search-params"
Expand Down Expand Up @@ -127,11 +127,8 @@ export function AddDocument({
const autumn = useCustomer()
const {
tokensUsed,
tokensLimit,
tokensPercent,
searchesUsed,
searchesLimit,
searchesPercent,
planUsagePct,
hasPaidPlan,
isLoading: isLoadingUsage,
} = useTokenUsage(autumn)
Expand Down Expand Up @@ -298,72 +295,46 @@ export function AddDocument({
dmSansClassName(),
)}
>
Credits
Plan usage
</span>
<span
className={cn(
"text-sm font-medium",
"text-sm font-medium tabular-nums",
hasPaidPlan ? "text-[#4BA0FA]" : "text-[#737373]",
dmSansClassName(),
)}
>
{isLoadingUsage
? "…"
: `${tokensToCredits(tokensUsed)} / ${tokensToCredits(tokensLimit)}`}
: `${planUsagePct < 1 && planUsagePct > 0 ? "< 1" : Math.round(planUsagePct)}% used`}
</span>
</div>
<div className="h-2 w-full rounded-[40px] bg-[#2E353D] p-px overflow-hidden">
<div
className="h-full rounded-[40px]"
style={{
width: `${tokensPercent}%`,
width: `${planUsagePct}%`,
background:
tokensPercent > 80
planUsagePct > 80
? "#ef4444"
: hasPaidPlan
? "linear-gradient(to right, #4BA0FA 80%, #002757 100%)"
: "#0054AD",
}}
title={`${formatUsageNumber(tokensUsed)} tokens · ${formatUsageNumber(searchesUsed)} queries`}
/>
</div>
</div>

<div className="flex flex-col gap-2">
<div className="flex justify-between items-center">
<span
{!isLoadingUsage && (
<p
className={cn(
"text-[#FAFAFA] text-sm font-medium",
"text-xs text-[#737373] tabular-nums",
dmSansClassName(),
)}
>
Search Queries
</span>
<span
className={cn(
"text-sm font-medium",
hasPaidPlan ? "text-[#4BA0FA]" : "text-[#737373]",
dmSansClassName(),
)}
>
{isLoadingUsage
? "…"
: `${formatUsageNumber(searchesUsed)} / ${formatUsageNumber(searchesLimit)}`}
</span>
</div>
<div className="h-2 w-full rounded-[40px] bg-[#2E353D] p-px overflow-hidden">
<div
className="h-full rounded-[40px]"
style={{
width: `${searchesPercent}%`,
background:
searchesPercent > 80
? "#ef4444"
: hasPaidPlan
? "linear-gradient(to right, #4BA0FA 80%, #002757 100%)"
: "#0054AD",
}}
/>
</div>
{formatUsageNumber(tokensUsed)} tokens ·{" "}
{formatUsageNumber(searchesUsed)} queries
</p>
)}
</div>

{!hasPaidPlan && (
Expand All @@ -373,7 +344,7 @@ export function AddDocument({
setIsUpgrading(true)
try {
await autumn.attach({
productId: "api_pro",
planId: "api_pro",
successUrl: "https://app.supermemory.ai/settings#account",
})
window.location.reload()
Expand Down
2 changes: 1 addition & 1 deletion apps/web/components/integrations-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export function IntegrationsView() {
const [, setAddDoc] = useQueryState("add", addDocumentParam)
const { org } = useAuth()
const autumn = useCustomer()
const hasProProduct = hasActivePlan(autumn.customer?.products, "api_pro")
const hasProProduct = hasActivePlan(autumn.data?.subscriptions, "api_pro")

const { data: connections = [] } = useQuery({
queryKey: ["connections"],
Expand Down
4 changes: 2 additions & 2 deletions apps/web/components/integrations/plugins-detail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ export function PluginsDetail() {
})
const [keyCopied, setKeyCopied] = useState(false)

const hasProProduct = hasActivePlan(autumn.customer?.products, "api_pro")
const hasProProduct = hasActivePlan(autumn.data?.subscriptions, "api_pro")

const { data: pluginsData } = useQuery({
queryFn: async () => {
Expand Down Expand Up @@ -496,7 +496,7 @@ export function PluginsDetail() {
const handleUpgrade = async () => {
try {
await autumn.attach({
productId: "api_pro",
planId: "api_pro",
successUrl: "https://app.supermemory.ai/?view=integrations",
})
window.location.reload()
Expand Down
Loading
Loading