From c41abfd4c1f2a915e8cf7ce8bfe576e4e8b97aa4 Mon Sep 17 00:00:00 2001
From: ChanatpakornD <csirintronsopon8@gmail.com>
Date: Tue, 20 Feb 2024 22:53:57 +0700
Subject: [PATCH] refactor: date & minor fallback

---
 src/app/admin/pets/add/page.tsx                     | 2 +-
 src/components/Admin/Pets/Add/DateInputInfo.tsx     | 7 +++++--
 src/components/Admin/Pets/Add/EditInfoAndSubmit.tsx | 6 ++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/admin/pets/add/page.tsx b/src/app/admin/pets/add/page.tsx
index 94864a0a..19e6e4b3 100644
--- a/src/app/admin/pets/add/page.tsx
+++ b/src/app/admin/pets/add/page.tsx
@@ -152,7 +152,7 @@ const adminCreate = () => {
         </div>
       </div>
       <div className="hidden md:block">
-        {data && <SmallPetCardList isLoading={isLoading} pets={data.pets} />}
+        <SmallPetCardList isLoading={isLoading} pets={data?.pets} />
       </div>
     </>
   );
diff --git a/src/components/Admin/Pets/Add/DateInputInfo.tsx b/src/components/Admin/Pets/Add/DateInputInfo.tsx
index 8c764417..6608e965 100644
--- a/src/components/Admin/Pets/Add/DateInputInfo.tsx
+++ b/src/components/Admin/Pets/Add/DateInputInfo.tsx
@@ -19,7 +19,8 @@ const DateInputInfo = (props: DateInputInfoProps) => {
   };
 
   const birthdate = useMemo(() => {
-    return dayjs(props.value).format("MMMM DD, YYYY");
+    if (props.value != "-") return dayjs(props.value).format("MMMM DD, YYYY");
+    return "-";
   }, [props.value]);
 
   return (
@@ -40,7 +41,9 @@ const DateInputInfo = (props: DateInputInfoProps) => {
             />
           </div>
         ) : (
-          <div className="ml-2 font-semibold">{birthdate}</div>
+          <div className="ml-2 font-semibold">
+            {birthdate ? birthdate : "-"}
+          </div>
         )}
       </div>
     </div>
diff --git a/src/components/Admin/Pets/Add/EditInfoAndSubmit.tsx b/src/components/Admin/Pets/Add/EditInfoAndSubmit.tsx
index bec78387..13af45b3 100644
--- a/src/components/Admin/Pets/Add/EditInfoAndSubmit.tsx
+++ b/src/components/Admin/Pets/Add/EditInfoAndSubmit.tsx
@@ -9,8 +9,8 @@ import TextInputInfo from "./TextInputInfo";
 import ToggleInputInfo from "./ToggleInputInfo";
 
 export type info = {
-  type: string;
-  gender: string;
+  type: "dog" | "cat" | "-";
+  gender: "male" | "female" | "-";
   color: string;
   age: string;
   nature: string;
@@ -37,13 +37,11 @@ const EditInfoAndSubmit = (props: EditInfoAndSubmitProps) => {
       const addNoneInfo = showInfo;
       if (addNoneInfo.age === "") addNoneInfo["age"] = "-";
       if (addNoneInfo.nature === "") addNoneInfo["nature"] = "-";
-      if (addNoneInfo.gender === "") addNoneInfo["gender"] = "-";
       props.setValue(addNoneInfo);
     } else {
       const removeEmptyInfo = props.value;
       if (removeEmptyInfo.age === "-") removeEmptyInfo["age"] = "";
       if (removeEmptyInfo.nature === "-") removeEmptyInfo["nature"] = "";
-      if (removeEmptyInfo.gender === "-") removeEmptyInfo["gender"] = "";
       setShowInfo(removeEmptyInfo);
     }
     setEnableEdit(!enableEdit);