π OpenHands: AI-Driven Development
UI for determining if llm options are enabled (#10665)
Tim O'Farrell8d13c9f32813
diff --git a/frontend/src/api/open-hands.ts b/frontend/src/api/open-hands.tsindex 8cd11d3df1..01ddcabbaf 100644--- a/frontend/src/api/open-hands.ts+++ b/frontend/src/api/open-hands.ts@@ -31,6 +31,7 @@ import { SuggestedTask } from "#/components/features/home/tasks/task.types";import { extractNextPageFromLink } from "#/utils/extract-next-page-from-link";import { RepositoryMicroagent } from "#/types/microagent-management";import { BatchFeedbackData } from "#/hooks/query/use-batch-feedback";+import { SubscriptionAccess } from "#/types/billing";class OpenHands {private static currentConversation: Conversation | null = null;@@ -433,6 +434,13 @@ class OpenHands {return data.credits;}+ static async getSubscriptionAccess(): Promise<SubscriptionAccess | null> {+ const { data } = await openHands.get<SubscriptionAccess | null>(+ "/api/billing/subscription-access",+ );+ return data;+ }+static async getGitUser(): Promise<GitUser> {const response = await openHands.get<GitUser>("/api/user/info");diff --git a/frontend/src/api/open-hands.types.ts b/frontend/src/api/open-hands.types.tsindex 35e8391fa9..9621594e91 100644--- a/frontend/src/api/open-hands.types.ts+++ b/frontend/src/api/open-hands.types.ts@@ -49,7 +49,6 @@ export interface GetConfigResponse {APP_SLUG?: string;GITHUB_CLIENT_ID: string;POSTHOG_CLIENT_KEY: string;- STRIPE_PUBLISHABLE_KEY?: string;PROVIDERS_CONFIGURED?: Provider[];AUTH_URL?: string;FEATURE_FLAGS: {diff --git a/frontend/src/hooks/query/use-subscription-access.ts b/frontend/src/hooks/query/use-subscription-access.tsnew file mode 100644index 0000000000..aab3ad2c6e--- /dev/null+++ b/frontend/src/hooks/query/use-subscription-access.ts@@ -0,0 +1,18 @@+import { useQuery } from "@tanstack/react-query";+import { useConfig } from "./use-config";+import OpenHands from "#/api/open-hands";+import { useIsOnTosPage } from "#/hooks/use-is-on-tos-page";++export const useSubscriptionAccess = () => {+ const { data: config } = useConfig();+ const isOnTosPage = useIsOnTosPage();++ return useQuery({+ queryKey: ["user", "subscription_access"],+ queryFn: OpenHands.getSubscriptionAccess,+ enabled:+ !isOnTosPage &&+ config?.APP_MODE === "saas" &&+ config?.FEATURE_FLAGS?.ENABLE_BILLING,+ });+};diff --git a/frontend/src/mocks/handlers.ts b/frontend/src/mocks/handlers.tsindex 66863d4149..12153c4d45 100644--- a/frontend/src/mocks/handlers.ts+++ b/frontend/src/mocks/handlers.ts@@ -169,7 +169,6 @@ export const handlers = [APP_MODE: mockSaas ? "saas" : "oss",GITHUB_CLIENT_ID: "fake-github-client-id",POSTHOG_CLIENT_KEY: "fake-posthog-client-key",- STRIPE_PUBLISHABLE_KEY: "",FEATURE_FLAGS: {ENABLE_BILLING: false,HIDE_LLM_SETTINGS: mockSaas,diff --git a/frontend/src/routes/settings.tsx b/frontend/src/routes/settings.tsxindex df007e3bbf..4a97e9f1b3 100644--- a/frontend/src/routes/settings.tsx+++ b/frontend/src/routes/settings.tsx@@ -1,3 +1,4 @@+import { useMemo } from "react";import { NavLink, Outlet, redirect } from "react-router";import { useTranslation } from "react-i18next";import SettingsIcon from "#/icons/settings.svg?react";@@ -8,6 +9,7 @@ import { Route } from "./+types/settings";import OpenHands from "#/api/open-hands";import { queryClient } from "#/query-client-config";import { GetConfigResponse } from "#/api/open-hands.types";+import { useSubscriptionAccess } from "#/hooks/query/use-subscription-access";const SAAS_ONLY_PATHS = ["/settings/user",@@ -62,10 +64,22 @@ export const clientLoader = async ({ request }: Route.ClientLoaderArgs) => {function SettingsScreen() {const { t } = useTranslation();const { data: config } = useConfig();+ const { data: subscriptionAccess } = useSubscriptionAccess();const isSaas = config?.APP_MODE === "saas";// this is used to determine which settings are available in the UI- const navItems = isSaas ? SAAS_NAV_ITEMS : OSS_NAV_ITEMS;+ const navItems = useMemo(() => {+ const items = [];+ if (isSaas) {+ if (subscriptionAccess) {+ items.push({ to: "/settings", text: "SETTINGS$NAV_LLM" });+ }+ items.push(...SAAS_NAV_ITEMS);+ } else {+ items.push(...OSS_NAV_ITEMS);+ }+ return items;+ }, [isSaas, !!subscriptionAccess]);return (<maindiff --git a/frontend/src/types/billing.tsx b/frontend/src/types/billing.tsxnew file mode 100644index 0000000000..28827597e3--- /dev/null+++ b/frontend/src/types/billing.tsx@@ -0,0 +1,6 @@+export type SubscriptionAccess = {+ status: "ACTIVE" | "DISABLED";+ start_at: string;+ end_at: string;+ created_at: string;+};