Merge branch 'main' into error-page

kantord · kantord · commit 2ee3e70064ee · 2025-12-02T10:40:15.000+01:00
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -16,6 +16,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
@@ -28,6 +34,7 @@ jobs:
         with:
           context: .
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: |
             ghcr.io/${{ github.repository }}:latest
             ghcr.io/${{ github.repository }}:${{ github.ref_name }}
diff --git a/package.json b/package.json
@@ -31,14 +31,14 @@
     "@radix-ui/react-toggle-group": "^1.1.11",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
-    "better-auth": "1.4.0-beta.25",
+    "better-auth": "1.4.4",
     "class-variance-authority": "0.7.1",
     "clsx": "2.1.1",
     "jose": "^6.1.2",
     "json-schema-faker": "^0.5.6",
     "lucide-react": "^0.554.0",
     "msw": "^2.12.2",
-    "next": "16.0.5",
+    "next": "16.0.6",
     "next-themes": "^0.4.6",
     "nuqs": "^2.8.1",
     "react": "19.2.0",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@biomejs/biome": "2.3.8",
     "@hey-api/client-next": "0.5.1",
-    "@hey-api/openapi-ts": "0.87.5",
+    "@hey-api/openapi-ts": "0.88.0",
     "@mswjs/http-middleware": "^0.10.2",
     "@tailwindcss/postcss": "^4",
     "@testing-library/dom": "^10.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/.gitkeep b/public/.gitkeep
