From 3830ad65fc78f6bf48a80f7c1d37ef6676d2ac68 Mon Sep 17 00:00:00 2001
From: miloschwartz <mschwartz10612@gmail.com>
Date: Fri, 21 Feb 2025 17:13:23 -0500
Subject: [PATCH] more frontend for clients

---
 server/routers/client/pickClientDefaults.ts   |  4 +--
 server/routers/newt/handleGetConfigMessage.ts |  4 +--
 .../settings/clients/CreateClientsForm.tsx    | 35 ++++++++++---------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/server/routers/client/pickClientDefaults.ts b/server/routers/client/pickClientDefaults.ts
index b2d3d946..858c1bab 100644
--- a/server/routers/client/pickClientDefaults.ts
+++ b/server/routers/client/pickClientDefaults.ts
@@ -77,11 +77,11 @@ export async function pickClientDefaults(
 
         const parsedSite = sitesRequiredFields.safeParse(site);
         if (!parsedSite.success) {
+            logger.error("Unable to pick client defaults because: " + fromError(parsedSite.error).toString());
             return next(
                 createHttpError(
                     HttpCode.BAD_REQUEST,
-                    "Unable to pick client defaults because: " +
-                        fromError(parsedSite.error).toString()
+                    "Site is not configured to accept client connectivity"
                 )
             );
         }
diff --git a/server/routers/newt/handleGetConfigMessage.ts b/server/routers/newt/handleGetConfigMessage.ts
index 7058a0c7..391a2af7 100644
--- a/server/routers/newt/handleGetConfigMessage.ts
+++ b/server/routers/newt/handleGetConfigMessage.ts
@@ -20,7 +20,7 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
     const newt = client as Newt;
 
     logger.debug(JSON.stringify(message.data));
-    
+
 
     logger.debug("Handling Newt get config message!");
 
@@ -60,7 +60,7 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
     let site: Site | undefined;
     if (!site) {
         const address = await getNextAvailableSubnet();
-        const listenPort = await getNextAvailablePort(); 
+        const listenPort = await getNextAvailablePort();
 
         // create a new exit node
         const [updateRes] = await db
diff --git a/src/app/[orgId]/settings/clients/CreateClientsForm.tsx b/src/app/[orgId]/settings/clients/CreateClientsForm.tsx
index ba5a9838..e787ed35 100644
--- a/src/app/[orgId]/settings/clients/CreateClientsForm.tsx
+++ b/src/app/[orgId]/settings/clients/CreateClientsForm.tsx
@@ -110,10 +110,13 @@ export default function CreateClientForm({
             const res = await api.get<AxiosResponse<ListSitesResponse>>(
                 `/org/${orgId}/sites/`
             );
-            setSites(res.data.data.sites);
+            const sites = res.data.data.sites.filter(
+                (s) => s.type === "newt" && s.subnet
+            );
+            setSites(sites);
 
-            if (res.data.data.sites.length > 0) {
-                form.setValue("siteId", res.data.data.sites[0].siteId);
+            if (sites.length > 0) {
+                form.setValue("siteId", sites[0].siteId);
             }
         };
 
@@ -289,32 +292,30 @@ export default function CreateClientForm({
                                 </Popover>
                                 <FormDescription>
                                     The client will be have connectivity to this
-                                    site.
+                                    site. The site must be configured to accept
+                                    client connections.
                                 </FormDescription>
                                 <FormMessage />
                             </FormItem>
                         )}
                     />
 
-                    <div className="w-full">
-                        <div className="mb-2">
-                            <Collapsible
-                                open={isOpen}
-                                onOpenChange={setIsOpen}
-                                className="space-y-2"
-                            >
+                    {olmCommand && (
+                        <div className="w-full">
+                            <div className="mb-2">
                                 <div className="mx-auto">
                                     <CopyTextBox
-                                        text={olmCommand || ""}
+                                        text={olmCommand}
                                         wrapText={false}
                                     />
                                 </div>
-                            </Collapsible>
+                            </div>
+                            <span className="text-sm text-muted-foreground">
+                                You will only be able to see the configuration
+                                once.
+                            </span>
                         </div>
-                        <span className="text-sm text-muted-foreground">
-                            You will only be able to see the configuration once.
-                        </span>
-                    </div>
+                    )}
 
                     <div className="flex items-center space-x-2">
                         <Checkbox