cleanup & index routes

zuplo · Jan 27, 2025 · 1b0103a · 1b0103a
1 parent 4ee0a1b
commit 1b0103a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 24 deletions.
diff --git a/.../zudoku/src/lib/plugins/openapi/Route.tsx → .../src/lib/plugins/openapi/OpenApiRoute.tsx b/.../zudoku/src/lib/plugins/openapi/Route.tsx → .../src/lib/plugins/openapi/OpenApiRoute.tsx
@@ -1,4 +1,4 @@
-import { Outlet, useParams } from "react-router";
+import { Outlet } from "react-router";
 import { joinPath } from "../../util/joinPath.js";
 import type { GraphQLClient } from "./client/GraphQLClient.js";
 import { GraphQLProvider } from "./client/GraphQLContext.js";
@@ -8,16 +8,16 @@ import { type OasPluginConfig } from "./interfaces.js";
 export const OpenApiRoute = ({
   basePath,
   versions,
+  version,
   config,
   client,
 }: {
   basePath: string;
+  version?: string;
   versions: string[];
   config: OasPluginConfig;
   client: GraphQLClient;
 }) => {
-  const { version } = useParams<"version">();
-
   const input =
     config.type === "file"
       ? {

diff --git a/packages/zudoku/src/lib/plugins/openapi/index.tsx b/packages/zudoku/src/lib/plugins/openapi/index.tsx
@@ -1,7 +1,7 @@
 import slugify from "@sindresorhus/slugify";
 import { useQuery } from "@tanstack/react-query";
 import { CirclePlayIcon, LogInIcon } from "lucide-react";
-import { matchPath, RouteObject } from "react-router";
+import { matchPath, redirect, RouteObject } from "react-router";
 import type { SidebarItem } from "../../../config/validators/SidebarSchema.js";
 import { useAuth } from "../../authentication/hook.js";
 import { ColorMap } from "../../components/navigation/SidebarBadge.js";
@@ -137,9 +137,10 @@ export const openApiPlugin = (config: OpenApiPluginOptions): ZudokuPlugin => {
       }
 
       try {
-        const version =
-          versions.find((v) => path.startsWith(joinUrl(basePath, v))) ??
-          Object.keys(config.input).at(0);
+        const urlVersion = versions.find((v) =>
+          path.startsWith(joinUrl(basePath, v)),
+        );
+        const version = urlVersion ?? Object.keys(config.input).at(0);
 
         const data = await client.fetch(GetCategoriesQuery, {
           type: config.type,
@@ -173,7 +174,7 @@ export const openApiPlugin = (config: OpenApiPluginOptions): ZudokuPlugin => {
           .map<SidebarItem>((tag) => {
             const categoryLink = joinUrl(
               basePath,
-              version,
+              urlVersion,
               tag.name ? slugify(tag.name) : "~endpoints",
             );
             return {
@@ -187,17 +188,6 @@ export const openApiPlugin = (config: OpenApiPluginOptions): ZudokuPlugin => {
               collapsible: false,
               collapsed: true,
               items: path === categoryLink ? items : [],
-              // TODO left in for single page APIs
-              // items: tag.operations.map((operation) => ({
-              //   type: "link",
-              //   label: operation.summary ?? operation.path,
-              //   href: `#${operation.slug}`,
-              //   badge: {
-              //     label: operation.method,
-              //     color: MethodColorMap[operation.method.toLowerCase()]!,
-              //     invert: true,
-              //   },
-              // })),
             };
           });
 
@@ -220,10 +210,11 @@ export const openApiPlugin = (config: OpenApiPluginOptions): ZudokuPlugin => {
         return {
           path: versionPath,
           async lazy() {
-            const { OpenApiRoute } = await import("./Route.js");
+            const { OpenApiRoute } = await import("./OpenApiRoute.js");
             return {
               element: (
                 <OpenApiRoute
+                  version={version ?? undefined}
                   basePath={basePath}
                   versions={versions}
                   client={client}
@@ -235,10 +226,8 @@ export const openApiPlugin = (config: OpenApiPluginOptions): ZudokuPlugin => {
           children: [
             {
               index: true,
-              async lazy() {
-                // const { OperationList } = await import("./OperationList.js");
-                return { element: <div>im the new index page</div> };
-                // return { element: <OperationList /> };
+              loader: () => {
+                return redirect(joinUrl(versionPath, tagPages.at(0)?.path));
               },
             },
             {