Revert "undo commit"

This reverts commit 9103f67db5.

components/ModalContent/UploadFileModal.tsx

@@ -14,7 +14,6 @@ import Modal from "../Modal";
 import { useTranslation } from "next-i18next";
 import { useCollections } from "@/hooks/store/collections";
 import { useUploadFile } from "@/hooks/store/links";
-import { PostLinkSchemaType } from "@/lib/shared/schemaValidation";
 
 type Props = {
   onClose: Function;
@@ -26,16 +25,24 @@ export default function UploadFileModal({ onClose }: Props) {
 
   const initial = {
     name: "",
+    url: "",
     description: "",
     type: "url",
     tags: [],
+    preview: "",
+    image: "",
+    pdf: "",
+    readable: "",
+    monolith: "",
+    textContent: "",
     collection: {
-      id: undefined,
       name: "",
+      ownerId: data?.user.id as number,
     },
-  } as PostLinkSchemaType;
+  } as LinkIncludingShortenedCollectionAndTags;
 
-  const [link, setLink] = useState<PostLinkSchemaType>(initial);
+  const [link, setLink] =
+    useState<LinkIncludingShortenedCollectionAndTags>(initial);
   const [file, setFile] = useState<File>();
 
   const uploadFile = useUploadFile();
@@ -45,11 +52,11 @@ export default function UploadFileModal({ onClose }: Props) {
   const { data: collections = [] } = useCollections();
 
   const setCollection = (e: any) => {
-    if (e?.__isNew__) e.value = undefined;
+    if (e?.__isNew__) e.value = null;
 
     setLink({
       ...link,
-      collection: { id: e?.value, name: e?.label },
+      collection: { id: e?.value, name: e?.label, ownerId: e?.ownerId },
     });
   };
 
@@ -63,11 +70,10 @@ export default function UploadFileModal({ onClose }: Props) {
 
   useEffect(() => {
     setOptionsExpanded(false);
-    if (router.pathname.startsWith("/collections/") && router.query.id) {
+    if (router.query.id) {
       const currentCollection = collections.find(
         (e) => e.id == Number(router.query.id)
       );
-
       if (
         currentCollection &&
         currentCollection.ownerId &&
@@ -78,12 +84,13 @@ export default function UploadFileModal({ onClose }: Props) {
           collection: {
             id: currentCollection.id,
             name: currentCollection.name,
+            ownerId: currentCollection.ownerId,
           },
         });
     } else
       setLink({
         ...initial,
-        collection: { name: "Unorganized" },
+        collection: { name: "Unorganized", ownerId: data?.user.id as number },
       });
   }, [router, collections]);
 
@@ -115,7 +122,6 @@ export default function UploadFileModal({ onClose }: Props) {
         { link, file },
         {
           onSettled: (data, error) => {
-            setSubmitLoader(false);
             toast.dismiss(load);
 
             if (error) {
@@ -127,6 +133,8 @@ export default function UploadFileModal({ onClose }: Props) {
           },
         }
       );
+
+      setSubmitLoader(false);
     }
   };
 
@@ -142,7 +150,7 @@ export default function UploadFileModal({ onClose }: Props) {
           <label className="btn h-10 btn-sm w-full border border-neutral-content hover:border-neutral-content flex justify-between">
             <input
               type="file"
-              accept=".pdf,.png,.jpg,.jpeg"
+              accept=".pdf,.png,.jpg,.jpeg,.html"
               className="cursor-pointer custom-file-input"
               onChange={(e) => e.target.files && setFile(e.target.files[0])}
             />
@@ -155,18 +163,18 @@ export default function UploadFileModal({ onClose }: Props) {
         </div>
         <div className="sm:col-span-2 col-span-5">
           <p className="mb-2">{t("collection")}</p>
-          {link.collection?.name && (
+          {link.collection.name ? (
             <CollectionSelection
               onChange={setCollection}
               defaultValue={{
-                value: link.collection?.id,
-                label: link.collection?.name || "Unorganized",
+                label: link.collection.name,
+                value: link.collection.id,
               }}
             />
-          )}
+          ) : null}
         </div>
       </div>
-      {optionsExpanded && (
+      {optionsExpanded ? (
         <div className="mt-5">
           <div className="grid sm:grid-cols-2 gap-3">
             <div>
@@ -182,26 +190,26 @@ export default function UploadFileModal({ onClose }: Props) {
               <p className="mb-2">{t("tags")}</p>
               <TagSelection
                 onChange={setTags}
-                defaultValue={link.tags?.map((e) => ({
-                  value: e.id,
+                defaultValue={link.tags.map((e) => ({
                   label: e.name,
+                  value: e.id,
                 }))}
               />
             </div>
             <div className="sm:col-span-2">
               <p className="mb-2">{t("description")}</p>
               <textarea
-                value={unescapeString(link.description || "") || ""}
+                value={unescapeString(link.description) as string}
                 onChange={(e) =>
                   setLink({ ...link, description: e.target.value })
                 }
                 placeholder={t("description_placeholder")}
-                className="resize-none w-full h-32 rounded-md p-2 border-neutral-content bg-base-200 focus:border-primary border-solid border outline-none duration-100"
+                className="resize-none w-full rounded-md p-2 border-neutral-content bg-base-200 focus:border-sky-300 dark:focus:border-sky-600 border-solid border outline-none duration-100"
               />
             </div>
           </div>
         </div>
-      )}
+      ) : undefined}
       <div className="flex justify-between items-center mt-5">
         <div
           onClick={() => setOptionsExpanded(!optionsExpanded)}