diff --git a/app/[locale]/(protected)/admin/add-experts/create/page.tsx b/app/[locale]/(protected)/admin/add-experts/create/page.tsx
index c9d865e9..994cd5eb 100644
--- a/app/[locale]/(protected)/admin/add-experts/create/page.tsx
+++ b/app/[locale]/(protected)/admin/add-experts/create/page.tsx
@@ -230,11 +230,13 @@ export default function AddExpertForm() {
   };
 
   const handleAddRow = () => {
-    setPlacementRows((prevRows: any) => [
-      ...prevRows,
-      { index: incrementId, roleId: "", userLevelId: 0 },
-    ]);
-    setIncrementId((prevId) => prevId + 1);
+    if (placementRows.length < 2) {
+      setPlacementRows((prevRows) => [
+        ...prevRows,
+        { index: incrementId, roleId: "", userLevelId: 0 },
+      ]);
+      setIncrementId((prevId) => prevId + 1);
+    }
   };
 
   return (
@@ -424,7 +426,7 @@ export default function AddExpertForm() {
                     ))}
                   </SelectContent>
                 </Select>
-                <Select
+                {/* <Select
                   onValueChange={(e) =>
                     handleSelectionChange(row.index, "userLevelId", e)
                   }
@@ -441,6 +443,20 @@ export default function AddExpertForm() {
                       </SelectItem>
                     ))}
                   </SelectContent>
+                </Select> */}
+                <Select
+                  onValueChange={(e) =>
+                    handleSelectionChange(row.index, "userLevelId", e)
+                  }
+                >
+                  <FormControl>
+                    <SelectTrigger>
+                      <SelectValue placeholder="Pilih User Level" />
+                    </SelectTrigger>
+                  </FormControl>
+                  <SelectContent>
+                    <SelectItem value="216">MABES POLRI</SelectItem>
+                  </SelectContent>
                 </Select>
                 {placementRows.length > 1 && (
                   <Button
@@ -454,7 +470,12 @@ export default function AddExpertForm() {
                 )}
               </div>
             ))}
-            <Button type="button" size="md" onClick={() => handleAddRow()}>
+            <Button
+              type="button"
+              size="md"
+              onClick={handleAddRow}
+              disabled={placementRows.length >= 2} // optional: disable button if already 1 row added
+            >
               Tambah
             </Button>
           </div>
diff --git a/components/form/content/spit-convert-form.tsx b/components/form/content/spit-convert-form.tsx
index 0222f302..102ebd17 100644
--- a/components/form/content/spit-convert-form.tsx
+++ b/components/form/content/spit-convert-form.tsx
@@ -55,6 +55,7 @@ import dynamic from "next/dynamic";
 import { error } from "@/lib/swal";
 import { useTranslations } from "next-intl";
 import { contextType } from "cleave.js/react";
