From e1f7cd90ac1a039bd19671f70ed6baefd840f109 Mon Sep 17 00:00:00 2001 From: msukkari Date: Mon, 24 Feb 2025 17:24:47 -0800 Subject: [PATCH] fix other merge error and build warnings --- packages/web/src/app/[domain]/components/configEditor.tsx | 1 - packages/web/src/app/[domain]/components/navigationMenu.tsx | 1 - .../[domain]/connections/[id]/components/configSetting.tsx | 3 ++- .../connections/[id]/components/deleteConnectionSetting.tsx | 2 +- .../src/app/[domain]/onboard/components/connectCodeHost.tsx | 1 - packages/web/src/app/[domain]/secrets/secretsTable.tsx | 1 - .../[domain]/settings/billing/manageSubscriptionButton.tsx | 2 +- packages/web/src/app/[domain]/settings/billing/page.tsx | 1 - .../app/[domain]/settings/members/components/membersList.tsx | 4 ++-- packages/web/src/app/components/logoutEscapeHatch.tsx | 1 - packages/web/src/app/onboard/components/orgCreateForm.tsx | 2 +- packages/web/src/app/posthogProvider.tsx | 2 +- 12 files changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/web/src/app/[domain]/components/configEditor.tsx b/packages/web/src/app/[domain]/components/configEditor.tsx index effffede..edfe4248 100644 --- a/packages/web/src/app/[domain]/components/configEditor.tsx +++ b/packages/web/src/app/[domain]/components/configEditor.tsx @@ -20,7 +20,6 @@ import { Separator } from "@/components/ui/separator"; import { Schema } from "ajv"; import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; import useCaptureEvent from "@/hooks/useCaptureEvent"; -import { PosthogEvent, PosthogEventMap } from "@/lib/posthogEvents"; import { CodeHostType } from "@/lib/utils"; export type QuickActionFn = (previous: T) => T; export type QuickAction = { diff --git a/packages/web/src/app/[domain]/components/navigationMenu.tsx b/packages/web/src/app/[domain]/components/navigationMenu.tsx index 1cf67778..3fd9a5e0 100644 --- a/packages/web/src/app/[domain]/components/navigationMenu.tsx +++ b/packages/web/src/app/[domain]/components/navigationMenu.tsx @@ -7,7 +7,6 @@ import { GitHubLogoIcon, DiscordLogoIcon } from "@radix-ui/react-icons"; import { redirect } from "next/navigation"; import { OrgSelector } from "./orgSelector"; import { getSubscriptionData } from "@/actions"; -import { isServiceError } from "@/lib/utils"; import { ErrorNavIndicator } from "./errorNavIndicator"; import { WarningNavIndicator } from "./warningNavIndicator"; import { ProgressNavIndicator } from "./progressNavIndicator"; diff --git a/packages/web/src/app/[domain]/connections/[id]/components/configSetting.tsx b/packages/web/src/app/[domain]/connections/[id]/components/configSetting.tsx index c63b2263..f173475c 100644 --- a/packages/web/src/app/[domain]/connections/[id]/components/configSetting.tsx +++ b/packages/web/src/app/[domain]/connections/[id]/components/configSetting.tsx @@ -105,7 +105,7 @@ function ConfigSettingInternal({ return checkIfSecretExists(secretKey, domain); }, { message: "Secret not found" }) }); - }, [schema]); + }, [schema, domain]); const form = useForm>({ resolver: zodResolver(formSchema), @@ -227,6 +227,7 @@ function ConfigSettingInternal({ ref={editorRef} + type={type} value={value} onChange={onConfigChange} schema={schema} diff --git a/packages/web/src/app/[domain]/connections/[id]/components/deleteConnectionSetting.tsx b/packages/web/src/app/[domain]/connections/[id]/components/deleteConnectionSetting.tsx index 879e1cc5..4172be12 100644 --- a/packages/web/src/app/[domain]/connections/[id]/components/deleteConnectionSetting.tsx +++ b/packages/web/src/app/[domain]/connections/[id]/components/deleteConnectionSetting.tsx @@ -59,7 +59,7 @@ export const DeleteConnectionSetting = ({ .finally(() => { setIsLoading(false); }); - }, [connectionId, domain, router, toast]); + }, [connectionId, domain, router, toast, captureEvent]); return (
diff --git a/packages/web/src/app/[domain]/onboard/components/connectCodeHost.tsx b/packages/web/src/app/[domain]/onboard/components/connectCodeHost.tsx index 5c8ff025..71d94f4a 100644 --- a/packages/web/src/app/[domain]/onboard/components/connectCodeHost.tsx +++ b/packages/web/src/app/[domain]/onboard/components/connectCodeHost.tsx @@ -22,7 +22,6 @@ interface ConnectCodeHostProps { export const ConnectCodeHost = ({ nextStep }: ConnectCodeHostProps) => { const [selectedCodeHost, setSelectedCodeHost] = useState(null); const router = useRouter(); - const captureEvent = useCaptureEvent(); const onCreated = useCallback(() => { router.push(`?step=${nextStep}`); }, [nextStep, router]); diff --git a/packages/web/src/app/[domain]/secrets/secretsTable.tsx b/packages/web/src/app/[domain]/secrets/secretsTable.tsx index 7d56bfb4..ff6fd3cf 100644 --- a/packages/web/src/app/[domain]/secrets/secretsTable.tsx +++ b/packages/web/src/app/[domain]/secrets/secretsTable.tsx @@ -15,7 +15,6 @@ import { useToast } from "@/components/hooks/use-toast"; import { deleteSecret } from "../../../actions" import { useDomain } from "@/hooks/useDomain"; import useCaptureEvent from "@/hooks/useCaptureEvent"; -import { PosthogEvent } from "@/lib/posthogEvents"; import { ErrorCode } from "@/lib/errorCodes"; const formSchema = z.object({ key: z.string().min(2).max(40), diff --git a/packages/web/src/app/[domain]/settings/billing/manageSubscriptionButton.tsx b/packages/web/src/app/[domain]/settings/billing/manageSubscriptionButton.tsx index 121f0767..ec7a7b4b 100644 --- a/packages/web/src/app/[domain]/settings/billing/manageSubscriptionButton.tsx +++ b/packages/web/src/app/[domain]/settings/billing/manageSubscriptionButton.tsx @@ -25,7 +25,7 @@ export function ManageSubscriptionButton({ currentUserRole }: { currentUserRole: router.push(session) captureEvent('wa_manage_subscription_button_create_portal_session_success', {}) } - } catch (error) { + } catch (_error) { captureEvent('wa_manage_subscription_button_create_portal_session_fail', { error: "Unknown error", }) diff --git a/packages/web/src/app/[domain]/settings/billing/page.tsx b/packages/web/src/app/[domain]/settings/billing/page.tsx index b35d09e9..53401cbd 100644 --- a/packages/web/src/app/[domain]/settings/billing/page.tsx +++ b/packages/web/src/app/[domain]/settings/billing/page.tsx @@ -2,7 +2,6 @@ import type { Metadata } from "next" import { CalendarIcon, DollarSign, Users } from "lucide-react" import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card" -import { Separator } from "@/components/ui/separator" import { ManageSubscriptionButton } from "./manageSubscriptionButton" import { getSubscriptionData, getCurrentUserRole, getSubscriptionBillingEmail } from "@/actions" import { isServiceError } from "@/lib/utils" diff --git a/packages/web/src/app/[domain]/settings/members/components/membersList.tsx b/packages/web/src/app/[domain]/settings/members/components/membersList.tsx index 28f3e014..e19860e5 100644 --- a/packages/web/src/app/[domain]/settings/members/components/membersList.tsx +++ b/packages/web/src/app/[domain]/settings/members/components/membersList.tsx @@ -81,7 +81,7 @@ export const MembersList = ({ members, currentUserId, currentUserRole, orgName } router.refresh(); } }); - }, [domain, toast, router]); + }, [domain, toast, router, captureEvent]); const onTransferOwnership = useCallback((memberId: string) => { transferOwnership(memberId, domain) @@ -121,7 +121,7 @@ export const MembersList = ({ members, currentUserId, currentUserRole, orgName } router.push("/"); } }); - }, [domain, toast, router]); + }, [domain, toast, router, captureEvent]); return (
diff --git a/packages/web/src/app/components/logoutEscapeHatch.tsx b/packages/web/src/app/components/logoutEscapeHatch.tsx index 7bccb6be..8311afe0 100644 --- a/packages/web/src/app/components/logoutEscapeHatch.tsx +++ b/packages/web/src/app/components/logoutEscapeHatch.tsx @@ -1,6 +1,5 @@ import { LogOutIcon } from "lucide-react"; import { signOut } from "@/auth"; -import { cn } from "@/lib/utils"; interface LogoutEscapeHatchProps { className?: string; } diff --git a/packages/web/src/app/onboard/components/orgCreateForm.tsx b/packages/web/src/app/onboard/components/orgCreateForm.tsx index 5c6892d5..c200caff 100644 --- a/packages/web/src/app/onboard/components/orgCreateForm.tsx +++ b/packages/web/src/app/onboard/components/orgCreateForm.tsx @@ -64,7 +64,7 @@ export function OrgCreateForm() { router.push(`/${data.domain}/onboard`); captureEvent('wa_onboard_org_create_success', {}) } - }, [router, toast]); + }, [router, toast, captureEvent]); const handleNameChange = (e: React.ChangeEvent) => { const name = e.target.value diff --git a/packages/web/src/app/posthogProvider.tsx b/packages/web/src/app/posthogProvider.tsx index 995ab850..336c15ee 100644 --- a/packages/web/src/app/posthogProvider.tsx +++ b/packages/web/src/app/posthogProvider.tsx @@ -6,7 +6,7 @@ import { PostHogProvider as PHProvider } from 'posthog-js/react' import { resolveServerPath } from './api/(client)/client' import { isDefined } from '@/lib/utils' import { usePathname, useSearchParams } from "next/navigation" -import { useEffect, Suspense } from "react" +import { useEffect } from "react" const POSTHOG_ENABLED = isDefined(NEXT_PUBLIC_POSTHOG_PAPIK) && !NEXT_PUBLIC_SOURCEBOT_TELEMETRY_DISABLED;