diff --git a/public/okta-icon.svg b/public/okta-icon.svg
diff --git a/src/app/catalog/[repoName]/[serverName]/[version]/page.tsx b/src/app/catalog/[repoName]/[serverName]/[version]/page.tsx
@@ -30,7 +30,7 @@ export default async function CatalogDetailPage({
   const server = serverResponse?.server ?? {};
 
   return (
-    <div className="flex flex-col gap-2 pt-5 pb-8 px-4">
+    <div className="flex flex-col gap-2 pb-8 px-4">
       <ServerDetailTitle
         publisher={server.repository?.source}
         serverName={server.name || "Unknown server"}
diff --git a/src/app/catalog/components/servers-table.tsx b/src/app/catalog/components/servers-table.tsx
@@ -16,18 +16,17 @@ interface ServersTableProps {
   onServerClick?: (server: V0ServerJson) => void;
 }
 
-/**
- * Server table component that displays MCP servers in a table format
- */
 export function ServersTable({ servers, onServerClick }: ServersTableProps) {
   return (
     <div className="w-full overflow-hidden rounded-md border">
-      <Table className="table-fixed">
+      <Table className="min-w-full">
         <TableHeader className="bg-muted/50">
           <TableRow>
-            <TableHead className="w-2/12 pl-4">Server</TableHead>
-            <TableHead className="w-9/12">About</TableHead>
-            <TableHead className="w-1/12" />
+            <TableHead className="w-full pl-4 sm:w-1/5">Server</TableHead>
+            <TableHead className="hidden sm:w-7/10 sm:table-cell">
+              About
+            </TableHead>
+            <TableHead className="w-16 text-right sm:w-1/10" />
           </TableRow>
         </TableHeader>
         <TableBody>
@@ -43,13 +42,27 @@ export function ServersTable({ servers, onServerClick }: ServersTableProps) {
                 onClick={() => onServerClick?.(server)}
                 className={onServerClick ? "cursor-pointer" : undefined}
               >
-                <TableCell className="font-medium pl-4">{serverName}</TableCell>
-                <TableCell className="max-w-0 overflow-hidden text-ellipsis whitespace-nowrap">
+                <TableCell
+                  className="pl-4 align-middle sm:w-1/5"
+                  title={serverName}
+                >
+                  <p className="text-base font-medium sm:text-sm">
+                    {serverName}
+                  </p>
+                </TableCell>
+                <TableCell
+                  className="hidden pr-4 text-muted-foreground whitespace-normal wrap-break-word sm:table-cell sm:w-7/10"
+                  title={description}
+                >
                   {description}
                 </TableCell>
-                <TableCell>
+                <TableCell className="pr-3 text-right align-middle sm:w-1/10">
                   {url ? (
-                    <CopyUrlButton url={url} className="shadow-sm" />
+                    <CopyUrlButton
+                      url={url}
+                      className="md:h-9 md:w-auto md:rounded-md md:px-3"
+                      labelClassName="hidden md:inline"
+                    />
                   ) : null}
                 </TableCell>
               </TableRow>
diff --git a/src/app/signin/signin-button.tsx b/src/app/signin/signin-button.tsx
@@ -1,21 +1,26 @@
 "use client";
-import Image from "next/image";
+import { Loader2 } from "lucide-react";
+import { useState } from "react";
 import { toast } from "sonner";
+import { OktaIcon } from "@/components/brand-icons";
 import { Button } from "@/components/ui/button";
 import { authClient } from "@/lib/auth/auth-client";
 
 export function SignInButton({ providerId }: { providerId: string }) {
-  const isOktaProvider = providerId === "okta";
+  const [isLoading, setIsLoading] = useState(false);
+  const isOktaProvider = providerId === "okta" || providerId === "oidc";
   const providerName = providerId.charAt(0).toUpperCase() + providerId.slice(1);
 
   const handleOIDCSignIn = async () => {
+    setIsLoading(true);
     try {
       const { error } = await authClient.signIn.oauth2({
         providerId,
         callbackURL: "/catalog",
       });
 
       if (error) {
+        setIsLoading(false);
         toast.error("Signin failed", {
           description:
             error.message ||
@@ -24,6 +29,7 @@ export function SignInButton({ providerId }: { providerId: string }) {
         return;
       }
     } catch (error) {
+      setIsLoading(false);
       const errorMessage =
         error instanceof Error ? error.message : "An unexpected error occurred";
 
@@ -38,17 +44,16 @@ export function SignInButton({ providerId }: { providerId: string }) {
       onClick={handleOIDCSignIn}
       className="w-full h-9 gap-2"
       size="default"
+      disabled={isLoading}
     >
-      {isOktaProvider && (
-        <Image
-          src="/okta-icon.svg"
-          alt={providerName}
-          width={16}
-          height={16}
-          className="shrink-0"
-        />
+      {isLoading ? (
+        <Loader2 className="text-muted-foreground size-4 animate-spin" />
+      ) : (
+        <>
+          {isOktaProvider && <OktaIcon className="size-4 shrink-0" />}
+          <span>{providerName}</span>
+        </>
       )}
-      <span>{providerName}</span>
     </Button>
   );
 }
diff --git a/src/components/brand-icons/index.ts b/src/components/brand-icons/index.ts
@@ -0,0 +1 @@
+export { OktaIcon } from "./okta-icon";
diff --git a/src/components/brand-icons/okta-icon.tsx b/src/components/brand-icons/okta-icon.tsx
@@ -0,0 +1,16 @@
+import type { SVGProps } from "react";
+
+export const OktaIcon = (props: SVGProps<SVGSVGElement>) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 16 16"
+    aria-hidden="true"
+    {...props}
+  >
+    <path
+      fill="currentColor"
+      d="m8.803.111-.33 4.053a4.1 4.1 0 0 0-1.058.018l-.187-1.964a.11.11 0 0 1 .107-.116h.334L7.509.116C7.504.053 7.553 0 7.61 0H8.7c.062 0 .11.053.102.116zm-2.749.2C6.036.253 5.974.218 5.916.24L4.893.613c-.057.023-.084.09-.057.143l.831 1.813-.315.115a.104.104 0 0 0-.058.143l.85 1.782c.306-.169.64-.298.991-.378L6.059.311zM3.546 1.44l2.353 3.316c-.298.195-.57.426-.801.693l-1.41-1.387a.107.107 0 0 1 .005-.155l.258-.214L2.55 2.276a.104.104 0 0 1 .009-.156l.831-.698a.103.103 0 0 1 .151.018zM1.57 3.36c-.049-.036-.12-.018-.151.036l-.543.942a.105.105 0 0 0 .045.146l1.806.854-.17.289a.102.102 0 0 0 .05.146l1.796.823c.13-.334.303-.645.516-.925zM.241 5.92c.01-.062.072-.098.13-.084l3.935 1.026a3.9 3.9 0 0 0-.169 1.05l-1.97-.16a.103.103 0 0 1-.093-.125l.058-.33-1.988-.186C.08 7.107.04 7.05.05 6.987l.187-1.071zM.095 8.578c-.063.004-.103.062-.094.124l.191 1.071c.01.063.072.098.13.085l1.93-.502.057.328c.01.063.072.098.13.085l1.903-.525a3.9 3.9 0 0 1-.2-1.04L.09 8.578zm.631 2.818a.105.105 0 0 1 .045-.147l3.673-1.742c.138.329.325.635.547.91l-1.61 1.147a.105.105 0 0 1-.15-.03l-.17-.294-1.641 1.133c-.049.036-.12.018-.151-.035l-.547-.942zm4.452-.765-2.86 2.893a.104.104 0 0 0 .01.156l.835.698c.05.04.116.03.152-.018l1.156-1.627.258.218c.049.04.12.031.156-.022l1.12-1.627a4 4 0 0 1-.822-.67zm-.565 4.645a.104.104 0 0 1-.058-.143l1.695-3.697c.311.16.65.28 1 .346l-.498 1.911a.105.105 0 0 1-.137.071l-.316-.115-.53 1.924c-.017.058-.08.094-.137.071l-1.023-.373zm2.918-3.445-.33 4.053c-.004.063.045.116.103.116h1.09a.102.102 0 0 0 .102-.116l-.16-1.986h.333a.11.11 0 0 0 .107-.116l-.187-1.964a3.7 3.7 0 0 1-1.058.013M11.454.858a.103.103 0 0 0-.058-.142L10.373.342c-.058-.022-.12.014-.138.071l-.53 1.925-.315-.116c-.058-.022-.12.014-.138.071l-.498 1.911c.356.072.69.192 1 .347zm2.232 1.613-2.86 2.893a3.9 3.9 0 0 0-.822-.67l1.12-1.627a.11.11 0 0 1 .156-.023l.258.218 1.156-1.626a.103.103 0 0 1 .151-.018l.837.698c.049.04.049.11.008.155zm1.548 2.276a.102.102 0 0 0 .044-.147l-.547-.942a.11.11 0 0 0-.151-.036l-1.641 1.134-.17-.29c-.03-.053-.101-.07-.15-.03l-1.61 1.146q.333.416.547.911l3.673-1.742zm.578 1.475.187 1.071a.107.107 0 0 1-.094.125l-4.051.378a3.8 3.8 0 0 0-.2-1.04l1.903-.525a.102.102 0 0 1 .13.085l.057.328 1.93-.502c.058-.013.12.022.13.085zm-.182 3.934c.057.013.12-.023.129-.085L15.945 9a.107.107 0 0 0-.093-.124l-1.988-.187.058-.329a.107.107 0 0 0-.094-.124l-1.97-.16a3.9 3.9 0 0 1-.169 1.048l3.936 1.027zM14.58 12.6a.11.11 0 0 1-.151.036l-3.35-2.312q.322-.421.517-.924l1.797.822c.057.027.08.094.048.147l-.168.289 1.805.853a.105.105 0 0 1 .045.147zm-4.479-1.364 2.353 3.315a.103.103 0 0 0 .151.018l.832-.698a.11.11 0 0 0 .009-.155l-1.401-1.418.258-.214a.104.104 0 0 0 .004-.155l-1.41-1.387a3.8 3.8 0 0 1-.8.694zm-.022 4.515c-.058.022-.12-.013-.138-.071l-1.076-3.92c.351-.08.685-.209.992-.378l.85 1.782c.026.058 0 .125-.059.143l-.315.115.831 1.814c.027.057 0 .12-.057.142l-1.023.373z"
+    />
+  </svg>
+);
diff --git a/src/components/copy-url-button.tsx b/src/components/copy-url-button.tsx
@@ -4,10 +4,12 @@ import { Copy } from "lucide-react";
 import type { ComponentPropsWithoutRef } from "react";
 import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 
 interface CopyUrlButtonProps
   extends Omit<ComponentPropsWithoutRef<typeof Button>, "onClick"> {
   url: string;
+  labelClassName?: string;
 }
 
 /**
@@ -17,6 +19,7 @@ export function CopyUrlButton({
   url,
   variant = "secondary",
   size = "sm",
+  labelClassName,
   ...props
 }: CopyUrlButtonProps) {
   const handleCopyUrl = async (e: React.MouseEvent<HTMLButtonElement>) => {
@@ -40,7 +43,7 @@ export function CopyUrlButton({
       {...props}
     >
       <Copy className="size-4" />
-      Copy URL
+      <span className={cn(labelClassName)}>Copy URL</span>
     </Button>
   );
 }
diff --git a/src/components/user-menu/user-menu-button.tsx b/src/components/user-menu/user-menu-button.tsx
@@ -17,7 +17,7 @@ export const UserMenuButton = forwardRef<
     <Button
       ref={ref}
       variant="ghost"
-      className="flex items-center gap-2"
+      className="cursor-pointer flex items-center gap-2 h-[46px] focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0"
       {...props}
     >
       <UserAvatar userName={userName} />

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { OktaIcon } from "./okta-icon";`