Merge branch 'main' into brendan-kellam/minidenticons-avatar

Author: brendan-kellam

packages/web/src/actions.ts

@@ -104,7 +104,7 @@ export default async function Page(props: PageProps) {
 
     const languageModels = await getConfiguredLanguageModelsInfo();
     const repos = await getRepos();
-    const searchContexts = await getSearchContexts(params.domain);
+    const searchContexts = await getSearchContexts();
     const chatInfo = await getChatInfo({ chatId: params.id });
     const chatHistory = session ? await getUserChatHistory() : [];
 

packages/web/src/app/[domain]/chat/[id]/page.tsx

@@ -27,7 +27,7 @@ interface PageProps {
 export default async function Page(props: PageProps) {
     const params = await props.params;
     const languageModels = await getConfiguredLanguageModelsInfo();
-    const searchContexts = await getSearchContexts(params.domain);
+    const searchContexts = await getSearchContexts();
     const allRepos = await getRepos();
     const session = await auth();
     const chatHistory = session ? await getUserChatHistory() : [];

packages/web/src/app/[domain]/chat/page.tsx

@@ -33,7 +33,7 @@ export const NavigationMenu = async ({
         throw new ServiceErrorException(repoStats);
     }
 
-    const role = isAuthenticated ? await getCurrentUserRole(domain) : null;
+    const role = isAuthenticated ? await getCurrentUserRole() : null;
     if (isServiceError(role)) {
         throw new ServiceErrorException(role);
     }
@@ -43,7 +43,7 @@ export const NavigationMenu = async ({
             return null;
         }
 
-        const joinRequests = await getOrgAccountRequests(domain);
+        const joinRequests = await getOrgAccountRequests();
         if (isServiceError(joinRequests)) {
             throw new ServiceErrorException(joinRequests);
         }

packages/web/src/app/[domain]/components/navigationMenu/index.tsx

@@ -107,7 +107,7 @@ export const useSuggestionsData = ({
 
     const { data: searchContextSuggestions, isLoading: _isLoadingSearchContexts } = useQuery({
         queryKey: ["searchContexts", domain],
-        queryFn: () => getSearchContexts(domain),
+        queryFn: () => getSearchContexts(),
         select: (data): Suggestion[] => {
             if (isServiceError(data)) {
                 return [];

packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts

@@ -52,7 +52,7 @@ export default async function RepoDetailPage({ params }: { params: Promise<{ id:
 
     const repoMetadata = repoMetadataSchema.parse(repo.metadata);
 
-    const userRole = await getCurrentUserRole(SINGLE_TENANT_ORG_DOMAIN);
+    const userRole = await getCurrentUserRole();
     if (isServiceError(userRole)) {
         throw new ServiceErrorException(userRole);
     }

packages/web/src/app/[domain]/repos/[id]/page.tsx

@@ -24,7 +24,7 @@ export default async function Layout(
         throw new ServiceErrorException(repoStats);
     }
 
-    const userRoleInOrg = await getCurrentUserRole(domain);
+    const userRoleInOrg = await getCurrentUserRole();
 
     return (
         <div className="min-h-screen flex flex-col">

packages/web/src/app/[domain]/repos/layout.tsx

@@ -7,7 +7,6 @@ import { Input } from "@/components/ui/input";
 import { isServiceError } from "@/lib/utils";
 import { Copy, Check, AlertTriangle, Loader2, Plus } from "lucide-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { useDomain } from "@/hooks/useDomain";
 import { useToast } from "@/components/hooks/use-toast";
 import useCaptureEvent from "@/hooks/useCaptureEvent";
 import { DataTable } from "@/components/ui/data-table";
@@ -16,7 +15,6 @@ import { Skeleton } from "@/components/ui/skeleton";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 
 export function ApiKeysPage({ canCreateApiKey }: { canCreateApiKey: boolean }) {
-    const domain = useDomain();
     const { toast } = useToast();
     const captureEvent = useCaptureEvent();
 
@@ -33,7 +31,7 @@ export function ApiKeysPage({ canCreateApiKey }: { canCreateApiKey: boolean }) {
         setIsLoading(true);
         setError(null);
         try {
-            const keys = await getUserApiKeys(domain);
+            const keys = await getUserApiKeys();
             if (isServiceError(keys)) {
                 setError("Failed to load API keys");
                 toast({
@@ -55,7 +53,7 @@ export function ApiKeysPage({ canCreateApiKey }: { canCreateApiKey: boolean }) {
         } finally {
             setIsLoading(false);
         }
-    }, [domain, toast]);
+    }, [toast]);
 
     useEffect(() => {
         loadApiKeys();
@@ -73,7 +71,7 @@ export function ApiKeysPage({ canCreateApiKey }: { canCreateApiKey: boolean }) {
 
         setIsCreatingKey(true);
         try {
-            const result = await createApiKey(newKeyName.trim(), domain);
+            const result = await createApiKey(newKeyName.trim());
             if (isServiceError(result)) {
                 toast({
                     title: "Error",

packages/web/src/app/[domain]/settings/apiKeys/apiKeysPage.tsx

@@ -4,7 +4,6 @@ import { ColumnDef } from "@tanstack/react-table"
 import { ArrowUpDown, Key, Trash2 } from "lucide-react"
 import { Button } from "@/components/ui/button"
 import { deleteApiKey } from "@/actions"
-import { useParams } from "next/navigation"
 import {
     AlertDialog,
     AlertDialogAction,
@@ -27,14 +26,13 @@ export type ApiKeyColumnInfo = {
 
 // Component for the actions cell to properly use React hooks
 function ApiKeyActions({ apiKey }: { apiKey: ApiKeyColumnInfo }) {
-    const params = useParams<{ domain: string }>()
     const [isPending, setIsPending] = useState(false)
     const { toast } = useToast()
 
     const handleDelete = async () => {
         setIsPending(true)
         try {
-            await deleteApiKey(apiKey.name, params.domain)
+            await deleteApiKey(apiKey.name)
             window.location.reload()
         } catch (error) {
             console.error("Failed to delete API key", error)

packages/web/src/app/[domain]/settings/apiKeys/columns.tsx

@@ -70,7 +70,7 @@ export const getSidebarNavItems = async () =>
     withAuthV2(async ({ role }) => {
         let numJoinRequests: number | undefined;
         if (role === OrgRole.OWNER) {
-            const requests = await getOrgAccountRequests(SINGLE_TENANT_ORG_DOMAIN);
+            const requests = await getOrgAccountRequests();
             if (isServiceError(requests)) {
                 throw new ServiceErrorException(requests);
             }