hide api playground on broken pages

fern-api · May 23, 2024 · 4a30921 · 4a30921
1 parent 5e612ad
commit 4a30921
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 26 deletions.
diff --git a/packages/ui/app/src/api-playground/PlaygroundContext.tsx b/packages/ui/app/src/api-playground/PlaygroundContext.tsx
@@ -60,19 +60,15 @@ export const PlaygroundContextProvider: FC<PropsWithChildren> = ({ children }) =
         if (unfetchedApis.length === 0) {
             return;
         }
-
-        void Promise.all(
-            unfetchedApis.map(async (apiId) => {
-                const r = await fetch(
-                    urljoin(basePath ?? "", "/api/fern-docs/resolve-api?path=" + (basePath ?? "/") + "&api=" + apiId),
-                );
-                const data: Record<string, ResolvedRootPackage> | null = await r.json();
-                if (data == null) {
-                    return;
-                }
-                setApis((currentApis) => ({ ...currentApis, ...data }));
-            }),
-        );
+        const fetchApis = async () => {
+            const r = await fetch(urljoin(basePath ?? "", "/api/fern-docs/resolve-api"));
+            const data: Record<string, ResolvedRootPackage> | null = await r.json();
+            if (data == null) {
+                return;
+            }
+            setApis((currentApis) => ({ ...currentApis, ...data }));
+        };
+        void fetchApis();
     }, [apiIds, apis, basePath, setApis]);
 
     const flattenedApis = useMemo(() => mapValues(apis, flattenRootPackage), [apis]);

diff --git a/packages/ui/app/src/api-playground/PlaygroundDrawer.tsx b/packages/ui/app/src/api-playground/PlaygroundDrawer.tsx
@@ -283,7 +283,7 @@ export const PlaygroundDrawer: FC<PlaygroundDrawerProps> = ({ apis }) => {
         group: undefined,
     };
 
-    if (!hasPlayground) {
+    if (!hasPlayground || apiGroups.length === 0) {
         return null;
     }
 

diff --git a/packages/ui/app/src/api-playground/VerticalSplitPane.tsx b/packages/ui/app/src/api-playground/VerticalSplitPane.tsx
@@ -25,7 +25,7 @@ export function VerticalSplitPane({
         }
     }, []);
 
-    const handleVerticalResize = useVerticalSplitPane(setHeight);
+    const { handleVerticalResize } = useVerticalSplitPane(setHeight);
 
     const [above, below] = Children.toArray(children);
 
@@ -74,7 +74,7 @@ export function HorizontalSplitPane({
     children,
     rizeBarHeight,
     mode = "percent",
-    initialLeftWidth = mode === "percent" ? 0.6 : 300,
+    initialLeftWidth = mode === "percent" ? 0.5 : 300,
     ...props
 }: PropsWithChildren<HorizontalSplitPaneProps>): ReactElement | null {
     const [leftWidth, setLeftWidth] = useState(initialLeftWidth);

diff --git a/packages/ui/docs-bundle/src/pages/api/fern-docs/resolve-api.ts b/packages/ui/docs-bundle/src/pages/api/fern-docs/resolve-api.ts
@@ -24,13 +24,14 @@ const resolveApiHandler: NextApiHandler = async (
             return;
         }
         const hostWithoutTrailingSlash = xFernHost.endsWith("/") ? xFernHost.slice(0, -1) : xFernHost;
-        const maybePathName = req.query.path;
-        const api = req.query.api;
+        const fullUrl = req.url;
 
-        if (maybePathName == null || typeof maybePathName !== "string" || api == null || typeof api !== "string") {
-            return res.status(400).json(null);
+        if (fullUrl == null) {
+            res.status(400).json(null);
+            return;
         }
 
+        const maybePathName = fullUrl.split("/api/fern-docs/resolve-api")[0] ?? "";
         const pathname = maybePathName.startsWith("/") ? maybePathName : `/${maybePathName}`;
         const url = `${hostWithoutTrailingSlash}${pathname}`;
         // eslint-disable-next-line no-console
@@ -46,14 +47,8 @@ const resolveApiHandler: NextApiHandler = async (
 
         const docs = docsResponse.body;
         const docsDefinition = docs.definition;
-        const apiDefinition = docsDefinition.apis[api];
         const docsConfig = docsDefinition.config;
 
-        if (apiDefinition == null) {
-            res.status(404).json(null);
-            return;
-        }
-
         const basePathSlug =
             docs.baseUrl.basePath != null ? docs.baseUrl.basePath.split("/").filter((t) => t.length > 0) : [];