SourceInput on settings page

deploy-cat · Nov 16, 2024 · faf5fcd · faf5fcd
1 parent f77f75a
commit faf5fcd
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 32 deletions.
diff --git a/src/components/cloud/service/SourceInput.tsx b/src/components/cloud/service/SourceInput.tsx
@@ -2,6 +2,7 @@ import { createSignal, Show, For, createEffect, Accessor } from "solid-js";
 import { cache, createAsync } from "@solidjs/router";
 import { getAccount } from "~/lib/auth";
 import { Octokit } from "@octokit/rest";
+import type { Service } from "~/lib/knative";
 
 const getPackages = cache(async () => {
   "use server";
@@ -45,16 +46,24 @@ const sourceOptions = [
   { name: "GitHub Container Registry", slug: "ghcr" },
 ] as Array<{ name: string; slug: Source }>;
 
-export const SourceInput = ({ data }) => {
-  const [source, setSource] = createSignal("manual" as Source);
+export const SourceInput = ({ service }: { service?: Service }) => {
+  const [source, setSource] = createSignal(
+    service?.annotations["apps.deploycat.io/source"] ?? ("manual" as Source)
+  );
   const packages = createAsync(() => getPackages());
   type Package = typeof packages extends Accessor<(infer U)[] | undefined>
     ? U
     : never;
   const [pkg, setPkg] = createSignal(undefined as Package | undefined);
 
   createEffect(() => {
-    setPkg(packages()?.[0]);
+    setPkg(
+      packages()?.find(
+        (pkg) =>
+          pkg.id ===
+          Number(service?.annotations["apps.deploycat.io/gh-package"])
+      ) ?? packages()?.[0]
+    );
   });
 
   return (
@@ -87,6 +96,7 @@ export const SourceInput = ({ data }) => {
           <input
             type="text"
             name="image"
+            value={service?.image ?? ""}
             required
             placeholder="traefik/whoami"
             class="input input-bordered w-full"
@@ -113,7 +123,7 @@ export const SourceInput = ({ data }) => {
                   >
                     <For each={pkgs()}>
                       {(p) => (
-                        <option value={p.id}>
+                        <option selected={p.id === pkg()?.id} value={p.id}>
                           {p.name} ({p.repository?.full_name})
                         </option>
                       )}
@@ -124,7 +134,24 @@ export const SourceInput = ({ data }) => {
                     class="select select-bordered join-item"
                   >
                     <For each={pkg()?.tags}>
-                      {(t) => <option value={t}>{t}</option>}
+                      {(t) => (
+                        <option
+                          selected={
+                            Number(
+                              service?.annotations[
+                                "apps.deploycat.io/gh-package"
+                              ]
+                            ) === pkg()?.id &&
+                            t ===
+                              service?.annotations[
+                                "apps.deploycat.io/gh-package-tag"
+                              ]
+                          }
+                          value={t}
+                        >
+                          {t}
+                        </option>
+                      )}
                     </For>
                   </select>
                 </div>

diff --git a/src/composables/solidauth.ts b/src/composables/solidauth.ts
diff --git a/src/routes/cloud/apps/[app]/settings.tsx b/src/routes/cloud/apps/[app]/settings.tsx
@@ -1,6 +1,7 @@
 import { EnvVarsInput } from "~/components/EnvVarsInput";
 import { ScalingInput } from "~/components/ScalingInput";
 import { ResourcesInput } from "~/components/ResourcesInput";
+import { SourceInput } from "~/components/cloud/service/SourceInput";
 import { Service } from "~/components/cloud/service/Service";
 import { CreateServiceForm } from "~/components/cloud/CreateServiceForm";
 import { action, useSubmission } from "@solidjs/router";
@@ -36,11 +37,7 @@ const updateServiceFromForm = async (form: FormData) => {
     envVars: JSON.parse(form.get("env") as string) as { [key: string]: string },
   };
   const user = await getUser();
-  await knative.updateService(
-    form.get("name") as string,
-    service,
-    user.name
-  );
+  await knative.updateService(form.get("name") as string, service, user.name);
 };
 
 const updateServiceAction = action(updateServiceFromForm, "updateService");
@@ -75,22 +72,11 @@ export default () => {
                       type="hidden"
                       name="name"
                       required
-                      value={service()?.name}
-                      class="input input-bordered w-full"
-                    />
-                  </label>
-                  <label class="form-control w-full">
-                    <div class="label">
-                      <span class="label-text">Image</span>
-                    </div>
-                    <input
-                      type="text"
-                      name="image"
-                      required
-                      value={service()?.image}
+                      value={service().name}
                       class="input input-bordered w-full"
                     />
                   </label>
+                  <SourceInput service={service()} />
                   <label class="form-control w-full">
                     <div class="label">
                       <span class="label-text">Port</span>