Merge pull request #239 from ahsanzizan/main

fix: Handle a couple of client errors
mokletdev · Jul 10, 2024 · 0db513e · 0db513e
2 parents 840173d + 75c48c2
commit 0db513e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/actions/organisasi.ts b/src/actions/organisasi.ts
@@ -58,7 +58,7 @@ export async function organisasiUpsert({
       contact,
       image_description,
     };
-    if (id == null) {
+    if (id == null || id === "") {
       await createOrganisasi({
         ...organisasiInput,
         image: uploadedImage?.data?.url as string,

diff --git a/src/app/(admin)/admin/organisasi/_components/Form.tsx b/src/app/(admin)/admin/organisasi/_components/Form.tsx
@@ -26,11 +26,11 @@ export default function Form({
   const router = useRouter();
   const [structure, setStructure] = useState(organisasi.structure || "");
   const [logo, setLogo] = useState(
-    organisasi.logo ??
+    organisasi.logo ||
       "https://res.cloudinary.com/mokletorg/image/upload/v1720188074/assets/image_placeholder.png",
   );
   const [image, setImage] = useState(
-    organisasi.image ??
+    organisasi.image ||
       "https://res.cloudinary.com/mokletorg/image/upload/v1720188074/assets/image_placeholder.png",
   );
   return (
@@ -40,14 +40,14 @@ export default function Form({
         const toastId = toast.loading("Loading....");
 
         const logo = data.get("logo") as File | undefined;
-        const photo = data.get("photo") as File | undefined;
+        const image = data.get("image") as File | undefined;
 
         if (logo?.name === "") data.delete("logo");
-        if (photo?.name === "") data.delete("photo");
+        if (image?.name === "") data.delete("image");
 
         const result = await organisasiUpsert({
           data,
-          id: organisasi.id ?? null,
+          id: organisasi.id || null,
           period,
           structure,
           organisasiType,
@@ -81,7 +81,7 @@ export default function Form({
       />
       <div className="flex flex-col">
         <label
-          htmlFor="thumbnail"
+          htmlFor="logo"
           className="after:text-red-500 after:content-['*']"
         >
           Logo
@@ -90,7 +90,7 @@ export default function Form({
           className="w-[100px] h-[100px] rounded-2xl object-cover mb-2"
           width={100}
           height={100}
-          alt="Foto Organisasi"
+          alt="Logo Organisasi"
           src={logo}
           unoptimized
         />
@@ -101,6 +101,7 @@ export default function Form({
           }}
           accept="image/*"
           name="logo"
+          id="logo"
           required={!organisasi.id}
           className="border border-neutral-500 border-dotted rounded-xl py-5 px-3"
         />
@@ -114,7 +115,7 @@ export default function Form({
       ></TextArea>
       <div className="flex flex-col">
         <label
-          htmlFor="thumbnail"
+          htmlFor="image"
           className="after:text-red-500 after:content-['*']"
         >
           Photo