+ {/*
*/}
+ (
+
+ Name
+
+
+
+
+
+ )}
+ />
+ {apiKey && (
+
+ API Key (Copy the API key now)
+
+
+
+ {/* */}
+
+ )}
+
+
+ {apiKey ? (
+
+ ) : (
+
+ )}
+
+
+
+
+
+ );
+}
diff --git a/web/src/components/MachineList.tsx b/web/src/components/MachineList.tsx
index 3783977..eedaf29 100644
--- a/web/src/components/MachineList.tsx
+++ b/web/src/components/MachineList.tsx
@@ -2,6 +2,7 @@
import { getRelativeTime } from "../lib/getRelativeTime";
import { LoadingIcon } from "./LoadingIcon";
+import { callServerPromise } from "./callServerPromise";
import {
FormControl,
FormField,
@@ -56,7 +57,6 @@ import {
import { ArrowUpDown, MoreHorizontal } from "lucide-react";
import * as React from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
import { z } from "zod";
export type Machine = {
@@ -176,20 +176,6 @@ export const columns: ColumnDef
[] = [
},
];
-export async function callServerPromise(result: Promise) {
- return result
- .then((x) => {
- if ((x as { message: string })?.message !== undefined) {
- toast.success((x as { message: string }).message);
- }
- return x;
- })
- .catch((error) => {
- toast.error(error.message);
- return null;
- });
-}
-
export function MachineList({ data }: { data: Machine[] }) {
const [sorting, setSorting] = React.useState([]);
const [columnFilters, setColumnFilters] = React.useState(
diff --git a/web/src/components/NavbarRight.tsx b/web/src/components/NavbarRight.tsx
index 14364ca..f64a853 100644
--- a/web/src/components/NavbarRight.tsx
+++ b/web/src/components/NavbarRight.tsx
@@ -10,19 +10,28 @@ export function NavbarRight() {
return (
{
if (value === "machines") {
router.push("/machines");
+ } else if (value === "api-keys") {
+ router.push("/api-keys");
} else {
router.push("/");
}
}}
>
-
+
Workflow
Machines
+ API Keys
);
diff --git a/web/src/components/RunDisplay.tsx b/web/src/components/RunDisplay.tsx
index 3273035..d9b035d 100644
--- a/web/src/components/RunDisplay.tsx
+++ b/web/src/components/RunDisplay.tsx
@@ -1,7 +1,7 @@
"use client";
import { LiveStatus } from "./LiveStatus";
-import { callServerPromise } from "@/components/MachineList";
+import { callServerPromise } from "./callServerPromise";
import {
Dialog,
DialogContent,
diff --git a/web/src/components/VersionSelect.tsx b/web/src/components/VersionSelect.tsx
index 9e45c0e..bca9b08 100644
--- a/web/src/components/VersionSelect.tsx
+++ b/web/src/components/VersionSelect.tsx
@@ -1,7 +1,7 @@
"use client";
+import { callServerPromise } from "./callServerPromise";
import { LoadingIcon } from "@/components/LoadingIcon";
-import { callServerPromise } from "@/components/MachineList";
import { Button } from "@/components/ui/button";
import {
DropdownMenu,
diff --git a/web/src/components/callServerPromise.tsx b/web/src/components/callServerPromise.tsx
new file mode 100644
index 0000000..ac5d06a
--- /dev/null
+++ b/web/src/components/callServerPromise.tsx
@@ -0,0 +1,17 @@
+"use client";
+
+import { toast } from "sonner";
+
+export async function callServerPromise(result: Promise) {
+ return result
+ .then((x) => {
+ if ((x as { message: string })?.message !== undefined) {
+ toast.success((x as { message: string }).message);
+ }
+ return x;
+ })
+ .catch((error) => {
+ toast.error(error.message);
+ return null;
+ });
+}
diff --git a/web/src/db/schema.ts b/web/src/db/schema.ts
index 1d999be..e832462 100644
--- a/web/src/db/schema.ts
+++ b/web/src/db/schema.ts
@@ -203,5 +203,19 @@ export const deploymentsRelations = relations(deploymentsTable, ({ one }) => ({
}),
}));
+export const apiKeyTable = dbSchema.table("api_keys", {
+ id: uuid("id").primaryKey().defaultRandom().notNull(),
+ key: text("key").notNull().unique(),
+ name: text("name").notNull(),
+ user_id: text("user_id")
+ .references(() => usersTable.id, {
+ onDelete: "cascade",
+ })
+ .notNull(),
+ org_id: text("org_id"),
+ created_at: timestamp("created_at").defaultNow().notNull(),
+ updated_at: timestamp("updated_at").defaultNow().notNull(),
+});
+
export type UserType = InferSelectModel;
export type WorkflowType = InferSelectModel;
diff --git a/web/src/server/curdApiKeys.ts b/web/src/server/curdApiKeys.ts
new file mode 100644
index 0000000..d55bc47
--- /dev/null
+++ b/web/src/server/curdApiKeys.ts
@@ -0,0 +1,78 @@
+"use server";
+
+import { db } from "@/db/db";
+import { apiKeyTable } from "@/db/schema";
+import { auth } from "@clerk/nextjs";
+import { and, desc, eq } from "drizzle-orm";
+import { customAlphabet } from "nanoid";
+import { revalidatePath } from "next/cache";
+
+export const nanoid = customAlphabet(
+ "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
+);
+
+const prefixes = {
+ cd: "cd",
+} as const;
+
+function newId(prefix: keyof typeof prefixes): string {
+ return [prefixes[prefix], nanoid(16)].join("_");
+}
+
+export async function addNewAPIKey(name: string) {
+ const { userId, orgId } = auth();
+
+ if (!userId) throw new Error("No user id");
+
+ const key = await db
+ .insert(apiKeyTable)
+ .values({
+ name: name,
+ key: newId("cd"),
+ user_id: userId,
+ org_id: orgId,
+ })
+ .returning();
+
+ revalidatePath("/api-keys");
+
+ return key[0];
+}
+
+export async function deleteAPIKey(id: string) {
+ const { userId, orgId } = auth();
+
+ if (!userId) throw new Error("No user id");
+
+ if (orgId) {
+ await db
+ .delete(apiKeyTable)
+ .where(and(eq(apiKeyTable.id, id), eq(apiKeyTable.org_id, orgId)))
+ .execute();
+ } else {
+ await db
+ .delete(apiKeyTable)
+ .where(and(eq(apiKeyTable.id, id), eq(apiKeyTable.user_id, userId)))
+ .execute();
+ }
+
+ revalidatePath("/api-keys");
+}
+
+export async function getAPIKeys() {
+ const { userId, orgId } = auth();
+
+ if (!userId) throw new Error("No user id");
+
+ if (orgId) {
+ return await db.query.apiKeyTable.findMany({
+ where: eq(apiKeyTable.org_id, orgId),
+ orderBy: desc(apiKeyTable.created_at),
+ });
+ } else {
+ return await db.query.apiKeyTable.findMany({
+ where: eq(apiKeyTable.user_id, userId),
+ orderBy: desc(apiKeyTable.created_at),
+ });
+ }
+}