Simplify relay upsert

frontend/src/pages/admin/AdminRelayDetail.tsx

@@ -3,6 +3,7 @@ import { createResource, createSignal, Show } from "solid-js"
 import { adminDeactivateRelay, adminGetRelay } from "../../lib/api"
 import BackLink from "../../components/BackLink"
 import PageContainer from "../../components/PageContainer"
+import RelayDetailCard from "../../components/RelayDetailCard"
 import ResourceState from "../../components/ResourceState"
 import useMinLoading from "../../components/useMinLoading"
 
@@ -43,14 +44,7 @@ export default function AdminRelayDetail() {
       <Show when={!loading() && relay()}>
         {(r) => (
           <div class="mb-6">
-            <h1 class="text-2xl font-bold text-gray-900 mb-1 py-2">{r().name}</h1>
-            <p class="text-sm text-gray-500">{r().subdomain}.spaces.coracle.social</p>
-            <p class="text-sm text-gray-500 mt-2 break-all">Tenant: {r().tenant}</p>
-            <p class="text-sm text-gray-700 mt-2">Plan: <span class="uppercase">{r().plan}</span></p>
-            <p class="text-sm text-gray-700">Status: <span class="uppercase">{r().status}</span></p>
-            <Show when={r().description.trim()}>
-              <p class="mt-3 text-gray-700">{r().description}</p>
-            </Show>
+            <RelayDetailCard relay={r()} showTenant />
           </div>
         )}
       </Show>

frontend/src/pages/admin/AdminRelayEdit.tsx

@@ -1,6 +1,6 @@
 import { useNavigate, useParams } from "@solidjs/router"
 import { Show, createEffect, createResource, createSignal } from "solid-js"
-import { adminGetRelay, adminUpdateRelay } from "../../lib/api"
+import { adminGetRelay, adminUpdateRelay, type RelayConfig } from "../../lib/api"
 import RelayForm from "../../components/RelayForm"
 import { RELAY_PLAN_IDS, type RelayPlanId } from "../../lib/relayPlans"
 import { slugify } from "../../lib/slugify"
@@ -9,6 +9,14 @@ import PageContainer from "../../components/PageContainer"
 import ResourceState from "../../components/ResourceState"
 import useMinLoading from "../../components/useMinLoading"
 
+const DEFAULT_CONFIG: RelayConfig = {
+  policy: { public_join: false, strip_signatures: false },
+  groups: { enabled: false, auto_join: false },
+  management: { enabled: false },
+  blossom: { enabled: false },
+  push: { enabled: false },
+}
+
 export default function AdminRelayEdit() {
   const navigate = useNavigate()
   const params = useParams()
@@ -21,6 +29,7 @@ export default function AdminRelayEdit() {
   const [icon, setIcon] = createSignal("")
   const [description, setDescription] = createSignal("")
   const [plan, setPlan] = createSignal<RelayPlanId>("free")
+  const [config, setConfig] = createSignal<RelayConfig>(DEFAULT_CONFIG)
   const [error, setError] = createSignal("")
   const [submitting, setSubmitting] = createSignal(false)
 
@@ -32,6 +41,7 @@ export default function AdminRelayEdit() {
     setIcon(data.icon)
     setDescription(data.description)
     setPlan(RELAY_PLAN_IDS.includes(data.plan as RelayPlanId) ? (data.plan as RelayPlanId) : "free")
+    setConfig(data.config ?? DEFAULT_CONFIG)
   })
 
   async function handleSubmit(e: Event) {
@@ -45,6 +55,7 @@ export default function AdminRelayEdit() {
         icon: icon().trim(),
         description: description().trim(),
         plan: plan(),
+        config: config(),
       })
       navigate(`/admin/relays/${relayId()}`)
     } catch (e) {
@@ -79,6 +90,8 @@ export default function AdminRelayEdit() {
           plan={plan()}
           setPlan={setPlan}
           plans={RELAY_PLAN_IDS}
+          config={config()}
+          setConfig={setConfig}
           onSubmit={handleSubmit}
           submitting={submitting()}
           error={error()}