+import { Form } from "@/components/ui/form";
 
 const imageSchema = z.object({
   contentTitle: z.string().min(1, { message: "Judul diperlukan" }),
@@ -182,13 +183,31 @@ export default function FormConvertSPIT() {
 
   let fileTypeId = "1";
 
-  const {
-    control,
-    handleSubmit,
-    setValue,
-    formState: { errors },
-  } = useForm<ImageSchema>({
+  // const {
+  //   control,
+  //   handleSubmit,
+  //   setValue,
+  //   formState: { errors },
+  // } = useForm<ImageSchema>({
+  //   resolver: zodResolver(imageSchema),
+  //   defaultValues: {
+  //     contentTitle: detail?.contentTitle || "",
+  //     contentDescription: detail?.contentDescription || "",
+  //     contentCreator: detail?.contentCreator || "",
+  //     contentRewriteDescription: detail?.contentRewriteDescription || "",
+  //     // dll
+  //   },
+  // });
+
+  const form = useForm<z.infer<typeof imageSchema>>({
     resolver: zodResolver(imageSchema),
+    defaultValues: {
+      contentTitle: detail?.contentTitle || "",
+      contentDescription: detail?.contentDescription || "",
+      contentCreator: detail?.contentCreator || "",
+      contentRewriteDescription: detail?.contentRewriteDescription || "",
+      // dll
+    },
   });
 
   const handleRemoveTag = (index: any) => {
@@ -207,11 +226,10 @@ export default function FormConvertSPIT() {
     setSelectedFiles((prevImages) => prevImages.filter((_, i) => i !== index));
   };
 
-  // const handleCheckboxChange = (id: number) => {
-  //   setSelectedPublishers((prev) =>
-  //     prev.includes(id) ? prev.filter((item) => item !== id) : [...prev, id]
-  //   );
-  // };
+  const handleDirectSave = () => {
+    const values = form.getValues(); // ambil semua nilai tanpa validasi
+    onSubmit(values); // langsung submit
+  };
 
   useEffect(() => {
     async function initState() {
@@ -318,6 +336,13 @@ export default function FormConvertSPIT() {
         setDetail(details);
         setFiles(details?.contentList);
         setupPlacementCheck(details?.contentList?.length);
+        form.setValue("contentTitle", details?.contentTitle || "");
+        form.setValue("contentDescription", details?.contentDescription || "");
+        form.setValue("contentCreator", details?.contentCreator || "");
+        form.setValue(
+          "contentRewriteDescription",
+          details?.contentRewriteDescription || ""
+        );
 
         const filesData = details.contentList || [];
         const fileUrls = filesData.map((file: { contentFile: string }) =>
@@ -337,7 +362,7 @@ export default function FormConvertSPIT() {
       }
     }
     initState();
-  }, [refresh, setValue]);
+  }, [refresh]);
 
   const [tempFile, setTempFile] = useState(
     detailThumb.map((data: any) => ({
@@ -472,20 +497,27 @@ export default function FormConvertSPIT() {
     });
   };
 
-  const onSubmit = (data: ImageSchema) => {
-    MySwal.fire({
-      title: "Simpan Data",
-      text: "Apakah Anda yakin ingin menyimpan data ini?",
-      icon: "warning",
-      showCancelButton: true,
-      cancelButtonColor: "#d33",
-      confirmButtonColor: "#3085d6",
-      confirmButtonText: "Simpan",
-    }).then((result) => {
-      if (result.isConfirmed) {
-        save(data);
-      }
-    });
+  const onSubmit = async (data: z.infer<typeof imageSchema>) => {
+    if (form.getValues("contentTitle") == "") {
+      form.setError("contentTitle", {
+        type: "manual",
+        message: "Required",
+      });
+    } else {
+      MySwal.fire({
+        title: "Simpan Data",
+        text: "Apakah Anda yakin ingin menyimpan data ini?",
+        icon: "warning",
+        showCancelButton: true,
+        cancelButtonColor: "#d33",
+        confirmButtonColor: "#3085d6",
+        confirmButtonText: "Simpan",
+      }).then((result) => {
+        if (result.isConfirmed) {
+          save(data);
+        }
+      });
+    }
   };
 
   const [showRewriteEditor, setShowRewriteEditor] = useState(false);
@@ -561,6 +593,7 @@ export default function FormConvertSPIT() {
       setArticleBody(cleanArticleBody || "");
       setDetailData(articleData);
       setSelectedArticleId(id);
+
       // setArticleImages(articleImagesData || []);
     } catch (error) {
       console.error("Error fetching article details:", error);
@@ -613,477 +646,472 @@ export default function FormConvertSPIT() {
   }
 
   return (
-    <form onSubmit={handleSubmit(onSubmit)}>
-      {detail !== undefined ? (
-        <div className="flex flex-col lg:flex-row gap-10">
-          <Card className="w-full lg:w-8/12">
-            <div className="px-6 py-6">
-              <p className="text-lg font-semibold mb-3">{t("form-spit")}</p>
-              <div className="gap-5 mb-5">
-                {/* Input Title */}
-                <div className="space-y-2 py-3">
-                  <Label>{t("title")}</Label>
-                  <Controller
-                    control={control}
-                    name="contentTitle"
-                    render={({ field }) => (
-                      <Input
-                        size="md"
-                        type="text"
-                        defaultValue={detail?.contentTitle}
-                        onChange={field.onChange}
-                        placeholder="Enter contentTitle"
-                      />
-                    )}
-                  />
-                  {errors.contentTitle?.message && (
-                    <p className="text-red-400 text-sm">
-                      {errors.contentTitle.message}
-                    </p>
-                  )}
-                </div>
-                <div className="flex items-center">
-                  <div className="py-3 w-full space-y-2">
-                    <Label>{t("category")}</Label>
-                    <Select
-                      defaultValue={detail?.content?.name}
-                      onValueChange={(id) => {
-                        console.log("Selected Category ID:", id);
-                        setSelectedCategoryId(Number(id)); // Simpan ID kategori
-                      }}
-                    >
-                      <SelectTrigger size="md">
-                        <SelectValue placeholder="Pilih" />
-                      </SelectTrigger>
-                      <SelectContent>
-                        {categories.map((category) => (
-                          <SelectItem
-                            key={category.id}
-                            value={category.id.toString()} // ID kategori dikirim sebagai value
-                          >
-                            {category?.name}
-                          </SelectItem>
-                        ))}
-                      </SelectContent>
-                    </Select>
-                  </div>
-                </div>
-                <div className="">
-                  <RadioGroup
-                    onValueChange={(value) => setSelectedFileType(value)}
-                    value={selectedFileType}
-                    className=" grid-cols-1"
-                  >
-                    <div className="">
-                      <RadioGroupItem value="original" id="original-file" />
-                      <Label htmlFor="original-file">
-                        Select Original File
-                      </Label>
-                    </div>
-                    <div className="py-3 space-y-2">
-                      <Label>{t("description")}</Label>
+    <>
+      <Form {...form}>
+        <form onSubmit={form.handleSubmit(onSubmit)}>
+          {detail !== undefined ? (
+            <div className="flex flex-col lg:flex-row gap-10">
+              <Card className="w-full lg:w-8/12">
+                <div className="px-6 py-6">
+                  <p className="text-lg font-semibold mb-3">{t("form-spit")}</p>
+                  <div className="gap-5 mb-5">
+                    {/* Input Title */}
+                    <div className="space-y-2 py-3">
+                      <Label>{t("title")}</Label>
                       <Controller
-                        control={control}
-                        name="contentDescription"
-                        render={({ field: { onChange, value } }) => (
-                          // <JoditEditor
-                          //   ref={editor}
-                          //   value={detail?.contentDescription}
-                          //   onChange={onChange}
-                          //   className="dark:text-black"
-                          // />
-                          <CustomEditor
-                            onChange={onChange}
-                            initialData={detail?.contentDescription}
+                        control={form.control}
+                        name="contentTitle"
+                        render={({ field }) => (
+                          <Input
+                            size="md"
+                            type="text"
+                            value={field.value}
+                            onChange={field.onChange}
+                            placeholder="Enter contentTitle"
                           />
                         )}
                       />
-                      {errors.contentDescription?.message && (
-                        <p className="text-red-400 text-sm">
-                          {errors.contentDescription.message}
-                        </p>
-                      )}
                     </div>
-                    <div className="space-y-2 py-3 w-4/12">
-                      <Label>{t("writing-style")}</Label>
-                      <Select
-                        value={selectedWritingStyle}
-                        onValueChange={setSelectedWritingStyle}
-                      >
-                        <SelectTrigger size="md">
-                          <SelectValue />
-                        </SelectTrigger>
-                        <SelectContent>
-                          <SelectItem value="friendly">Friendly</SelectItem>
-                          <SelectItem value="profesional">
-                            Profesional
-                          </SelectItem>
-                          <SelectItem value="informational">
-                            Informational
-                          </SelectItem>
-                          <SelectItem value="neutral">Neutral</SelectItem>
-                          <SelectItem value="witty">Witty</SelectItem>
-                        </SelectContent>
-                      </Select>
-                    </div>
-                    <div className="my-2">
-                      <Button
-                        size="sm"
-                        onClick={handleRewriteClick}
-                        className="bg-blue-500 text-white py-2 px-4 rounded"
-                      >
-                        Content Rewrite
-                      </Button>
-                    </div>
-                    {showRewriteEditor && (
-                      <div>
-                        {isGeneratedArticle && (
-                          <div className="mt-3 pb-0 flex flex-row ">
-                            {articleIds.map((id: string, index: number) => (
-                              <button
-                                key={index}
-                                className={`mr-3 px-3 py-2 rounded-md ${
-                                  selectedArticleId === id
-                                    ? "bg-green-500 text-white"
-                                    : "border-2 border-green-500 text-green-500"
-                                }`}
-                                onClick={() => handleArticleIdClick(id)}
+                    <div className="flex items-center">
+                      <div className="py-3 w-full space-y-2">
+                        <Label>{t("category")}</Label>
+                        <Select
+                          defaultValue={detail?.content?.name}
+                          onValueChange={(id) => {
+                            console.log("Selected Category ID:", id);
+                            setSelectedCategoryId(Number(id)); // Simpan ID kategori
+                          }}
+                        >
+                          <SelectTrigger size="md">
+                            <SelectValue placeholder="Pilih" />
+                          </SelectTrigger>
+                          <SelectContent>
+                            {categories.map((category) => (
+                              <SelectItem
+                                key={category.id}
+                                value={category.id.toString()} // ID kategori dikirim sebagai value
                               >
-                                {"Narasi " + (index + 1)}
-                              </button>
+                                {category?.name}
+                              </SelectItem>
                             ))}
-                          </div>
-                        )}
-                        <div className="flex items-center space-x-2 mt-3">
-                          <RadioGroupItem value="rewrite" id="rewrite-file" />
-                          <Label htmlFor="rewrite-file">
-                            Select File Rewrite
+                          </SelectContent>
+                        </Select>
+                      </div>
+                    </div>
+                    <div className="">
+                      <RadioGroup
+                        onValueChange={(value) => setSelectedFileType(value)}
+                        value={selectedFileType}
+                        className=" grid-cols-1"
+                      >
+                        <div className="">
+                          <RadioGroupItem value="original" id="original-file" />
+                          <Label htmlFor="original-file">
+                            Select Original File
                           </Label>
                         </div>
                         <div className="py-3 space-y-2">
-                          <Label>{t("file-rewrite")}</Label>
+                          <Label>{t("description")}</Label>
                           <Controller
-                            control={control}
-                            name="contentRewriteDescription"
-                            render={({ field: { onChange, value } }) =>
-                              isLoadingData ? (
-                                <div className="flex justify-center items-center h-40">
-                                  <p className="text-gray-500">
-                                    Loading Proses Data...
-                                  </p>
-                                </div>
-                              ) : (
-                                <CustomEditor
-                                  onChange={onChange}
-                                  initialData={articleBody || value}
-                                />
-                              )
-                            }
+                            control={form.control}
+                            name="contentDescription"
+                            render={({ field: { onChange, value } }) => (
+                              // <JoditEditor
+                              //   ref={editor}
+                              //   value={detail?.contentDescription}
+                              //   onChange={onChange}
+                              //   className="dark:text-black"
+                              // />
+                              <CustomEditor
+                                onChange={onChange}
+                                initialData={detail?.contentDescription}
+                              />
+                            )}
                           />
-                          {errors.contentRewriteDescription?.message && (
-                            <p className="text-red-400 text-sm">
-                              {errors.contentRewriteDescription.message}
-                            </p>
-                          )}
+                        </div>
+                        <p className="text-sm font-semibold">Content Rewrite</p>
+                        <div className="space-y-2 pb-3 w-4/12">
+                          <Label>{t("writing-style")}</Label>
+                          <Select
+                            value={selectedWritingStyle}
+                            onValueChange={setSelectedWritingStyle}
+                          >
+                            <SelectTrigger size="md">
+                              <SelectValue />
+                            </SelectTrigger>
+                            <SelectContent>
+                              <SelectItem value="friendly">Friendly</SelectItem>
+                              <SelectItem value="profesional">
+                                Profesional
+                              </SelectItem>
+                              <SelectItem value="informational">
+                                Informational
+                              </SelectItem>
+                              <SelectItem value="neutral">Neutral</SelectItem>
+                              <SelectItem value="witty">Witty</SelectItem>
+                            </SelectContent>
+                          </Select>
+                        </div>
+                        <div className="my-2">
+                          <Button
+                            size="sm"
+                            type="button"
+                            onClick={handleRewriteClick}
+                            className="bg-blue-500 text-white py-2 px-4 rounded"
+                          >
+                            Content Rewrite
+                          </Button>
+                        </div>
+                        {showRewriteEditor && (
+                          <div>
+                            {isGeneratedArticle && (
+                              <div className="mt-3 pb-0 flex flex-row ">
+                                {articleIds.map((id: string, index: number) => (
+                                  <Button
+                                    type="button"
+                                    key={index}
+                                    className={`mr-3 px-3 py-2 rounded-md ${
+                                      selectedArticleId === id
+                                        ? "bg-green-500 text-white"
+                                        : "border-2 border-green-500 bg-white  text-green-500 hover:bg-green-500 hover:text-white hover:border-green-500"
+                                    }`}
+                                    onClick={() => handleArticleIdClick(id)}
+                                  >
+                                    {"Narasi " + (index + 1)}
+                                  </Button>
+                                ))}
+                              </div>
+                            )}
+                            <div className="flex items-center space-x-2 mt-3">
+                              <RadioGroupItem
+                                value="rewrite"
+                                id="rewrite-file"
+                              />
+                              <Label htmlFor="rewrite-file">
+                                Select File Rewrite
+                              </Label>
+                            </div>
+                            <div className="py-3 space-y-2">
+                              <Label>{t("file-rewrite")}</Label>
+                              <Controller
+                                control={form.control}
+                                name="contentRewriteDescription"
+                                render={({ field: { onChange, value } }) =>
+                                  isLoadingData ? (
+                                    <div className="flex justify-center items-center h-40">
+                                      <p className="text-gray-500">
+                                        Loading Proses Data...
+                                      </p>
+                                    </div>
+                                  ) : (
+                                    <CustomEditor
+                                      onChange={onChange}
+                                      initialData={articleBody || value}
+                                    />
+                                  )
+                                }
+                              />
+                            </div>
+                          </div>
+                        )}
+                      </RadioGroup>
+                    </div>
+                    <div className="space-y-2">
+                      <Label className="text-xl">{t("file-media")}</Label>
+                      <div className="w-full  ">
+                        <Swiper
+                          thumbs={{ swiper: thumbsSwiper }}
+                          modules={[FreeMode, Navigation, Thumbs]}
+                          navigation={false}
+                          className="w-full"
+                        >
+                          {detailThumb?.map((data: any) => (
+                            <SwiperSlide key={data.id}>
+                              <img
+                                className="object-fill h-full w-full rounded-md"
+                                src={data}
+                                alt={` ${data.id}`}
+                              />
+                            </SwiperSlide>
+                          ))}
+                        </Swiper>
+                        <div className=" mt-2 ">
+                          <Swiper
+                            onSwiper={setThumbsSwiper}
+                            slidesPerView={8}
+                            spaceBetween={8}
+                            pagination={{
+                              clickable: true,
+                            }}
+                            modules={[Pagination, Thumbs]}
+                            // className="mySwiper2"
+                          >
+                            {detailThumb?.map((data: any) => (
+                              <SwiperSlide key={data.id}>
+                                <img
+                                  className="object-cover h-[60px] w-[80px] rounded-md"
+                                  src={data}
+                                  alt={` ${data.id}`}
+                                />
+                              </SwiperSlide>
+                            ))}
+                          </Swiper>
                         </div>
                       </div>
-                    )}
-                  </RadioGroup>
-                </div>
-                <div className="space-y-2">
-                  <Label className="text-xl">{t("file-media")}</Label>
-                  <div className="w-full  ">
-                    <Swiper
-                      thumbs={{ swiper: thumbsSwiper }}
-                      modules={[FreeMode, Navigation, Thumbs]}
-                      navigation={false}
-                      className="w-full"
-                    >
-                      {detailThumb?.map((data: any) => (
-                        <SwiperSlide key={data.id}>
-                          <img
-                            className="object-fill h-full w-full rounded-md"
-                            src={data}
-                            alt={` ${data.id}`}
-                          />
-                        </SwiperSlide>
-                      ))}
-                    </Swiper>
-                    <div className=" mt-2 ">
-                      <Swiper
-                        onSwiper={setThumbsSwiper}
-                        slidesPerView={8}
-                        spaceBetween={8}
-                        pagination={{
-                          clickable: true,
-                        }}
-                        modules={[Pagination, Thumbs]}
-                        // className="mySwiper2"
-                      >
-                        {detailThumb?.map((data: any) => (
-                          <SwiperSlide key={data.id}>
-                            <img
-                              className="object-cover h-[60px] w-[80px] rounded-md"
-                              src={data}
-                              alt={` ${data.id}`}
-                            />
-                          </SwiperSlide>
-                        ))}
-                      </Swiper>
                     </div>
-                  </div>
-                </div>
-                <div className="mt-3">
-                  <Label className="text-xl">{t("file-placement")}</Label>
-                </div>
-                {files?.length > 1 && (
-                  <div className="flex flex-wrap gap-2 mt-2 justify-end mr-24 pr-2">
-                    <div className="flex items-center space-x-2">
-                      <Checkbox
-                        id="all-content"
-                        onCheckedChange={(e) =>
-                          handleSelectAll("all", Boolean(e))
-                        }
-                      />
-                      <label
-                        htmlFor="all-content"
-                        className="text-xs font-medium"
-                      >
-                        {t("all")}
-                      </label>
+                    <div className="mt-3">
+                      <Label className="text-xl">{t("file-placement")}</Label>
                     </div>
-                    <div className="flex items-center space-x-2">
-                      <Checkbox
-                        id="all-nasional"
-                        onCheckedChange={(e) =>
-                          handleSelectAll("mabes", Boolean(e))
-                        }
-                      />
-                      <label
-                        htmlFor="all-nasional"
-                        className="text-xs font-medium"
-                      >
-                        {t("all")} Nasional
-                      </label>
-                    </div>
-                    <div className="flex items-center space-x-2">
-                      <Checkbox
-                        id="all-wilayah"
-                        onCheckedChange={(e) =>
-                          handleSelectAll("polda", Boolean(e))
-                        }
-                      />
-                      <label
-                        htmlFor="all-wilayah"
-                        className="text-xs font-medium"
-                      >
-                        {t("all")} Wilayah
-                      </label>
-                    </div>
-                    <div className="flex items-center space-x-2">
-                      <Checkbox
-                        id="all-international"
-                        onCheckedChange={(e) =>
-                          handleSelectAll("international", Boolean(e))
-                        }
-                      />
-                      <label
-                        htmlFor="all-international"
-                        className="text-xs font-medium"
-                      >
-                        {t("all")} Internasional
-                      </label>
-                    </div>
-                  </div>
-                )}
-                {files?.map((file, index) => (
-                  <div
-                    key={file.contentId}
-                    className="flex flex-row gap-2 items-center my-3"
-                  >
-                    <img
-                      src={file.contentFile}
-                      className="w-[180px] rounded-md"
-                    />
-                    <div className="flex flex-col gap-2 w-full pl-4">
-                      <div className="flex justify-between text-sm">
-                        {file.fileName}
-                      </div>
-                      <div className="flex flex-wrap gap-2">
+                    {files?.length > 1 && (
+                      <div className="flex flex-wrap gap-2 mt-2 justify-end mr-24 pr-2">
                         <div className="flex items-center space-x-2">
                           <Checkbox
-                            id="terms"
-                            value="all"
-                            checked={filePlacements[index]?.includes("all")}
+                            id="all-content"
                             onCheckedChange={(e) =>
-                              setupPlacement(index, "all", Boolean(e))
+                              handleSelectAll("all", Boolean(e))
                             }
                           />
                           <label
-                            htmlFor="terms"
-                            className="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                            htmlFor="all-content"
+                            className="text-xs font-medium"
                           >
                             {t("all")}
                           </label>
                         </div>
                         <div className="flex items-center space-x-2">
                           <Checkbox
-                            id="terms"
-                            checked={filePlacements[index]?.includes("mabes")}
+                            id="all-nasional"
                             onCheckedChange={(e) =>
-                              setupPlacement(index, "mabes", Boolean(e))
+                              handleSelectAll("mabes", Boolean(e))
                             }
                           />
                           <label
-                            htmlFor="terms"
-                            className="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                            htmlFor="all-nasional"
+                            className="text-xs font-medium"
                           >
-                            Nasional
+                            {t("all")} Nasional
                           </label>
                         </div>
                         <div className="flex items-center space-x-2">
                           <Checkbox
-                            id="terms"
-                            checked={filePlacements[index]?.includes("polda")}
+                            id="all-wilayah"
                             onCheckedChange={(e) =>
-                              setupPlacement(index, "polda", Boolean(e))
+                              handleSelectAll("polda", Boolean(e))
                             }
                           />
                           <label
-                            htmlFor="terms"
-                            className="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                            htmlFor="all-wilayah"
+                            className="text-xs font-medium"
                           >
-                            Wilayah
+                            {t("all")} Wilayah
                           </label>
                         </div>
-
                         <div className="flex items-center space-x-2">
                           <Checkbox
-                            id="terms"
-                            checked={filePlacements[index]?.includes(
-                              "international"
-                            )}
+                            id="all-international"
                             onCheckedChange={(e) =>
-                              setupPlacement(index, "international", Boolean(e))
+                              handleSelectAll("international", Boolean(e))
                             }
                           />
                           <label
-                            htmlFor="terms"
-                            className="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                            htmlFor="all-international"
+                            className="text-xs font-medium"
                           >
-                            Internasional
+                            {t("all")} Internasional
                           </label>
                         </div>
                       </div>
-                    </div>
-                  </div>
-                ))}
-              </div>
-            </div>
-          </Card>
-          <div className="w-full lg:w-4/12">
-            <Card className=" h-[800px]">
-              <div className="px-3 py-3">
-                <div className="space-y-2">
-                  <Label>{t("creator")}</Label>
-                  <Controller
-                    control={control}
-                    name="contentCreator"
-                    render={({ field }) => (
-                      <Input
-                        size="md"
-                        type="text"
-                        value={detail?.contentCreator}
-                        onChange={field.onChange}
-                        placeholder="Enter Title"
-                      />
                     )}
-                  />
-                  {errors.contentCreator?.message && (
-                    <p className="text-red-400 text-sm">
-                      {errors.contentCreator.message}
-                    </p>
-                  )}
+                    {files?.map((file, index) => (
+                      <div
+                        key={file.contentId}
+                        className="flex flex-row gap-2 items-center my-3"
+                      >
+                        <img
+                          src={file.contentFile}
+                          className="w-[180px] rounded-md"
+                        />
+                        <div className="flex flex-col gap-2 w-full pl-4">
+                          <div className="flex justify-between text-sm">
+                            {file.fileName}
+                          </div>
+                          <div className="flex flex-wrap gap-2">
+                            <div className="flex items-center space-x-2">
+                              <Checkbox
+                                id="terms"
+                                value="all"
+                                checked={filePlacements[index]?.includes("all")}
+                                onCheckedChange={(e) =>
+                                  setupPlacement(index, "all", Boolean(e))
+                                }
+                              />
+                              <label
+                                htmlFor="terms"
+                                className="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                              >
+                                {t("all")}
+                              </label>
+                            </div>
+                            <div className="flex items-center space-x-2">
+                              <Checkbox
+                                id="terms"
+                                checked={filePlacements[index]?.includes(
+                                  "mabes"
+                                )}
+                                onCheckedChange={(e) =>
+                                  setupPlacement(index, "mabes", Boolean(e))
+                                }
+                              />
+                              <label
+                                htmlFor="terms"
+                                className="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                              >
+                                Nasional
+                              </label>
+                            </div>
+                            <div className="flex items-center space-x-2">
+                              <Checkbox
+                                id="terms"
+                                checked={filePlacements[index]?.includes(
+                                  "polda"
+                                )}
+                                onCheckedChange={(e) =>
+                                  setupPlacement(index, "polda", Boolean(e))
+                                }
+                              />
+                              <label
+                                htmlFor="terms"
+                                className="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                              >
+                                Wilayah
+                              </label>
+                            </div>
+
+                            <div className="flex items-center space-x-2">
+                              <Checkbox
+                                id="terms"
+                                checked={filePlacements[index]?.includes(
+                                  "international"
+                                )}
+                                onCheckedChange={(e) =>
+                                  setupPlacement(
+                                    index,
+                                    "international",
+                                    Boolean(e)
+                                  )
+                                }
+                              />
+                              <label
+                                htmlFor="terms"
+                                className="text-xs font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                              >
+                                Internasional
+                              </label>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    ))}
+                  </div>
                 </div>
-              </div>
-              <div className="mt-3 px-3">
-                <Label>{t("preview")}</Label>
-                <Card className="mt-2">
-                  <img
-                    src={detail.contentThumbnail}
-                    alt="Thumbnail Gambar Utama"
-                    className="w-full h-auto rounded"
-                  />
-                </Card>
-              </div>
-              <div className="px-3 py-3">
-                <div className="space-y-2">
-                  <Label>{t("tags")}</Label>
-                  <div className="flex flex-wrap gap-2">
-                    {detail?.contentTag
-                      ?.split(",")
-                      .map((tag: any, index: any) => (
-                        <Badge
-                          key={index}
-                          className="border rounded-md  px-2 py-2"
+              </Card>
+              <div className="w-full lg:w-4/12">
+                <Card className=" h-[800px]">
+                  <div className="px-3 py-3">
+                    <div className="space-y-2">
+                      <Label>{t("creator")}</Label>
+                      <Controller
+                        control={form.control}
+                        name="contentCreator"
+                        render={({ field }) => (
+                          <Input
+                            size="md"
+                            type="text"
+                            value={detail?.contentCreator}
+                            onChange={field.onChange}
+                            placeholder="Enter Title"
+                          />
+                        )}
+                      />
+                    </div>
+                  </div>
+                  <div className="mt-3 px-3">
+                    <Label>{t("preview")}</Label>
+                    <Card className="mt-2">
+                      <img
+                        src={detail.contentThumbnail}
+                        alt="Thumbnail Gambar Utama"
+                        className="w-full h-auto rounded"
+                      />
+                    </Card>
+                  </div>
+                  <div className="px-3 py-3">
+                    <div className="space-y-2">
+                      <Label>{t("tags")}</Label>
+                      <div className="flex flex-wrap gap-2">
+                        {detail?.contentTag
+                          ?.split(",")
+                          .map((tag: any, index: any) => (
+                            <Badge
+                              key={index}
+                              className="border rounded-md  px-2 py-2"
+                            >
+                              {tag.trim()}
+                            </Badge>
+                          ))}
+                      </div>
+                    </div>
+                  </div>
+                  <div className="px-3 py-3">
+                    <div className="flex flex-col gap-3 space-y-2">
+                      <Label>{t("publish-target")}</Label>
+                      {options.map((option) => (
+                        <div
+                          key={option.id}
+                          className="flex gap-2 items-center"
                         >
-                          {tag.trim()}
-                        </Badge>
+                          <Checkbox
+                            id={option.id}
+                            checked={
+                              option.id === "all"
+                                ? publishedFor.length ===
+                                  options.filter((opt: any) => opt.id !== "all")
+                                    .length
+                                : publishedFor.includes(option.id)
+                            }
+                            onCheckedChange={() =>
+                              handleCheckboxChange(option.id)
+                            }
+                          />
+                          <Label htmlFor={option.id}>{option.label}</Label>
+                        </div>
                       ))}
+                    </div>
+                  </div>
+                </Card>
+                <div className="flex flex-row justify-end gap-3">
+                  <div className="mt-4">
+                    <Button type="submit" color="primary">
+                      {t("submit")}
+                    </Button>
+                  </div>
+                  <div className="mt-4">
+                    <Button
+                      type="submit"
+                      className="bg-red-500 hover:bg-red-700"
+                      onClick={() => deleteSpitContent()}
+                    >
+                      {t("cancel")}
+                    </Button>
                   </div>
                 </div>
               </div>
-              <div className="px-3 py-3">
-                <div className="flex flex-col gap-3 space-y-2">
-                  <Label>{t("publish-target")}</Label>
-                  {options.map((option) => (
-                    <div key={option.id} className="flex gap-2 items-center">
-                      <Checkbox
-                        id={option.id}
-                        checked={
-                          option.id === "all"
-                            ? publishedFor.length ===
-                              options.filter((opt: any) => opt.id !== "all")
-                                .length
-                            : publishedFor.includes(option.id)
-                        }
-                        onCheckedChange={() => handleCheckboxChange(option.id)}
-                      />
-                      <Label htmlFor={option.id}>{option.label}</Label>
-                    </div>
-                  ))}
-                </div>
-              </div>
-              <div className="px-3 py-3 flex flex-row items-center text-blue-500 gap-2 text-sm">
-                <MailIcon />
-                <p className="">{t("suggestion-box")} (0)</p>
-              </div>
-              <div className="px-3 py-3">
-                <p>{t("information")}:</p>
-                {/* <p>{detail?.status}</p> */}
-              </div>
-            </Card>
-            <div className="flex flex-row justify-end gap-3">
-              <div className="mt-4">
-                <Button type="submit" color="primary">
-                  {t("submit")}
-                </Button>
-              </div>
-              <div className="mt-4">
-                <Button
-                  type="submit"
-                  className="bg-red-500 hover:bg-red-700"
-                  onClick={() => deleteSpitContent()}
-                >
-                  {t("cancel")}
-                </Button>
-              </div>
             </div>
-          </div>
-        </div>
-      ) : (
-        ""
-      )}
-    </form>
+          ) : (
+            ""
+          )}
+        </form>
+      </Form>
+    </>
   );
 }
diff --git a/components/form/schedule/form-calendar-polri.tsx b/components/form/schedule/form-calendar-polri.tsx
index 3b46563a..52e1c360 100644
--- a/components/form/schedule/form-calendar-polri.tsx
+++ b/components/form/schedule/form-calendar-polri.tsx
@@ -25,7 +25,6 @@ import DatePicker from "react-datepicker";
 import { id } from "date-fns/locale";
 import "react-datepicker/dist/react-datepicker.css";
 import { zodResolver } from "@hookform/resolvers/zod";
-import router from "next/router";
 import { Controller, useForm } from "react-hook-form";
 import { date, z } from "zod";
 import { error, loading } from "@/lib/swal";
@@ -51,6 +50,7 @@ import Image from "next/image";
 import FileUploader from "../shared/file-uploader";
 import { getCsrfToken } from "@/service/auth";
 import { Upload } from "tus-js-client";
+import { useRouter } from "next/navigation";
 
 const calendarSchema = z.object({
   title: z.string().min(1, { message: "Judul diperlukan" }),
@@ -68,6 +68,7 @@ interface FileUploaded {
 
 export function CalendarPolriAdd() {
   const MySwal = withReactContent(Swal);
+  const router = useRouter();
   const [open, setOpen] = React.useState(false);
   const t = useTranslations("Schedule");
   type CalendarSchema = z.infer<typeof calendarSchema>;
@@ -212,9 +213,7 @@ export function CalendarPolriAdd() {
       return false;
     }
 
-    Cookies.set("scheduleId", response?.data?.data.id, {
-      expires: 1,
-    });
+    const id = response?.data?.data?.id;
 
     loading();
     if (imageFiles?.length === 0) {
@@ -242,7 +241,7 @@ export function CalendarPolriAdd() {
     };
 
     const upload = new Upload(file, {
-      endpoint: `${process.env.NEXT_PUBLIC_API}/agenda-settings/file/upload`,
+      endpoint: `${process.env.NEXT_PUBLIC_API}/calendars/file/upload`,
       headers: headers,
       retryDelays: [0, 3000, 6000, 12_000, 24_000],
       chunkSize: 20_000,
diff --git a/components/form/setting/form-add-iklan.tsx b/components/form/setting/form-add-iklan.tsx
index bcbb37ee..b8ccdd18 100644
--- a/components/form/setting/form-add-iklan.tsx
+++ b/components/form/setting/form-add-iklan.tsx
@@ -134,7 +134,7 @@ export function TambahIklanModal() {
   };
 
   const handlePoldaPolresChange = () => {
-    return Array.from(checkedLevels).join(","); // Mengonversi Set ke string
+    return Array.from(checkedLevels).join(",");
   };
 
   const handleUnitChange = (