From e86608086784a45361810cbcaaf04ef634994a58 Mon Sep 17 00:00:00 2001
From: Brett Jephson <brett@gitbook.io>
Date: Thu, 12 Sep 2024 16:46:18 +0100
Subject: [PATCH] Update server choice based on selection

---
 .../components/DocumentView/OpenAPI/OpenAPI.tsx | 12 ++++++------
 packages/react-openapi/src/OpenAPIOperation.tsx | 17 +----------------
 packages/react-openapi/src/OpenAPIServerURL.tsx |  2 +-
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/packages/gitbook/src/components/DocumentView/OpenAPI/OpenAPI.tsx b/packages/gitbook/src/components/DocumentView/OpenAPI/OpenAPI.tsx
index e2a2256c7..b49afa70b 100644
--- a/packages/gitbook/src/components/DocumentView/OpenAPI/OpenAPI.tsx
+++ b/packages/gitbook/src/components/DocumentView/OpenAPI/OpenAPI.tsx
@@ -105,14 +105,14 @@ function parseModifiers(data: OpenAPIOperationData, params: Record<string, strin
     if (!data) {
         return;
     }
-    const { servers } = params;
+    const { server: serverQueryParam } = params;
     const serverIndex =
-        servers && !isNaN(Number(servers))
-            ? Math.min(0, Math.max(Number(servers), servers.length - 1))
+        serverQueryParam && !isNaN(Number(serverQueryParam))
+            ? Math.max(0, Math.min(Number(serverQueryParam), data.servers.length - 1))
             : 0;
     const server = data.servers[serverIndex];
-    if (server && server.variables) {
-        return Object.keys(server.variables).reduce<Record<string, number>>(
+    if (server) {
+        return Object.keys(server.variables ?? {}).reduce<Record<string, number>>(
             (result, key) => {
                 const selection = Number(params[key]);
                 if (!isNaN(selection)) {
@@ -120,7 +120,7 @@ function parseModifiers(data: OpenAPIOperationData, params: Record<string, strin
                 }
                 return result;
             },
-            { servers: serverIndex },
+            { server: serverIndex },
         );
     }
 }
diff --git a/packages/react-openapi/src/OpenAPIOperation.tsx b/packages/react-openapi/src/OpenAPIOperation.tsx
index 48d9e9390..cda323e84 100644
--- a/packages/react-openapi/src/OpenAPIOperation.tsx
+++ b/packages/react-openapi/src/OpenAPIOperation.tsx
@@ -28,9 +28,8 @@ export async function OpenAPIOperation(props: {
         enumSelectors: context.enumSelectors,
     };
 
-    const config = await getConfiguration(context);
     return (
-        <ScalarApiClient>
+        <ScalarApiClient serverUrl={getServersURL(data.servers, context.enumSelectors)}>
             <div className={classNames('openapi-operation', className)}>
                 <div className="openapi-intro">
                     <h2 className="openapi-summary" id={context.id}>
@@ -72,17 +71,3 @@ export async function OpenAPIOperation(props: {
         </ScalarApiClient>
     );
 }
-
-async function getConfiguration(context: OpenAPIContextProps) {
-    const response = await fetch(context.specUrl);
-    const doc = await response.json();
-
-    return {
-        spec: {
-            content: {
-                ...doc,
-                servers: [{ url: getServersURL(doc.servers, context.enumSelectors) }],
-            },
-        },
-    };
-}
diff --git a/packages/react-openapi/src/OpenAPIServerURL.tsx b/packages/react-openapi/src/OpenAPIServerURL.tsx
index 5bce96035..2c322436e 100644
--- a/packages/react-openapi/src/OpenAPIServerURL.tsx
+++ b/packages/react-openapi/src/OpenAPIServerURL.tsx
@@ -26,7 +26,7 @@ export function OpenAPIServerURL(props: {
     return (
         <ServerURLForm context={context} servers={servers} serverIndex={serverIndex}>
             {parts.map((part, i) => {
-                if (part.kind === 'text') {
+                if (part.kind === 'text') { 
                     return <span key={i}>{part.text}</span>;
                 } else {
                     if (!server.variables?.[part.name]) {