Merge pull request 'upd: tambah satuan' (#115) from amalia/06-feb-26 into main

Reviewed-on: http://wibugit.wibudev.com/wibu/jenna-mcp/pulls/115

bak/ModalSurat.tsx.txt

@@ -0,0 +1,146 @@
+import apiFetch from "@/lib/apiFetch";
+import { ActionIcon, Flex, Modal } from "@mantine/core";
+import { useShallowEffect } from "@mantine/hooks";
+import { IconDownload, IconX } from "@tabler/icons-react";
+import html2canvas from "html2canvas";
+import jsPDF from "jspdf";
+import { useRef } from "react";
+import useSWR from "swr";
+import SKBedaBiodataDiri from "./surat/SKBedaBiodataDiri";
+import SKBelumKawin from "./surat/SKBelumKawin";
+import SKDomisiliOrganisasi from "./surat/SKDomisiliOrganisasi";
+import SKKelahiran from "./surat/SKKelahiran";
+import SKKelakuanBaik from "./surat/SKKelakuanBaik";
+import SKKematian from "./surat/SKKematian";
+import SKPenghasilan from "./surat/SKPenghasilan";
+import SKTempatUsaha from "./surat/SKTempatUsaha";
+import SKTidakMampu from "./surat/SKTidakMampu";
+import SKUsaha from "./surat/SKUsaha";
+import SKYatim from "./surat/SKYatimPiatu";
+
+export default function ModalSurat({
+  open,
+  onClose,
+  surat,
+}: {
+  open: boolean;
+  onClose: () => void;
+  surat: string;
+}) {
+  const A4Style = {
+    width: "210mm",
+    height: "297mm",
+    padding: "20mm",
+    background: "#fff",
+    color: "#000",
+    fontSize: "14px",
+    fontFamily: "Times New Roman",
+  };
+  const hiddenRef = useRef<any>(null);
+  const { data, mutate, isLoading } = useSWR("surat", () =>
+    apiFetch.api.surat.detail.get({
+      query: {
+        id: surat,
+      },
+    }),
+  );
+
+  useShallowEffect(() => {
+    mutate();
+  }, []);
+
+  const downloadPDF = async () => {
+    const element = hiddenRef.current;
+    const canvas = await html2canvas(element, {
+      scale: 2,
+      useCORS: true,
+      allowTaint: true,
+      width: element.offsetWidth,
+      height: element.offsetHeight,
+    });
+
+    const imgData = canvas.toDataURL("image/jpeg", 1.0);
+
+    const pdf = new jsPDF("p", "mm", "a4");
+    const pageWidth = 210; // A4 width mm
+    const pageHeight = 297; // A4 height mm
+
+    const imgWidth = pageWidth;
+    const imgHeight = (canvas.height * pageWidth) / canvas.width;
+
+    pdf.addImage(imgData, "JPEG", 0, 0, imgWidth, imgHeight);
+
+    pdf.save(`${data?.data?.surat?.nameCategory}.pdf`);
+  };
+
+  return (
+    <>
+      <Modal
+        opened={open}
+        onClose={() => onClose()}
+        overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
+        size="auto"
+        withCloseButton={false}
+        removeScrollProps={{ allowPinchZoom: true }}
+        styles={{
+          header: {
+            display: "flex",
+            justifyContent: "space-between",
+            alignItems: "center",
+            padding: "12px 16px",
+          },
+          title: {
+            width: "100%",
+          },
+        }}
+        title={
+          <Flex justify="space-between" align="center" w="100%">
+            <div style={{ fontSize: 18, fontWeight: 600 }}>Preview Surat</div>
+
+            <Flex gap={8}>
+              <ActionIcon size={32} variant="default">
+                <IconDownload size={20} onClick={downloadPDF} />
+              </ActionIcon>
+
+              <ActionIcon size={32} variant="default" onClick={onClose}>
+                <IconX size={20} />
+              </ActionIcon>
+            </Flex>
+          </Flex>
+        }
+      >
+        <div ref={hiddenRef} style={A4Style}>
+          {data && data.data ? (
+            data.data.surat.idCategory == "skusaha" ? (
+              <SKUsaha data={data.data} />
+            ) : data.data.surat.idCategory == "skkelahiran" ? (
+              <SKKelahiran data={data.data} />
+            ) : data.data.surat.idCategory == "skkelakuanbaik" ? (
+              <SKKelakuanBaik data={data.data} />
+            ) : data.data.surat.idCategory == "skpenghasilan" ? (
+              <SKPenghasilan data={data.data} />
+            ) : data.data.surat.idCategory == "sktidakmampu" ? (
+              <SKTidakMampu data={data.data} />
+            ) : data.data.surat.idCategory == "skyatimpiatu" ? (
+              <SKYatim data={data.data} />
+            ) : data.data.surat.idCategory == "skdomisiliorganisasi" ? (
+              <SKDomisiliOrganisasi data={data.data} />
+            ) : data.data.surat.idCategory == "skbedabiodata" ? (
+              <SKBedaBiodataDiri data={data.data} />
+            ) : data.data.surat.idCategory == "sktempatusaha" ? (
+              <SKTempatUsaha data={data.data} />
+            ) : data.data.surat.idCategory == "skbelumkawin" ? (
+              <SKBelumKawin data={data.data} />
+            ) : data.data.surat.idCategory == "skkematian" ? (
+              <SKKematian data={data.data} />
+            ) : (
+              <></>
+            )
+          ) : (
+            <></>
+          )}
+        </div>
+      </Modal>
+    </>
+  );
+}

bak/listPermission.json.txt

@@ -0,0 +1,310 @@
+{
+  "menus": [
+    {
+      "key": "dashboard",
+      "label": "Dashboard",
+      "default": true,
+      "children": [
+        {
+          "key": "dashboard.view",
+          "label": "Melihat Dashboard",
+          "default": true
+        }
+      ]
+    },
+    {
+      "key": "pengaduan",
+      "label": "Pengaduan",
+      "default": true,
+      "children": [
+        {
+          "key": "pengaduan.view",
+          "label": "Melihat List & Detail",
+          "default": true
+        },
+        {
+          "key": "pengaduan.antrian",
+          "label": "Detail pengaduan dengan status antrian",
+          "default": true,
+          "children": [
+            {
+              "key": "pengaduan.antrian.tolak",
+              "label": "Menolak pengaduan",
+              "default": true
+            },
+            {
+              "key": "pengaduan.antrian.terima",
+              "label": "Menerima pengaduan",
+              "default": true
+            }
+          ]
+        },
+        {
+          "key": "pengaduan.diterima",
+          "label": "Detail pengaduan dengan status diterima",
+          "default": true,
+          "children": [
+            {
+              "key": "pengaduan.diterima.dikerjakan",
+              "label": "Menegerjakan pengaduan",
+              "default": true
+            }
+          ]
+        },
+        {
+          "key": "pengaduan.dikerjakan",
+          "label": "Detail pengaduan dengan status dikerjakan",
+          "default": true,
+          "children": [
+            {
+              "key": "pengaduan.dikerjakan.selesai",
+              "label": "Menyelesaikan pengaduan",
+              "default": true
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "key": "pelayanan",
+      "label": "Pelayanan",
+      "default": true,
+      "children": [
+        {
+          "key": "pelayanan.view",
+          "label": "Melihat List & Detail",
+          "default": true
+        },
+        {
+          "key": "pelayanan.antrian",
+          "label": "Detail pelayanan dengan status antrian",
+          "default": true,
+          "children": [
+            {
+              "key": "pelayanan.antrian.tolak",
+              "label": "Menolak pelayanan",
+              "default": true
+            },
+            {
+              "key": "pelayanan.antrian.terima",
+              "label": "Menerima pelayanan",
+              "default": true
+            }
+          ]
+        },
+        {
+          "key": "pelayanan.diterima",
+          "label": "Detail pelayanan dengan status diterima",
+          "default": true,
+          "children": [
+            {
+              "key": "pelayanan.diterima.tolak",
+              "label": "Menolak pelayanan",
+              "default": true
+            },
+            {
+              "key": "pelayanan.diterima.setujui",
+              "label": "Menyetujui pelayanan",
+              "default": true
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "key": "warga",
+      "label": "Warga",
+      "default": true,
+      "children": [
+        {
+          "key": "warga.view",
+          "label": "Melihat List & Detail",
+          "default": true
+        }
+      ]
+    },
+    {
+      "key": "setting",
+      "label": "Setting",
+      "default": true,
+      "children": [
+        {
+          "key": "setting.profile",
+          "label": "Profile",
+          "default": true,
+          "children": [
+            {
+              "key": "setting.profile.view",
+              "label": "View",
+              "default": true
+            },
+            {
+              "key": "setting.profile.edit",
+              "label": "Edit",
+              "default": true
+            },
+            {
+              "key": "setting.profile.password",
+              "label": "Ubah Password",
+              "default": true
+            }
+          ]
+        },
+        {
+          "key": "setting.user",
+          "label": "User",
+          "default": true,
+          "children": [
+            {
+              "key": "setting.user.view",
+              "label": "View List",
+              "default": true
+            },
+            {
+              "key": "setting.user.tambah",
+              "label": "Tambah",
+              "default": true
+            },
+            {
+              "key": "setting.user.edit",
+              "label": "Edit",
+              "default": true
+            },
+            {
+              "key": "setting.user.delete",
+              "label": "Delete",
+              "default": true
+            }
+          ]
+        },
+        {
+          "key": "setting.user_role",
+          "label": "User Role",
+          "default": true,
+          "children": [
+            {
+              "key": "setting.user_role.view",
+              "label": "View List",
+              "default": true
+            },
+            {
+              "key": "setting.user_role.tambah",
+              "label": "Tambah",
+              "default": true
+            },
+            {
+              "key": "setting.user_role.edit",
+              "label": "Edit",
+              "default": true
+            },
+            {
+              "key": "setting.user_role.delete",
+              "label": "Delete",
+              "default": true
+            }
+          ]
+        },
+        {
+          "key": "setting.kategori_pengaduan",
+          "label": "Kategori Pengaduan",
+          "default": true,
+          "children": [
+            {
+              "key": "setting.kategori_pengaduan.view",
+              "label": "View List",
+              "default": true
+            },
+            {
+              "key": "setting.kategori_pengaduan.tambah",
+              "label": "Tambah",
+              "default": true
+            },
+            {
+              "key": "setting.kategori_pengaduan.edit",
+              "label": "Edit",
+              "default": true
+            },
+            {
+              "key": "setting.kategori_pengaduan.delete",
+              "label": "Delete",
+              "default": true
+            }
+          ]
+        },
+        {
+          "key": "setting.kategori_pelayanan",
+          "label": "Kategori Pelayanan Surat",
+          "default": true,
+          "children": [
+            {
+              "key": "setting.kategori_pelayanan.view",
+              "label": "View List",
+              "default": true
+            },
+            {
+              "key": "setting.kategori_pelayanan.detail",
+              "label": "View Detail",
+              "default": true
+            },
+            {
+              "key": "setting.kategori_pelayanan.tambah",
+              "label": "Tambah",
+              "default": true
+            },
+            {
+              "key": "setting.kategori_pelayanan.edit",
+              "label": "Edit",
+              "default": true
+            },
+            {
+              "key": "setting.kategori_pelayanan.delete",
+              "label": "Delete",
+              "default": true
+            }
+          ]
+        },
+        {
+          "key": "setting.desa",
+          "label": "Desa",
+          "default": true,
+          "children": [
+            {
+              "key": "setting.desa.view",
+              "label": "View List",
+              "default": true
+            },
+            {
+              "key": "setting.desa.edit",
+              "label": "Edit",
+              "default": true
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "key": "api_key",
+      "label": "API Key",
+      "default": true,
+      "children": [
+        {
+          "key": "api_key.view",
+          "label": "View List",
+          "default": true
+        }
+      ]
+    },
+    {
+      "key": "credential",
+      "label": "Credential",
+      "default": true,
+      "children": [
+        {
+          "key": "credential.view",
+          "label": "View List",
+          "default": true
+        }
+      ]
+    }
+  ]
+}

bun.lock

@@ -22,6 +22,7 @@
         "@types/lodash": "^4.17.20",
         "@types/uuid": "^11.0.0",
         "add": "^2.0.6",
+        "dayjs": "^1.11.19",
         "echarts": "^6.0.0",
         "echarts-for-react": "^3.0.5",
         "elysia": "^1.4.15",

package.json

@@ -28,6 +28,7 @@
     "@types/lodash": "^4.17.20",
     "@types/uuid": "^11.0.0",
     "add": "^2.0.6",
+    "dayjs": "^1.11.19",
     "echarts": "^6.0.0",
     "echarts-for-react": "^3.0.5",
     "elysia": "^1.4.15",

prisma/schema.prisma

@@ -187,6 +187,7 @@ model SuratPelayanan {
   Warga              Warga             @relation(fields: [idWarga], references: [id])
   idWarga            String
   noSurat            String
+  file            String?
   dateExpired        DateTime?         @db.Date
   status             Int               @default(0)
   isActive           Boolean           @default(true)

src/components/BreadCrumbs.tsx

@@ -0,0 +1,44 @@
+import { ActionIcon, Anchor, Breadcrumbs, Card, Group } from "@mantine/core";
+import { IconChevronLeft } from "@tabler/icons-react";
+import { useNavigate } from "react-router-dom";
+
+export default function BreadCrumbs({ dataLink, back, linkBack }: { dataLink: { title: string, link: string, active: boolean }[], back?: boolean, linkBack?: string }) {
+   const navigate = useNavigate();
+
+   return (
+      <Card
+         radius="md"
+         p="sm"
+         withBorder
+         style={{
+            background:
+               "linear-gradient(145deg, rgba(25,25,25,0.95), rgba(45,45,45,0.85))",
+            borderColor: "rgba(100,100,100,0.2)",
+            boxShadow: "0 0 20px rgba(0,255,200,0.08)",
+         }}
+      >
+         <Group>
+            {
+               back &&
+               <ActionIcon variant="outline" aria-label="Settings" radius={"lg"} onClick={() => window.history.back()}>
+                  <IconChevronLeft size={20} stroke={1.5} />
+               </ActionIcon>
+            }
+            <Breadcrumbs>
+               {
+                  dataLink.map((item, index) => (
+                     <Anchor
+                        c={item.active ? "gray.0" : "gray.5"}
+                        onClick={() => item.active || item.link == "#" ? null : navigate(item.link)}
+                        key={index}
+                     >
+                        {item.title}
+                     </Anchor>
+                  ))
+               }
+            </Breadcrumbs>
+         </Group>
+
+      </Card>
+   )
+}

src/components/DesaSetting.tsx

@@ -207,7 +207,7 @@ export default function DesaSetting({
               </Table.Tr>
             </Table.Thead>
             <Table.Tbody>
-              {list?.map((v: any) => (
+              {list.length > 0 && list?.map((v: any) => (
                 <Table.Tr key={v.id}>
                   <Table.Td>{v.name}</Table.Td>
                   <Table.Td>

src/components/KategoriPelayananSurat.tsx

@@ -4,9 +4,7 @@ import {
   Button,
   Divider,
   Flex,
-  Grid,
   Group,
-  Input,
   List,
   Modal,
   Stack,
@@ -16,7 +14,7 @@ import {
   Tooltip
 } from "@mantine/core";
 import { useDisclosure, useShallowEffect } from "@mantine/hooks";
-import { IconEdit, IconEye, IconPlus, IconTrash } from "@tabler/icons-react";
+import { IconEye, IconTrash } from "@tabler/icons-react";
 import type { JsonValue } from "generated/prisma/runtime/library";
 import { useState } from "react";
 import useSWR from "swr";
@@ -190,7 +188,10 @@ export default function KategoriPelayananSurat({
   function handleAddSyarat() {
     setDataChoose({
       ...dataChoose,
-      syaratDokumen: [...dataChoose.syaratDokumen, { key: "", name: "", desc: "" }],
+      syaratDokumen: [
+        ...dataChoose.syaratDokumen,
+        { key: "", name: "", desc: "" },
+      ],
     });
   }
 
@@ -216,7 +217,7 @@ export default function KategoriPelayananSurat({
   return (
     <>
       {/* Modal Edit */}
-      <Modal
+      {/* <Modal
         opened={opened}
         onClose={close}
         title={"Edit"}
@@ -232,15 +233,85 @@ export default function KategoriPelayananSurat({
               }
             />
           </Input.Wrapper>
-          {/* <TagsInput
+          <Flex direction={"column"} gap={"md"}>
-            label="Data Pelengkap"
+            <Group>
-            placeholder="Tambah data pelengkap"
+              <Text size="sm" c={"white"}>
-            splitChars={[","]}
+                Data Pelengkap
-            value={dataChoose.dataPelengkap}
+              </Text>
-            onChange={(value) =>
+              <Tooltip label="Tambah Data Pelengkap">
-              setDataChoose({ ...dataChoose, dataPelengkap: value })
+                <ActionIcon
-            }
+                  variant="light"
-          /> */}
+                  size="sm"
+                  color="blue"
+                  style={{ boxShadow: "0 0 8px rgba(0,255,200,0.2)" }}
+                  onClick={handleAddSyarat}
+                >
+                  <IconPlus size={20} />
+                </ActionIcon>
+              </Tooltip>
+            </Group>
+            {dataChoose?.dataPelengkap?.map((v: any, i: number) => (
+              <Grid
+                key={i}
+                style={{
+                  borderBottom: "1px solid gray",
+                  paddingBottom: "10px",
+                }}
+              >
+                <Grid.Col
+                  span={1}
+                  style={{
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                  }}
+                >
+                  <Tooltip label="Delete Syarat Dokumen">
+                    <ActionIcon
+                      variant="light"
+                      size="sm"
+                      color="red"
+                      style={{ boxShadow: "0 0 8px rgba(0,255,200,0.2)" }}
+                      onClick={() => {
+                        handleDeleteSyarat(i);
+                      }}
+                    >
+                      <IconTrash size={20} />
+                    </ActionIcon>
+                  </Tooltip>
+                </Grid.Col>
+                <Grid.Col span={5}>
+                  <Input.Wrapper label="Label">
+                    <Input
+                      value={v.name}
+                      onChange={(e) =>
+                        handleEditSyarat(i, {
+                          key: v.key,
+                          name: e.target.value,
+                          desc: v.desc,
+                        })
+                      }
+                    />
+                  </Input.Wrapper>
+                </Grid.Col>
+                <Grid.Col span={6}>
+                  <Input.Wrapper label="Deskripsi">
+                    <Input
+                      value={v.desc}
+                      onChange={(e) =>
+                        handleEditSyarat(i, {
+                          key: v.key,
+                          name: v.name,
+                          desc: e.target.value,
+                        })
+                      }
+                    />
+                  </Input.Wrapper>
+                </Grid.Col>
+              </Grid>
+            ))}
+          </Flex>
+
           <Flex direction={"column"} gap={"md"}>
             <Group>
               <Text size="sm" c={"white"}>
@@ -289,7 +360,7 @@ export default function KategoriPelayananSurat({
                   </Tooltip>
                 </Grid.Col>
                 <Grid.Col span={5}>
-                  <Input.Wrapper label="Nama">
+                  <Input.Wrapper label="Label">
                     <Input
                       value={v.name}
                       onChange={(e) =>
@@ -329,10 +400,10 @@ export default function KategoriPelayananSurat({
             </Button>
           </Group>
         </Stack>
-      </Modal>
+      </Modal> */}
 
       {/* Modal Tambah */}
-      <Modal
+      {/* <Modal
         opened={openedTambah}
         onClose={closeTambah}
         title={"Tambah"}
@@ -348,15 +419,6 @@ export default function KategoriPelayananSurat({
               }
             />
           </Input.Wrapper>
-          {/* <TagsInput
-            label="Data Pelengkap"
-            placeholder="Tambah data pelengkap"
-            splitChars={[","]}
-            value={dataTambah.dataText}
-            onChange={(value) =>
-              setDataTambah({ ...dataTambah, dataText: value })
-            }
-          /> */}
           <Flex direction={"column"} gap={"md"}>
             <Group>
               <Text size="sm" c={"white"}>
@@ -466,7 +528,7 @@ export default function KategoriPelayananSurat({
             </Button>
           </Group>
         </Stack>
-      </Modal>
+      </Modal> */}
 
       {/* Modal Delete */}
       <Modal
@@ -539,7 +601,7 @@ export default function KategoriPelayananSurat({
           <Title order={4} c="gray.2">
             Kategori Pelayanan Surat
           </Title>
-          {permissions.includes("setting.kategori_pelayanan.tambah") && (
+          {/* {permissions.includes("setting.kategori_pelayanan.tambah") && (
             <Tooltip label="Tambah Kategori Pelayanan Surat">
               <Button
                 variant="light"
@@ -549,7 +611,7 @@ export default function KategoriPelayananSurat({
                 Tambah
               </Button>
             </Tooltip>
-          )}
+          )} */}
         </Flex>
         <Divider my={0} />
         <Stack gap={"md"}>
@@ -561,7 +623,7 @@ export default function KategoriPelayananSurat({
               </Table.Tr>
             </Table.Thead>
             <Table.Tbody>
-              {list?.map((v: any) => (
+              {list.length > 0 && list?.map((v: any) => (
                 <Table.Tr key={v.id}>
                   <Table.Td>{v.name}</Table.Td>
                   <Table.Td>
@@ -580,7 +642,7 @@ export default function KategoriPelayananSurat({
                           <IconEye size={20} />
                         </ActionIcon>
                       </Tooltip>
-                      <Tooltip
+                      {/* <Tooltip
                         label={
                           permissions.includes(
                             "setting.kategori_pelayanan.edit",
@@ -605,7 +667,7 @@ export default function KategoriPelayananSurat({
                         >
                           <IconEdit size={20} />
                         </ActionIcon>
-                      </Tooltip>
+                      </Tooltip> */}
                       <Tooltip
                         label={
                           permissions.includes(

src/components/ModalSurat.tsx

@@ -1,10 +1,9 @@
 import apiFetch from "@/lib/apiFetch";
-import { ActionIcon, Flex, Modal } from "@mantine/core";
+import { Flex, Modal, Progress, Stack, Text } from "@mantine/core";
 import { useShallowEffect } from "@mantine/hooks";
-import { IconDownload, IconX } from "@tabler/icons-react";
 import html2canvas from "html2canvas";
 import jsPDF from "jspdf";
-import { useRef } from "react";
+import { useRef, useState } from "react";
 import useSWR from "swr";
 import SKBedaBiodataDiri from "./surat/SKBedaBiodataDiri";
 import SKBelumKawin from "./surat/SKBelumKawin";
@@ -24,7 +23,7 @@ export default function ModalSurat({
   surat,
 }: {
   open: boolean;
-  onClose: () => void;
+  onClose: (val: { success: boolean, data: string }) => void;
   surat: string;
 }) {
   const A4Style = {
@@ -36,6 +35,7 @@ export default function ModalSurat({
     fontSize: "14px",
     fontFamily: "Times New Roman",
   };
+  const [uploading, setUploading] = useState<{ text: "Menyiapkan" | "Mengupload" | "Selesai" | "Gagal", value: number }>({ text: "Menyiapkan", value: 10 })
   const hiddenRef = useRef<any>(null);
   const { data, mutate, isLoading } = useSWR("surat", () =>
     apiFetch.api.surat.detail.get({
@@ -45,42 +45,97 @@ export default function ModalSurat({
     }),
   );
 
+
   useShallowEffect(() => {
     mutate();
   }, []);
 
-  const downloadPDF = async () => {
+  const uploadPdf = async () => {
-    const element = hiddenRef.current;
+    try {
-    const canvas = await html2canvas(element, {
+      if (data && data.data && data.data.surat && (data.data.surat.file == "" || data.data.surat.file == null)) {
-      scale: 2,
+        setUploading({ text: "Mengupload", value: 75 });
-      useCORS: true,
+        const element = hiddenRef.current;
-      allowTaint: true,
+        const canvas = await html2canvas(element, {
-      width: element.offsetWidth,
+          scale: 2,
-      height: element.offsetHeight,
+          useCORS: true,
-    });
+          allowTaint: true,
+          width: element.offsetWidth,
+          height: element.offsetHeight,
+        });
 
-    const imgData = canvas.toDataURL("image/jpeg", 1.0);
+        const imgData = canvas.toDataURL("image/jpeg", 1.0);
 
-    const pdf = new jsPDF("p", "mm", "a4");
+        const pdf = new jsPDF("p", "mm", "a4");
-    const pageWidth = 210; // A4 width mm
+        const pageWidth = 210; // A4 width mm
-    const pageHeight = 297; // A4 height mm
+        const pageHeight = 297; // A4 height mm
 
-    const imgWidth = pageWidth;
+        const imgWidth = pageWidth;
-    const imgHeight = (canvas.height * pageWidth) / canvas.width;
+        const imgHeight = (canvas.height * pageWidth) / canvas.width;
 
-    pdf.addImage(imgData, "JPEG", 0, 0, imgWidth, imgHeight);
+        pdf.addImage(imgData, "JPEG", 0, 0, imgWidth, imgHeight);
 
-    pdf.save(`${data?.data?.surat?.nameCategory}.pdf`);
+        // ⬇️ ambil sebagai Blob
-  };
+        const pdfBlob = pdf.output("blob");
+
+        const pdfFile = new File(
+          [pdfBlob],
+          `${data?.data?.surat?.nameCategory}.pdf`,
+          {
+            type: "application/pdf",
+            lastModified: Date.now(),
+          }
+        );
+
+        const resImg = await apiFetch.api.pengaduan.upload.post({
+          file: pdfFile,
+          folder: "surat",
+        });
+
+        const resUpdate = await apiFetch.api.surat.update.post({
+          id: surat,
+          filename: resImg.data?.filename!,
+        });
+
+        if (resUpdate?.data?.success) {
+          setUploading({ text: "Selesai", value: 100 });
+          setTimeout(() => {
+            onClose({ success: true, data: resUpdate.data?.link });
+          }, 1000)
+        } else {
+          setUploading({ text: "Gagal", value: 100 });
+          setTimeout(() => {
+            onClose({ success: false, data: "" });
+          }, 1000)
+        }
+      } else {
+        setUploading({ text: "Gagal", value: 100 });
+        setTimeout(() => {
+          onClose({ success: false, data: "" });
+        }, 1000)
+      }
+
+    } catch (error) {
+      console.error("Error uploading PDF:", error);
+    }
+  }
+
+  useShallowEffect(() => {
+    if (open) {
+      setTimeout(() => {
+        uploadPdf();
+      }, 3000);
+    }
+  }, [surat, open]);
 
   return (
     <>
       <Modal
         opened={open}
-        onClose={() => onClose()}
+        onClose={() => { }}
         overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
         size="auto"
         withCloseButton={false}
+        closeOnClickOutside={false}
         removeScrollProps={{ allowPinchZoom: true }}
         styles={{
           header: {
@@ -94,19 +149,24 @@ export default function ModalSurat({
           },
         }}
         title={
-          <Flex justify="space-between" align="center" w="100%">
+          <>
-            <div style={{ fontSize: 18, fontWeight: 600 }}>Preview Surat</div>
+            <Flex justify="space-between" align="center" w="100%">
+              <div style={{ fontSize: 18, fontWeight: 600 }}>Preview Surat</div>
 
-            <Flex gap={8}>
+              {/* <Flex gap={8} align="center">
-              <ActionIcon size={32} variant="default">
+              <Loader color="blue" size="xs" />
-                <IconDownload size={20} onClick={downloadPDF} />
+              <Text size="sm">{uploading.text}</Text>
-              </ActionIcon>
+            </Flex> */}
-
-              <ActionIcon size={32} variant="default" onClick={onClose}>
-                <IconX size={20} />
-              </ActionIcon>
             </Flex>
-          </Flex>
+            <Stack
+              align="stretch"
+              justify="center"
+              gap="xs"
+            >
+              <Text size="sm" ta="center">{uploading.text} - Harap menunggu sampai selesai</Text>
+              <Progress radius="md" value={uploading.value} animated size="lg" />
+            </Stack>
+          </>
         }
       >
         <div ref={hiddenRef} style={A4Style}>

src/components/NotFoundPengajuanSurat.tsx

@@ -0,0 +1,45 @@
+import { Button, Center, Group, Stack, Text, Title } from "@mantine/core";
+import { IconSearch } from "@tabler/icons-react";
+
+export function DataNotFound({
+  onRetry,
+  backTo,
+}: {
+  onRetry?: () => void;
+  backTo?: () => void;
+}) {
+  return (
+    <Center mih={320}>
+      <Stack align="center" gap="sm">
+        <IconSearch size={64} opacity={0.5} />
+
+        <Title order={4}>Data Pengajuan Tidak Ditemukan</Title>
+
+        <Text size="sm" c="dimmed" ta="center" maw={380}>
+          Kami tidak dapat menemukan data pengajuan dengan nomor pengajuan yg
+          diinputkan. Silakan periksa kembali data Anda.
+        </Text>
+
+        <Group mt="md">
+          {/* {onRetry && (
+            <Button
+              variant="light"
+              leftSection={<IconSearch size={16} />}
+              onClick={onRetry}
+            >
+              Cari Ulang
+            </Button>
+          )} */}
+
+          <Button
+            variant="outline"
+            // leftSection={<IconArrowLeft size={16} />}
+            onClick={backTo}
+          >
+            Cari Kembali
+          </Button>
+        </Group>
+      </Stack>
+    </Center>
+  );
+}

src/components/SuccessPengajuanSurat.tsx

@@ -4,13 +4,13 @@ import { IconCheck } from "@tabler/icons-react";
 type SuccessPengajuanProps = {
   noPengajuan: string;
   onClose?: () => void;
-  category?: 'create' | 'update';
+  category?: "create" | "update";
 };
 
 export default function SuccessPengajuan({
   noPengajuan,
   onClose,
-  category
+  category,
 }: SuccessPengajuanProps) {
   return (
     <Center h="100vh">
@@ -19,11 +19,15 @@ export default function SuccessPengajuan({
           <IconCheck size={56} color="green" />
 
           <Title order={3} ta="center">
-            {category == 'create' ? 'Pengajuan Berhasil Dibuat' : 'Pengajuan Berhasil Diupdate'}
+            {category == "create"
+              ? "Pengajuan Berhasil Dibuat"
+              : "Pengajuan Berhasil Diupdate"}
           </Title>
 
           <Text ta="center" size="sm" c="dimmed">
-            {category == 'create' ? 'Pengajuan layanan surat sudah dibuat dengan nomor:' : 'Pengajuan layanan surat sudah diupdate dengan nomor:'}
+            {category == "create"
+              ? "Pengajuan layanan surat sudah dibuat dengan nomor:"
+              : "Pengajuan layanan surat sudah diupdate dengan nomor:"}
           </Text>
 
           <Badge size="xl" variant="light" color="green">

src/components/surat/SKBedaBiodataDiri.tsx

@@ -108,12 +108,12 @@ export default function SKBedaBiodataDiri({ data }: { data: any }) {
             <tr>
               <td>Tempat/Tanggal Lahir</td>
               <td>:</td>
-              <td>{getValue("tempat tanggal lahir")}</td>
+              <td>{`${getValue("tempat_lahir")}, ${getValue("tanggal_lahir")}`}</td>
             </tr>
             <tr>
               <td>Jenis Kelamin</td>
               <td>:</td>
-              <td>{getValue("jenis kelamin")}</td>
+              <td>{getValue("jenis_kelamin")}</td>
             </tr>
             <tr>
               <td>Alamat</td>
@@ -144,36 +144,36 @@ export default function SKBedaBiodataDiri({ data }: { data: any }) {
         <table style={{ width: "100%", marginTop: "5px" }}>
           <tbody>
             <tr>
-              <td style={{ width: "160px" }}>1. Nama</td>
+              <td style={{ width: "160px" }}>1. {getValue("data_dokumen")}</td>
-              <td style={{ width: "10px" }}>:</td>
+              <td style={{ width: "10px" }}></td>
-              <td>{getValue("nama")}</td>
+              <td>{/* {getValue("nama")} */}</td>
             </tr>
             <tr>
               <td>Tertulis pada dokumen A</td>
               <td>:</td>
-              <td>{getValue("tertulis pada dokumen a")}</td>
+              <td>{getValue("dokumen_a")}</td>
             </tr>
             <tr>
               <td>Tertulis pada dokumen B</td>
               <td>:</td>
-              <td>{getValue("tertulis pada dokumen b")}</td>
+              <td>{getValue("dokumen_b")}</td>
             </tr>
           </tbody>
         </table>
       </div>
 
-      <div style={{ marginTop: "15px" }}>
+      {/* <div style={{ marginTop: "15px" }}>
         <table style={{ width: "100%", marginTop: "5px" }}>
           <tbody>
             <tr>
               <td style={{ width: "160px" }}>2. Tempat/Tanggal Lahir</td>
               <td style={{ width: "10px" }}>:</td>
-              <td>{getValue("tempat tanggal lahir")}</td>
+              <td>{getValue("tempat_lahir")}</td>
             </tr>
             <tr>
               <td>Tertulis pada dokumen A</td>
               <td>:</td>
-              <td>{getValue("tertulis pada dokumen a")}</td>
+              <td>{getValue("dokumen_a")}</td>
             </tr>
             <tr>
               <td>Tertulis pada dokumen B</td>
@@ -204,7 +204,7 @@ export default function SKBedaBiodataDiri({ data }: { data: any }) {
             </tr>
           </tbody>
         </table>
-      </div>
+      </div> */}
 
       <div style={{ marginTop: "15px" }}>
         Perbedaan tersebut terjadi karena{" "}

src/components/surat/SKBelumKawin.tsx

@@ -87,12 +87,12 @@ export default function SKBelumKawin({ data }: { data: any }) {
             <tr>
               <td>Tempat/Tanggal Lahir</td>
               <td>:</td>
-              <td>{getValue("tempat tanggal lahir")}</td>
+              <td>{`${getValue("tempat_lahir")}, ${getValue("tanggal_lahir")}`}</td>
             </tr>
             <tr>
               <td>Jenis Kelamin</td>
               <td>:</td>
-              <td>{getValue("jenis kelamin")}</td>
+              <td>{getValue("jenis_kelamin")}</td>
             </tr>
             <tr>
               <td>Agama</td>

src/components/surat/SKDomisiliOrganisasi.tsx

@@ -95,27 +95,27 @@ export default function SKDomisiliOrganisasi({ data }: { data: any }) {
             <tr>
               <td style={{ width: "160px" }}>Nama Organisasi</td>
               <td style={{ width: "10px" }}>:</td>
-              <td>{getValue("nama")}</td>
+              <td>{getValue("nama_organisasi")}</td>
             </tr>
             <tr>
               <td>Jenis Organisasi</td>
               <td>:</td>
-              <td>{getValue("jenis kelamin")}</td>
+              <td>{getValue("jenis_organisasi")}</td>
             </tr>
             <tr>
               <td>Alamat</td>
               <td>:</td>
-              <td>{getValue("tempat tanggal lahir")}</td>
+              <td>{getValue("alamat_organisasi")}</td>
             </tr>
             <tr>
               <td>Nomor Telepon</td>
               <td>:</td>
-              <td>{getValue("negara")}</td>
+              <td>{getValue("no_telepon")}</td>
             </tr>
             <tr>
               <td>Nama Pimpinan</td>
               <td>:</td>
-              <td>{getValue("agama")}</td>
+              <td>{getValue("nama_pimpinan")}</td>
             </tr>
           </tbody>
         </table>

src/components/surat/SKKelahiran.tsx

@@ -7,7 +7,7 @@ export default function SKKelahiran({ data }: { data: any }) {
   const getValue = (jenis: string) =>
     _.upperFirst(
       data.surat.dataText.find((item: any) => item.jenis === jenis)?.value ||
-        "",
+      "",
     );
 
   const loadImage = async () => {
@@ -78,32 +78,32 @@ export default function SKKelahiran({ data }: { data: any }) {
             <tr>
               <td style={{ width: "200px" }}>Tanggal Lahir</td>
               <td>:</td>
-              <td>{getValue("tanggal lahir anak")}</td>
+              <td>{getValue("tanggal_lahir_anak")}</td>
             </tr>
             <tr>
               <td>Pukul</td>
               <td>:</td>
-              <td>{getValue("pukul lahir anak")}</td>
+              <td>{getValue("pukul_lahir")}</td>
             </tr>
             <tr>
               <td>Tempat Kelahiran</td>
               <td>:</td>
-              <td>{getValue("tempat lahir anak")}</td>
+              <td>{getValue("tempat_lahir")}</td>
             </tr>
             <tr>
               <td>Jenis Kelamin</td>
               <td>:</td>
-              <td>{getValue("jenis kelamin anak")}</td>
+              <td>{getValue("jenis_kelamin")}</td>
             </tr>
             <tr>
               <td>Anak ke</td>
               <td>:</td>
-              <td>{getValue("anak ke")}</td>
+              <td>{getValue("anak_ke")}</td>
             </tr>
             <tr>
               <td>Nama Anak</td>
               <td>:</td>
-              <td>{getValue("nama anak")}</td>
+              <td>{getValue("nama_anak")}</td>
             </tr>
           </tbody>
         </table>
@@ -117,27 +117,27 @@ export default function SKKelahiran({ data }: { data: any }) {
             <tr>
               <td style={{ width: "200px" }}>Nama Lengkap Ibu</td>
               <td>:</td>
-              <td>{getValue("nama ibu")}</td>
+              <td>{getValue("nama_ibu")}</td>
             </tr>
             <tr>
               <td>NIK</td>
               <td>:</td>
-              <td>{getValue("nik ibu")}</td>
+              <td>{getValue("nik_ibu")}</td>
             </tr>
             <tr>
               <td>Tempat & Tanggal Lahir</td>
               <td>:</td>
-              <td>{getValue("tempat tanggal lahir ibu")}</td>
+              <td>{`${getValue("tempat_lahir_ibu")}, ${getValue("tanggal_lahir_ibu")}`}</td>
             </tr>
             <tr>
               <td>Pekerjaan</td>
               <td>:</td>
-              <td>{getValue("pekerjaan ibu")}</td>
+              <td>{getValue("pekerjaan_ibu")}</td>
             </tr>
             <tr>
               <td>Alamat</td>
               <td>:</td>
-              <td>{getValue("alamat ibu")}</td>
+              <td>{getValue("alamat_ibu")}</td>
             </tr>
           </tbody>
         </table>
@@ -151,27 +151,27 @@ export default function SKKelahiran({ data }: { data: any }) {
             <tr>
               <td style={{ width: "200px" }}>Nama Lengkap Ayah</td>
               <td>:</td>
-              <td>{getValue("nama ayah")}</td>
+              <td>{getValue("nama_ayah")}</td>
             </tr>
             <tr>
               <td>NIK</td>
               <td>:</td>
-              <td>{getValue("nik ayah")}</td>
+              <td>{getValue("nik_ayah")}</td>
             </tr>
             <tr>
               <td>Tempat & Tanggal Lahir</td>
               <td>:</td>
-              <td>{getValue("tempat tanggal lahir ayah")}</td>
+              <td>{`${getValue("tempat_lahir_ayah")}, ${getValue("tanggal_lahir_ayah")}`}</td>
             </tr>
             <tr>
               <td>Pekerjaan</td>
               <td>:</td>
-              <td>{getValue("pekerjaan ayah")}</td>
+              <td>{getValue("pekerjaan_ayah")}</td>
             </tr>
             <tr>
               <td>Alamat</td>
               <td>:</td>
-              <td>{getValue("alamat ayah")}</td>
+              <td>{getValue("alamat_ayah")}</td>
             </tr>
           </tbody>
         </table>
@@ -185,17 +185,17 @@ export default function SKKelahiran({ data }: { data: any }) {
             <tr>
               <td style={{ width: "200px" }}>Nama Pelapor</td>
               <td>:</td>
-              <td>{getValue("nama pelapor")}</td>
+              <td>{getValue("nama_pelapor")}</td>
             </tr>
             <tr>
               <td>Hubungan dengan Anak</td>
               <td>:</td>
-              <td>{getValue("hubungan pelapor")}</td>
+              <td>{getValue("hubungan_pelapor")}</td>
             </tr>
             <tr>
               <td>Alamat</td>
               <td>:</td>
-              <td>{getValue("alamat pelapor")}</td>
+              <td>{getValue("alamat_pelapor")}</td>
             </tr>
           </tbody>
         </table>

src/components/surat/SKKelakuanBaik.tsx

@@ -71,12 +71,12 @@ export default function SKKelakuanBaik({ data }: { data: any }) {
           <tr>
             <td>Tempat/Tgl Lahir</td>
             <td>:</td>
-            <td>{getValue("tempat tanggal lahir")}</td>
+            <td>{`${getValue("tempat_lahir")}, ${getValue("tanggal_lahir")}`}</td>
           </tr>
           <tr>
             <td>Jenis Kelamin</td>
             <td>:</td>
-            <td>{getValue("jenis kelamin")}</td>
+            <td>{getValue("jenis_kelamin")}</td>
           </tr>
           <tr>
             <td>Agama</td>

src/components/surat/SKKematian.tsx

@@ -71,27 +71,27 @@ export default function SKKematian({ data }: { data: any }) {
             <tr>
               <td style={{ width: "160px" }}>Nama</td>
               <td style={{ width: "10px" }}>:</td>
-              <td>{getValue("nama")}</td>
+              <td>{getValue("nama_pelapor")}</td>
             </tr>
             <tr>
               <td>NIK</td>
               <td>:</td>
-              <td>{getValue("nik")}</td>
+              <td>{getValue("nik_pelapor")}</td>
             </tr>
             <tr>
               <td>Pekerjaan</td>
               <td>:</td>
-              <td>{getValue("pekerjaan")}</td>
+              <td>{getValue("pekerjaan_pelapor")}</td>
             </tr>
             <tr>
               <td>Alamat</td>
               <td>:</td>
-              <td>{getValue("alamat")}</td>
+              <td>{getValue("alamat_pelapor")}</td>
             </tr>
             <tr>
               <td>Hubungan dengan almarhum/almarhumah</td>
               <td>:</td>
-              <td>{getValue("hubungan dengan almarhum")}</td>
+              <td>{getValue("hubungan_pelapor")}</td>
             </tr>
           </tbody>
         </table>
@@ -104,32 +104,32 @@ export default function SKKematian({ data }: { data: any }) {
             <tr>
               <td style={{ width: "160px" }}>Nama</td>
               <td style={{ width: "10px" }}>:</td>
-              <td>{getValue("nama")}</td>
+              <td>{getValue("nama_almarhum")}</td>
             </tr>
             <tr>
               <td>NIK</td>
               <td>:</td>
-              <td>{getValue("nik")}</td>
+              <td>{getValue("nik_almarhum")}</td>
             </tr>
             <tr>
               <td>Jenis Kelamin</td>
               <td>:</td>
-              <td>{getValue("jenis kelamin")}</td>
+              <td>{getValue("jenis_kelamin_almarhum")}</td>
             </tr>
             <tr>
               <td>Tempat/Tanggal Lahir</td>
               <td>:</td>
-              <td>{getValue("tempat tanggal lahir")}</td>
+              <td>{`${getValue("tempat_lahir_almarhum")}, ${getValue("tanggal_lahir_almarhum")}`}</td>
             </tr>
             <tr>
               <td>Agama</td>
               <td>:</td>
-              <td>{getValue("agama")}</td>
+              <td>{getValue("agama_almarhum")}</td>
             </tr>
             <tr>
               <td>Alamat</td>
               <td>:</td>
-              <td>{getValue("alamat")}</td>
+              <td>{getValue("alamat_almarhum")}</td>
             </tr>
           </tbody>
         </table>
@@ -142,22 +142,22 @@ export default function SKKematian({ data }: { data: any }) {
             <tr>
               <td style={{ width: "160px" }}>Tanggal Kematian</td>
               <td style={{ width: "10px" }}>:</td>
-              <td>{getValue("tanggal kematian")}</td>
+              <td>{getValue("tanggal_kematian")}</td>
             </tr>
             <tr>
               <td>Waktu Kematian</td>
               <td>:</td>
-              <td>{getValue("waktu kematian")}</td>
+              <td>{getValue("waktu_kematian")}</td>
             </tr>
             <tr>
               <td>Tempat Kematian</td>
               <td>:</td>
-              <td>{getValue("tempat kematian")}</td>
+              <td>{getValue("tempat_kematian")}</td>
             </tr>
             <tr>
               <td>Penyebab Kematian</td>
               <td>:</td>
-              <td>{getValue("penyebab kematian")}</td>
+              <td>{getValue("penyebab_kematian")}</td>
             </tr>
           </tbody>
         </table>
@@ -185,7 +185,7 @@ export default function SKKematian({ data }: { data: any }) {
           <br />
           <br />
           <br /> <br />
-          <u>{getValue("nama")}</u> <br />
+          <u>{getValue("nama_pelapor")}</u> <br />
         </div>
         <div style={{ textAlign: "center" }}>
           <br />

src/components/surat/SKPenghasilan.tsx

@@ -105,12 +105,12 @@ export default function SKPenghasilan({ data }: { data: any }) {
             <tr>
               <td>Jenis Kelamin</td>
               <td>:</td>
-              <td>{getValue("jenis kelamin")}</td>
+              <td>{getValue("jenis_kelamin")}</td>
             </tr>
             <tr>
               <td>Tempat / Tanggal Lahir</td>
               <td>:</td>
-              <td>{getValue("tempat tanggal lahir")}</td>
+              <td>{`${getValue("tempat_lahir")}, ${getValue("tanggal_lahir")}`}</td>
             </tr>
             <tr>
               <td>Pekerjaan</td>
@@ -135,10 +135,7 @@ export default function SKPenghasilan({ data }: { data: any }) {
             <tr>
               <td style={{ width: "160px" }}>Penghasilan</td>
               <td style={{ width: "10px" }}>:</td>
-              <td>
+              <td>Rp. {getValue("penghasilan")} per bulan</td>
-                Rp {getValue("penghasilan")} (
-                {getValue("penghasilan terbilang")}) per bulan
-              </td>
             </tr>
           </tbody>
         </table>
@@ -146,8 +143,8 @@ export default function SKPenghasilan({ data }: { data: any }) {
 
       {/* KEPERLUAN */}
       <div style={{ marginTop: "20px" }}>
-        Surat keterangan ini dibuat untuk keperluan:{" "}
+        Surat keterangan ini dibuat untuk keperluan: <b>{getValue("alasan")}</b>
-        <b>{getValue("alasan permohonan")}</b>.
+        .
       </div>
 
       <div style={{ marginTop: "20px" }}>

src/components/surat/SKTempatUsaha.tsx

@@ -66,12 +66,15 @@ export default function SKTempatUsaha({ data }: { data: any }) {
 
         {/* DATA WARGA */}
         <div>
-          <Row label="Nama Pemilik Usaha" value={getValue("nama")} />
+          <Row label="Nama Pemilik Usaha" value={getValue("nama_pemilik")} />
           <Row
             label="Tempat/Tanggal Lahir"
-            value={getValue("tempat tanggal lahir")}
+            value={`${getValue("tempat_lahir")}, ${getValue("tanggal_lahir")}`}
+          />
+          <Row
+            label="Alamat Pemilik Usaha"
+            value={getValue("alamat_pemilik")}
           />
-          <Row label="Alamat Pemilik Usaha" value={getValue("alamat")} />
           <Row label="Nomor KTP" value={getValue("nik")} />
         </div>
 
@@ -83,23 +86,17 @@ export default function SKTempatUsaha({ data }: { data: any }) {
         </div>
 
         <div>
-          <Row label="Nama Usaha" value={getValue("nama usaha")} />
+          <Row label="Nama Usaha" value={getValue("nama_usaha")} />
-          <Row label="Bidang Usaha" value={getValue("bidang usaha")} />
+          <Row label="Bidang Usaha" value={getValue("bidang_usaha")} />
-          <Row label="Alamat Usaha" value={getValue("alamat usaha")} />
+          <Row label="Alamat Usaha" value={getValue("alamat_usaha")} />
-          <Row
+          <Row label="Status Tempat Usaha" value={getValue("status_tempat")} />
-            label="Status Tempat Usaha"
+          <Row label="Luas Tempat Usaha" value={getValue("luas_usaha") + " m2"} />
-            value={getValue("status tempat usaha")}
+          <Row label="Jumlah Karyawan" value={getValue("jumlah_karyawan")} />
-          />
-          <Row
-            label="Luas Tempat Usaha"
-            value={getValue("luas tempat usaha")}
-          />
-          <Row label="Jumlah Karyawan" value={getValue("jumlah karyawan")} />
         </div>
 
         <p style={{ textAlign: "justify" }}>
           Surat keterangan ini dibuat untuk keperluan{" "}
-          <b>{getValue("alasan permohonan")}.</b>
+          <b>{getValue("tujuan")}.</b>
         </p>
 
         <p style={{ textAlign: "justify" }}>

src/components/surat/SKTidakMampu.tsx

@@ -66,13 +66,13 @@ export default function SKTidakMampu({ data }: { data: any }) {
 
         {/* DATA WARGA */}
         <div>
+          <Row label="NIK" value={getValue("nik")} />
           <Row label="Nama" value={getValue("nama")} />
           <Row
             label="Tempat Tgl Lahir"
-            value={getValue("tempat tanggal lahir")}
+            value={`${getValue("tempat_lahir")}, ${getValue("tanggal_lahir")}`}
           />
           <Row label="Alamat" value={getValue("alamat")} />
-          <Row label="NIK" value={getValue("nik")} />
         </div>
 
         <br />
@@ -80,7 +80,7 @@ export default function SKTidakMampu({ data }: { data: any }) {
         <p style={{ textAlign: "justify" }}>
           Orang tersebut benar-benar penduduk desa {data.setting.desaNama} dan
           termasuk keluarga tidak mampu. Surat keterangan ini dipergunakan untuk
-          <b>{getValue("alasan permohonan")}.</b>
+          <b>{getValue("alasan")}.</b>
         </p>
 
         <p style={{ textAlign: "justify" }}>

src/components/surat/SKUsaha.tsx

@@ -105,12 +105,12 @@ export default function SKUsaha({ data }: { data: any }) {
             <tr>
               <td>Jenis Kelamin</td>
               <td>:</td>
-              <td>{getValue("jenis kelamin")}</td>
+              <td>{getValue("jenis_kelamin")}</td>
             </tr>
             <tr>
               <td>Tempat / Tanggal Lahir</td>
               <td>:</td>
-              <td>{getValue("tempat tanggal lahir")}</td>
+              <td>{`${getValue("tempat_lahir")}, ${getValue("tanggal_lahir")}`}</td>
             </tr>
             <tr>
               <td>Warga Negara</td>
@@ -125,7 +125,7 @@ export default function SKUsaha({ data }: { data: any }) {
             <tr>
               <td>Status</td>
               <td>:</td>
-              <td>{getValue("status perkawinan")}</td>
+              <td>{getValue("status_perkawinan")}</td>
             </tr>
             <tr>
               <td>Pekerjaan</td>
@@ -173,12 +173,12 @@ export default function SKUsaha({ data }: { data: any }) {
             <tr>
               <td style={{ width: "160px" }}>Jenis Usaha</td>
               <td style={{ width: "10px" }}>:</td>
-              <td>{getValue("jenis usaha")}</td>
+              <td>{getValue("jenis_usaha")}</td>
             </tr>
             <tr>
               <td>Alamat Usaha</td>
               <td>:</td>
-              <td>{getValue("alamat usaha")}</td>
+              <td>{getValue("alamat_usaha")}</td>
             </tr>
           </tbody>
         </table>

src/components/surat/SKYatimPiatu.tsx

@@ -88,26 +88,28 @@ export default function SKYatim({ data }: { data: any }) {
 
       <table style={{ width: "100%", marginTop: "5px" }}>
         <tbody>
+          <tr>
+            <td>NIK</td>
+            <td>: {getValue("nik")}</td>
+          </tr>
           <tr>
             <td style={{ width: "180px" }}>Nama</td>
             <td>: {getValue("nama")}</td>
           </tr>
           <tr>
             <td>Tempat/Tanggal Lahir</td>
-            <td>: {getValue("tempat tanggal lahir")}</td>
+            <td>
+              : {`${getValue("tempat_lahir")}, ${getValue("tanggal_lahir")}`}
+            </td>
           </tr>
           <tr>
             <td>Jenis Kelamin</td>
-            <td>: {getValue("jenis kelamin")}</td>
+            <td>: {getValue("jenis_kelamin")}</td>
           </tr>
           <tr>
             <td>Alamat</td>
             <td>: {getValue("alamat")}</td>
           </tr>
-          <tr>
-            <td>NIK</td>
-            <td>: {getValue("nik")}</td>
-          </tr>
           <tr>
             <td>Pekerjaan</td>
             <td>: {getValue("pekerjaan")}</td>
@@ -133,11 +135,11 @@ export default function SKYatim({ data }: { data: any }) {
         <tbody>
           <tr>
             <td style={{ width: "180px" }}>Nama Ayah</td>
-            <td>: {getValue("nama ayah")}</td>
+            <td>: {getValue("nama_ayah")}</td>
           </tr>
           <tr>
             <td>Status</td>
-            <td>: {getValue("status ayah")}</td>
+            <td>: {getValue("status_ayah")}</td>
           </tr>
         </tbody>
       </table>
@@ -151,11 +153,11 @@ export default function SKYatim({ data }: { data: any }) {
         <tbody>
           <tr>
             <td style={{ width: "180px" }}>Nama Ibu</td>
-            <td>: {getValue("nama ibu")}</td>
+            <td>: {getValue("nama_ibu")}</td>
           </tr>
           <tr>
             <td>Status</td>
-            <td>: {getValue("status ibu")}</td>
+            <td>: {getValue("status_ibu")}</td>
           </tr>
         </tbody>
       </table>

src/index.tsx

@@ -15,6 +15,7 @@ import LayananRoute from "./server/routes/layanan_route";
 import { MCPRoute } from "./server/routes/mcp_route";
 import PelayananRoute from "./server/routes/pelayanan_surat_route";
 import PengaduanRoute from "./server/routes/pengaduan_route";
+import SendWaRoute from "./server/routes/send_wa_route";
 import SuratRoute from "./server/routes/surat_route";
 import TestPengaduanRoute from "./server/routes/test_pengaduan";
 import UserRoute from "./server/routes/user_route";
@@ -45,7 +46,8 @@ const Api = new Elysia({
   .use(CredentialRoute)
   .use(UserRoute)
   .use(LayananRoute)
-  .use(AduanRoute);
+  .use(AduanRoute)
+  .use(SendWaRoute);
 
 const app = new Elysia()
   .use(Api)

src/lib/categoryPelayananSurat.ts

@@ -1,3 +1,5 @@
+import { enumAgama, enumJenisKelamin, enumStatusHidup, enumStatusPerkawinan, enumStatusTempatUsaha } from "./valueEnum";
+
 export const categoryPelayananSurat = [
   {
     id: "skbedabiodata",
@@ -6,366 +8,377 @@ export const categoryPelayananSurat = [
       {
         key: "pengantar_kelian",
         name: "Pengantar Kelian",
-        desc: "Surat Pengantar Kelian Banjar Dinas di Wilayah Masing-masing"
+        desc: "Surat Pengantar Kelian Banjar Dinas di Wilayah Masing-masing",
+        required: true, satuan: null
       },
       {
         key: "ktp_kk",
         name: "KTP / KK",
-        desc: "Fotokopi KTP atau Kartu Keluarga"
+        desc: "Fotokopi KTP atau Kartu Keluarga",
+        required: true, satuan: null
       },
       {
         key: "dokumen_beda",
         name: "Dokumen Pendukung",
-        desc: "Fotokopi dokumen yang terdapat perbedaan biodata (ijazah, sertifikat, dll)"
+        desc: "Fotokopi dokumen yang terdapat perbedaan biodata (ijazah, sertifikat, dll)",
+        required: true, satuan: null
       }
     ],
     dataText: [],
     dataPelengkap: [
-      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan" },
+      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan", type: "number", required: true, satuan: null },
-      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP" },
+      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP", type: "text", required: true, satuan: null },
-      { key: "ttl", name: "Tempat & Tanggal Lahir", desc: "Tempat dan tanggal lahir pemohon" },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir pemohon", type: "text", required: true, satuan: null },
-      { key: "jenis_kelamin", name: "Jenis Kelamin", desc: "Jenis kelamin pemohon" },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir pemohon", type: "date", required: true, satuan: null },
-      { key: "alamat", name: "Alamat", desc: "Alamat lengkap tempat tinggal" },
+      {
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon" },
+        key: "jenis_kelamin",
-      { key: "dokumen", name: "Nama Dokumen", desc: "Jenis dokumen yang mengalami perbedaan biodata" },
+        name: "Jenis Kelamin",
-      { key: "dokumen_a", name: "Data pada Dokumen A", desc: "Data biodata yang tertulis pada dokumen pertama" },
+        desc: "Jenis kelamin pemohon",
-      { key: "dokumen_b", name: "Data pada Dokumen B", desc: "Data biodata yang tertulis pada dokumen kedua" }
+        type: "enum",
+        options: enumJenisKelamin,
+        required: true, satuan: null
+      },
+      { key: "alamat", name: "Alamat", desc: "Alamat lengkap tempat tinggal", type: "text", required: true, satuan: null },
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon", type: "text", required: true, satuan: null },
+      {
+        key: "dokumen",
+        name: "Nama Dokumen",
+        desc: "Jenis dokumen yang mengalami perbedaan biodata",
+        type: "text",
+        required: true, satuan: null
+      },
+      {
+        key: "data_dokumen",
+        name: "Data Dokumen",
+        desc: "Data dokumen yg berbeda",
+        type: "text",
+        required: true, satuan: null
+      },
+      { key: "dokumen_a", name: "Data pada Dokumen A", desc: "Data biodata pada dokumen pertama", type: "text", required: true, satuan: null },
+      { key: "dokumen_b", name: "Data pada Dokumen B", desc: "Data biodata pada dokumen kedua", type: "text", required: true, satuan: null }
     ]
   },
   {
     id: "skbelumkawin",
     name: "Surat Keterangan Belum Kawin",
     syaratDokumen: [
-      {
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
-        key: "pengantar_kelian",
+      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP atau Kartu Keluarga", required: true, satuan: null },
-        name: "Pengantar Kelian",
+      { key: "akta_cerai", name: "Akta Cerai", desc: "Fotokopi akta cerai (jika berstatus janda/duda)", required: false, satuan: null }
-        desc: "Surat Pengantar Kelian Banjar Dinas"
-      },
-      {
-        key: "ktp_kk",
-        name: "KTP / KK",
-        desc: "Fotokopi KTP atau Kartu Keluarga"
-      },
-      {
-        key: "akta_cerai",
-        name: "Akta Cerai",
-        desc: "Fotokopi akta cerai (jika berstatus janda/duda)"
-      }
     ],
     dataText: [],
     dataPelengkap: [
-      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan" },
+      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan", type: "number", required: true, satuan: null },
-      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP" },
+      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP", type: "text", required: true, satuan: null },
-      { key: "ttl", name: "Tempat & Tanggal Lahir", desc: "Tempat dan tanggal lahir" },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir pemohon", type: "text", required: true, satuan: null },
-      { key: "jenis_kelamin", name: "Jenis Kelamin", desc: "Jenis kelamin pemohon" },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir pemohon", type: "date", required: true, satuan: null },
-      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal" },
+      {
-      { key: "agama", name: "Agama", desc: "Agama pemohon" },
+        key: "jenis_kelamin",
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon" }
+        name: "Jenis Kelamin",
+        desc: "Jenis kelamin pemohon",
+        type: "enum",
+        options: enumJenisKelamin,
+        required: true, satuan: null
+      },
+      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal", type: "text", required: true, satuan: null },
+      {
+        key: "agama",
+        name: "Agama",
+        desc: "Agama pemohon",
+        type: "enum",
+        options: enumAgama,
+        required: true, satuan: null
+      },
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon", type: "text", required: true, satuan: null }
     ]
   },
+
   {
     id: "skdomisiliorganisasi",
     name: "Surat Keterangan Domisili Organisasi",
     syaratDokumen: [
-      {
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
-        key: "pengantar_kelian",
+      { key: "skt_organisasi", name: "SKT Organisasi", desc: "Fotokopi SKT Organisasi", required: true, satuan: null },
-        name: "Pengantar Kelian",
+      { key: "susunan_pengurus", name: "Susunan Pengurus", desc: "Susunan pengurus organisasi", required: true, satuan: null }
-        desc: "Surat Pengantar Kelian Banjar Dinas"
-      },
-      {
-        key: "skt_organisasi",
-        name: "SKT Organisasi",
-        desc: "Fotokopi SKT Organisasi atau pengukuhan kelompok"
-      },
-      {
-        key: "susunan_pengurus",
-        name: "Susunan Pengurus",
-        desc: "Susunan pengurus lengkap dengan kop organisasi"
-      }
     ],
     dataText: [],
     dataPelengkap: [
-      { key: "nama_organisasi", name: "Nama Organisasi", desc: "Nama resmi organisasi" },
+      { key: "nama_organisasi", name: "Nama Organisasi", desc: "Nama resmi organisasi", type: "text", required: true, satuan: null },
-      { key: "jenis_organisasi", name: "Jenis Organisasi", desc: "Jenis atau bentuk organisasi" },
+      { key: "jenis_organisasi", name: "Jenis Organisasi", desc: "Jenis organisasi", type: "text", required: true, satuan: null },
-      { key: "alamat_organisasi", name: "Alamat Organisasi", desc: "Alamat sekretariat organisasi" },
+      { key: "alamat_organisasi", name: "Alamat Organisasi", desc: "Alamat sekretariat", type: "text", required: true, satuan: null },
-      { key: "no_telepon", name: "Nomor Telepon", desc: "Nomor telepon organisasi" },
+      { key: "no_telepon", name: "Nomor Telepon", desc: "Nomor telepon organisasi", type: "text", required: true, satuan: null },
-      { key: "nama_pimpinan", name: "Nama Pimpinan", desc: "Nama pimpinan organisasi" },
+      { key: "nama_pimpinan", name: "Nama Pimpinan", desc: "Nama pimpinan", type: "text", required: true, satuan: null },
-      { key: "keperluan", name: "Keperluan", desc: "Keperluan pembuatan surat" }
+      { key: "keperluan", name: "Keperluan", desc: "Keperluan pembuatan surat", type: "text", required: true, satuan: null }
     ]
   },
   {
     id: "skkelahiran",
     name: "Surat Keterangan Kelahiran",
     syaratDokumen: [
-      {
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
-        key: "pengantar_kelian",
+      { key: "surat_lahir", name: "Surat Keterangan Lahir", desc: "Surat keterangan lahir dari bidan/dokter (jika ada)", required: false, satuan: null }
-        name: "Pengantar Kelian",
-        desc: "Surat Pengantar Kelian Banjar Dinas"
-      },
-      {
-        key: "surat_lahir",
-        name: "Surat Keterangan Lahir",
-        desc: "Surat keterangan lahir dari bidan/dokter (jika ada)"
-      }
     ],
     dataText: [],
     dataPelengkap: [
-      { key: "nama_ayah", name: "Nama Ayah", desc: "Nama lengkap ayah" },
+      { key: "nama_anak", name: "Nama Anak", desc: "Nama bayi/anak", type: "text", required: true, satuan: null },
-      { key: "nama_ibu", name: "Nama Ibu", desc: "Nama lengkap ibu" },
+      { key: "tanggal_lahir_anak", name: "Tanggal Lahir Anak", desc: "Tanggal lahir anak", type: "date", required: true, satuan: null },
-      { key: "nama_anak", name: "Nama Anak", desc: "Nama bayi/anak" },
+      { key: "pukul_lahir", name: "Pukul Lahir", desc: "Waktu kelahiran", type: "text", required: true, satuan: null },
-      { key: "tanggal_lahir_anak", name: "Tanggal Lahir Anak", desc: "Tanggal lahir anak" },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat kelahiran", type: "text", required: true, satuan: null },
-      { key: "pukul_lahir", name: "Pukul Lahir", desc: "Waktu kelahiran anak" },
+      {
-      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat kelahiran anak" },
+        key: "jenis_kelamin",
-      { key: "jenis_kelamin", name: "Jenis Kelamin Anak", desc: "Jenis kelamin anak" },
+        name: "Jenis Kelamin Anak",
-      { key: "anak_ke", name: "Anak Ke-", desc: "Urutan kelahiran anak" },
+        desc: "Jenis kelamin anak",
-      { key: "nik_ibu", name: "NIK Ibu", desc: "NIK ibu kandung" },
+        type: "enum",
-      { key: "nik_ayah", name: "NIK Ayah", desc: "NIK ayah kandung" },
+        options: enumJenisKelamin,
-      { key: "nama_pelapor", name: "Nama Pelapor", desc: "Nama pihak yang melaporkan" },
+        required: true, satuan: null
-      { key: "hubungan_pelapor", name: "Hubungan Pelapor", desc: "Hubungan pelapor dengan anak" },
+      },
-      { key: "alamat_pelapor", name: "Alamat Pelapor", desc: "Alamat pelapor" }
+      { key: "anak_ke", name: "Anak Ke-", desc: "Urutan kelahiran", type: "number", required: true, satuan: null },
+      { key: "nik_ibu", name: "NIK Ibu", desc: "NIK ibu kandung", type: "number", required: true, satuan: null },
+      { key: "nama_ibu", name: "Nama Ibu", desc: "Nama ibu kandung", type: "text", required: true, satuan: null },
+      { key: "tempat_lahir_ibu", name: "Tempat Lahir Ibu", desc: "Tempat lahir ibu", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir_ibu", name: "Tanggal Lahir Ibu", desc: "Tanggal lahir ibu", type: "date", required: true, satuan: null },
+      { key: "pekerjaan_ibu", name: "Pekerjaan Ibu", desc: "Pekerjaan ibu", type: "text", required: true, satuan: null },
+      { key: "alamat_ibu", name: "Alamat Ibu", desc: "Alamat ibu", type: "text", required: true, satuan: null },
+      { key: "nama_ayah", name: "Nama Ayah", desc: "Nama ayah kandung", type: "text", required: true, satuan: null },
+      { key: "nik_ayah", name: "NIK Ayah", desc: "NIK ayah kandung", type: "number", required: true, satuan: null },
+      { key: "tempat_lahir_ayah", name: "Tempat Lahir Ayah", desc: "Tempat lahir ayah", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir_ayah", name: "Tanggal Lahir Ayah", desc: "Tanggal lahir ayah", type: "date", required: true, satuan: null },
+      { key: "pekerjaan_ayah", name: "Pekerjaan Ayah", desc: "Pekerjaan ayah", type: "text", required: true, satuan: null },
+      { key: "alamat_ayah", name: "Alamat Ayah", desc: "Alamat ayah", type: "text", required: true, satuan: null },
+      { key: "nama_pelapor", name: "Nama Pelapor", desc: "Nama pelapor", type: "text", required: true, satuan: null },
+      { key: "hubungan_pelapor", name: "Hubungan Pelapor", desc: "Hubungan dengan anak", type: "text", required: true, satuan: null },
+      { key: "alamat_pelapor", name: "Alamat Pelapor", desc: "Alamat pelapor", type: "text", required: true, satuan: null }
     ]
   },
   {
     id: "skkelakuanbaik",
     name: "Surat Keterangan Kelakuan Baik (Pengantar SKCK)",
     syaratDokumen: [
-      {
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
-        key: "pengantar_kelian",
+      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP atau KK", required: true, satuan: null }
-        name: "Pengantar Kelian",
-        desc: "Surat Pengantar Kelian Banjar Dinas"
-      },
-      {
-        key: "ktp_kk",
-        name: "KTP / KK",
-        desc: "Fotokopi KTP atau Kartu Keluarga"
-      }
     ],
     dataText: [],
     dataPelengkap: [
-      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan" },
+      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan", type: "number", required: true, satuan: null },
-      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP" },
+      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP", type: "text", required: true, satuan: null },
-      { key: "ttl", name: "Tempat & Tanggal Lahir", desc: "Tempat dan tanggal lahir" },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
-      { key: "jenis_kelamin", name: "Jenis Kelamin", desc: "Jenis kelamin pemohon" },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
-      { key: "agama", name: "Agama", desc: "Agama pemohon" },
+      {
-      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal" },
+        key: "jenis_kelamin",
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon" },
+        name: "Jenis Kelamin",
-      { key: "polsek", name: "Polsek Tujuan", desc: "Polsek tujuan pembuatan SKCK" }
+        desc: "Jenis kelamin",
+        type: "enum",
+        options: enumJenisKelamin,
+        required: true, satuan: null
+      },
+      {
+        key: "agama",
+        name: "Agama",
+        desc: "Agama",
+        type: "enum",
+        options: enumAgama,
+        required: true, satuan: null
+      },
+      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal", type: "text", required: true, satuan: null },
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan", type: "text", required: true, satuan: null },
+      { key: "polsek", name: "Polsek Tujuan", desc: "Polsek tujuan", type: "text", required: true, satuan: null }
     ]
   },
   {
     id: "skkematian",
     name: "Surat Keterangan Kematian",
     syaratDokumen: [
-      {
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
-        key: "pengantar_kelian",
+      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP atau KK", required: true, satuan: null },
-        name: "Pengantar Kelian",
+      { key: "surat_kematian", name: "Surat Keterangan Kematian", desc: "Surat keterangan kematian dari rumah sakit/dokter (jika ada)", required: false, satuan: null }
-        desc: "Surat Pengantar Kelian Banjar Dinas"
-      },
-      {
-        key: "ktp_kk",
-        name: "KTP / KK",
-        desc: "Fotokopi KTP atau Kartu Keluarga"
-      },
-      {
-        key: "surat_kematian",
-        name: "Surat Keterangan Kematian",
-        desc: "Surat keterangan kematian dari rumah sakit/dokter (jika ada)"
-      }
     ],
     dataText: [],
     dataPelengkap: [
-      { key: "nik_pelapor", name: "NIK Pelapor", desc: "Nomor Induk Kependudukan pelapor" },
+      { key: "nik_pelapor", name: "NIK Pelapor", desc: "NIK pelapor", type: "number", required: true, satuan: null },
-      { key: "nama_pelapor", name: "Nama Pelapor", desc: "Nama lengkap pelapor" },
+      { key: "nama_pelapor", name: "Nama Pelapor", desc: "Nama pelapor", type: "text", required: true, satuan: null },
-      { key: "pekerjaan_pelapor", name: "Pekerjaan Pelapor", desc: "Pekerjaan pelapor" },
+      { key: "pekerjaan_pelapor", name: "Pekerjaan Pelapor", desc: "Pekerjaan pelapor", type: "text", required: true, satuan: null },
-      { key: "alamat_pelapor", name: "Alamat Pelapor", desc: "Alamat tempat tinggal pelapor" },
+      { key: "alamat_pelapor", name: "Alamat Pelapor", desc: "Alamat pelapor", type: "text", required: true, satuan: null },
-      { key: "hubungan_pelapor", name: "Hubungan dengan Almarhum", desc: "Hubungan pelapor dengan almarhum" },
+      { key: "hubungan_pelapor", name: "Hubungan Pelapor", desc: "Hubungan dengan almarhum", type: "text", required: true, satuan: null },
-      { key: "nama_almarhum", name: "Nama Almarhum", desc: "Nama lengkap almarhum" },
+      { key: "nama_almarhum", name: "Nama Almarhum", desc: "Nama almarhum", type: "text", required: true, satuan: null },
-      { key: "nik_almarhum", name: "NIK Almarhum", desc: "Nomor Induk Kependudukan almarhum" },
+      { key: "nik_almarhum", name: "NIK Almarhum", desc: "NIK almarhum", type: "number", required: true, satuan: null },
-      { key: "ttl_almarhum", name: "Tempat & Tanggal Lahir Almarhum", desc: "Tempat dan tanggal lahir almarhum" },
+      { key: "tempat_lahir_almarhum", name: "Tempat Lahir", desc: "Tempat lahir almarhum", type: "text", required: true, satuan: null },
-      { key: "alamat_almarhum", name: "Alamat Almarhum", desc: "Alamat terakhir almarhum" },
+      { key: "tanggal_lahir_almarhum", name: "Tanggal Lahir", desc: "Tanggal lahir almarhum", type: "date", required: true, satuan: null },
-      { key: "agama_almarhum", name: "Agama Almarhum", desc: "Agama almarhum" },
+      { key: "alamat_almarhum", name: "Alamat", desc: "Alamat terakhir", type: "text", required: true, satuan: null },
-      { key: "tanggal_kematian", name: "Tanggal Kematian", desc: "Tanggal meninggal dunia" },
+      {
-      { key: "waktu_kematian", name: "Waktu Kematian", desc: "Waktu meninggal dunia" },
+        key: "agama_almarhum",
-      { key: "tempat_kematian", name: "Tempat Kematian", desc: "Tempat meninggal dunia" },
+        name: "Agama Almarhum",
-      { key: "penyebab_kematian", name: "Penyebab Kematian", desc: "Penyebab meninggal dunia" }
+        desc: "Agama almarhum",
+        type: "enum",
+        options: enumAgama,
+        required: true, satuan: null
+      },
+      { key: "tanggal_kematian", name: "Tanggal Kematian", desc: "Tanggal meninggal dunia", type: "date", required: true, satuan: null },
+      { key: "waktu_kematian", name: "Waktu Kematian", desc: "Waktu meninggal dunia", type: "text", required: true, satuan: null },
+      { key: "tempat_kematian", name: "Tempat Kematian", desc: "Tempat meninggal dunia", type: "text", required: true, satuan: null },
+      { key: "penyebab_kematian", name: "Penyebab Kematian", desc: "Penyebab meninggal dunia", type: "text", required: true, satuan: null }
     ]
   },
   {
     id: "skpenghasilan",
     name: "Surat Keterangan Penghasilan",
     syaratDokumen: [
-      {
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
-        key: "pengantar_kelian",
+      { key: "ktp_ortu_kk", name: "KTP Orang Tua / KK", desc: "Fotokopi KTP orang tua/KK", required: true, satuan: null },
-        name: "Pengantar Kelian",
+      { key: "surat_pernyataan", name: "Surat Pernyataan Penghasilan", desc: "Surat pernyataan penghasilan bermaterai", required: true, satuan: null }
-        desc: "Surat Pengantar Kelian Banjar Dinas"
-      },
-      {
-        key: "ktp_ortu_kk",
-        name: "KTP Orang Tua / KK",
-        desc: "Fotokopi KTP orang tua atau Kartu Keluarga"
-      },
-      {
-        key: "surat_pernyataan",
-        name: "Surat Pernyataan",
-        desc: "Surat pernyataan penghasilan bermaterai"
-      }
     ],
     dataText: [],
     dataPelengkap: [
-      { key: "nama", name: "Nama Lengkap", desc: "Nama pemohon" },
+      { key: "nama", name: "Nama Lengkap", desc: "Nama pemohon", type: "text", required: true, satuan: null },
-      { key: "ttl", name: "Tempat & Tanggal Lahir", desc: "Tempat dan tanggal lahir" },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
-      { key: "jenis_kelamin", name: "Jenis Kelamin", desc: "Jenis kelamin pemohon" },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
-      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal" },
+      {
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon/orang tua" },
+        key: "jenis_kelamin",
-      { key: "penghasilan", name: "Penghasilan", desc: "Jumlah penghasilan per bulan" },
+        name: "Jenis Kelamin",
-      { key: "alasan", name: "Alasan Permohonan", desc: "Alasan pengajuan surat penghasilan" }
+        desc: "Jenis kelamin",
+        type: "enum",
+        options: enumJenisKelamin,
+        required: true, satuan: null
+      },
+      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal", type: "text", required: true, satuan: null },
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon", type: "text", required: true, satuan: null },
+      { key: "penghasilan", name: "Penghasilan", desc: "Jumlah penghasilan per bulan", type: "number", required: true, satuan: "/Bulan" },
+      { key: "alasan", name: "Alasan Permohonan", desc: "Alasan pengajuan surat penghasilan", type: "text", required: true, satuan: null }
     ]
   },
   {
     id: "sktempatusaha",
     name: "Surat Keterangan Tempat Usaha",
     syaratDokumen: [
-      {
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
-        key: "pengantar_kelian",
+      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP/KK", required: true, satuan: null },
-        name: "Pengantar Kelian",
+      { key: "foto_lokasi", name: "Foto Lokasi Usaha", desc: "Foto lokasi usaha", required: true, satuan: null },
-        desc: "Surat Pengantar Kelian Banjar Dinas"
+      { key: "dokumen_lahan", name: "Dokumen Lahan", desc: "SPPT/Sertifikat/surat sewa tempat usaha", required: true, satuan: null }
-      },
-      {
-        key: "ktp_kk",
-        name: "KTP / KK",
-        desc: "Fotokopi KTP atau Kartu Keluarga"
-      },
-      {
-        key: "foto_lokasi",
-        name: "Foto Lokasi Usaha",
-        desc: "Foto lokasi usaha dicetak dan distempel oleh Kelian"
-      },
-      {
-        key: "dokumen_lahan",
-        name: "Dokumen Lahan",
-        desc: "SPPT, Sertifikat, atau surat sewa tempat usaha"
-      }
     ],
     dataText: [],
     dataPelengkap: [
-      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan" },
+      { key: "nik", name: "NIK", desc: "NIK pemilik", type: "number", required: true, satuan: null },
-      { key: "nama_pemilik", name: "Nama Pemilik", desc: "Nama pemilik usaha" },
+      { key: "nama_pemilik", name: "Nama Pemilik", desc: "Nama pemilik usaha", type: "text", required: true, satuan: null },
-      { key: "ttl", name: "Tempat & Tanggal Lahir", desc: "Tempat dan tanggal lahir" },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
-      { key: "alamat_pemilik", name: "Alamat Pemilik", desc: "Alamat pemilik usaha" },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
-      { key: "nama_usaha", name: "Nama Usaha", desc: "Nama usaha" },
+      { key: "alamat_pemilik", name: "Alamat Pemilik", desc: "Alamat pemilik", type: "text", required: true, satuan: null },
-      { key: "bidang_usaha", name: "Bidang Usaha", desc: "Bidang atau jenis usaha" },
+      { key: "nama_usaha", name: "Nama Usaha", desc: "Nama usaha", type: "text", required: true, satuan: null },
-      { key: "alamat_usaha", name: "Alamat Usaha", desc: "Alamat lokasi usaha" },
+      { key: "bidang_usaha", name: "Bidang Usaha", desc: "Bidang usaha", type: "text", required: true, satuan: null },
-      { key: "status_tempat", name: "Status Tempat Usaha", desc: "Status kepemilikan tempat usaha" },
+      { key: "alamat_usaha", name: "Alamat Usaha", desc: "Alamat usaha", type: "text", required: true, satuan: null },
-      { key: "luas_usaha", name: "Luas Tempat Usaha", desc: "Luas tempat usaha (m²)" },
+      {
-      { key: "jumlah_karyawan", name: "Jumlah Karyawan", desc: "Jumlah tenaga kerja" },
+        key: "status_tempat",
-      { key: "tujuan", name: "Tujuan Pembuatan Surat", desc: "Tujuan pembuatan surat keterangan" }
+        name: "Status Tempat Usaha",
+        desc: "Status kepemilikan tempat usaha",
+        type: "enum",
+        options: enumStatusTempatUsaha,
+        required: true, satuan: null
+      },
+      { key: "luas_usaha", name: "Luas Tempat Usaha", desc: "Luas tempat usaha (m²)", type: "number", required: true, satuan: "m²" },
+      { key: "jumlah_karyawan", name: "Jumlah Karyawan", desc: "Jumlah karyawan", type: "number", required: true, satuan: null },
+      { key: "tujuan", name: "Tujuan Pembuatan Surat", desc: "Tujuan pembuatan surat keterangan", type: "text", required: true, satuan: null }
     ]
   },
   {
     id: "sktidakmampu",
     name: "Surat Keterangan Tidak Mampu",
     syaratDokumen: [
-      {
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
-        key: "pengantar_kelian",
+      { key: "ktp_kia_kk", name: "KTP / KIA / KK", desc: "Fotokopi KTP/KIA/KK", required: true, satuan: null }
-        name: "Pengantar Kelian",
-        desc: "Surat Pengantar Kelian Banjar Dinas"
-      },
-      {
-        key: "ktp_kia_kk",
-        name: "KTP / KIA / KK",
-        desc: "Fotokopi KTP, KIA, atau Kartu Keluarga"
-      }
     ],
     dataText: [],
     dataPelengkap: [
-      {
+      { key: "nik", name: "NIK", desc: "NIK pemohon", type: "number", required: true, satuan: null },
-        key: "nik",
+      { key: "nama Lengkap", name: "Nama", desc: "Nama pemohon", type: "text", required: true, satuan: null },
-        name: "NIK",
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
-        desc: "Nomor Induk Kependudukan pemohon"
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
-      },
+      { key: "alamat", name: "Alamat", desc: "Alamat pemohon", type: "text", required: true, satuan: null },
-      {
+      { key: "alasan", name: "Alasan Permohonan", desc: "Alasan permohonan", type: "text", required: true, satuan: null }
-        key: "nama",
-        name: "Nama Lengkap",
-        desc: "Nama lengkap pemohon"
-      },
-      {
-        key: "ttl",
-        name: "Tempat & Tanggal Lahir",
-        desc: "Tempat dan tanggal lahir pemohon"
-      },
-      {
-        key: "alamat",
-        name: "Alamat",
-        desc: "Alamat tempat tinggal pemohon"
-      },
-      {
-        key: "alasan",
-        name: "Alasan Permohonan",
-        desc: "Alasan pengajuan Surat Keterangan Tidak Mampu"
-      }
     ]
   },
   {
     id: "skusaha",
     name: "Surat Keterangan Usaha",
     syaratDokumen: [
-      {
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
-        key: "pengantar_kelian",
+      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP/KK", required: true, satuan: null },
-        name: "Pengantar Kelian",
+      { key: "foto_lokasi", name: "Foto Lokasi Usaha", desc: "Foto lokasi usaha", required: true, satuan: null }
-        desc: "Surat Pengantar Kelian Banjar Dinas"
-      },
-      {
-        key: "ktp_kk",
-        name: "KTP / KK",
-        desc: "Fotokopi KTP atau Kartu Keluarga"
-      },
-      {
-        key: "foto_lokasi",
-        name: "Foto Lokasi Usaha",
-        desc: "Foto lokasi usaha dicetak dan distempel oleh Kelian"
-      }
     ],
     dataText: [],
     dataPelengkap: [
-      { key: "nama", name: "Nama Lengkap", desc: "Nama pemilik usaha" },
+      { key: "nama", name: "Nama Lengkap", desc: "Nama pemilik usaha", type: "text", required: true, satuan: null },
-      { key: "jenis_kelamin", name: "Jenis Kelamin", desc: "Jenis kelamin pemilik usaha" },
+      {
-      { key: "ttl", name: "Tempat & Tanggal Lahir", desc: "Tempat dan tanggal lahir" },
+        key: "jenis_kelamin",
-      { key: "negara", name: "Kewarganegaraan", desc: "Kewarganegaraan pemilik usaha" },
+        name: "Jenis Kelamin",
-      { key: "agama", name: "Agama", desc: "Agama pemilik usaha" },
+        desc: "Jenis kelamin pemilik usaha",
-      { key: "status_perkawinan", name: "Status Perkawinan", desc: "Status perkawinan" },
+        type: "enum",
-      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal" },
+        options: enumJenisKelamin,
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemilik usaha" },
+        required: true, satuan: null
-      { key: "jenis_usaha", name: "Jenis Usaha", desc: "Jenis usaha yang dijalankan" },
+      },
-      { key: "alamat_usaha", name: "Alamat Usaha", desc: "Alamat lokasi usaha" }
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
+      { key: "negara", name: "Kewarganegaraan", desc: "Kewarganegaraan", type: "text", required: true, satuan: null },
+      {
+        key: "agama",
+        name: "Agama",
+        desc: "Agama",
+        type: "enum",
+        options: enumAgama,
+        required: true, satuan: null
+      },
+      {
+        key: "status_perkawinan",
+        name: "Status Perkawinan",
+        desc: "Status perkawinan",
+        type: "enum",
+        options: enumStatusPerkawinan,
+        required: true, satuan: null
+      },
+      { key: "alamat", name: "Alamat", desc: "Alamat", type: "text", required: true, satuan: null },
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan", type: "text", required: true, satuan: null },
+      { key: "jenis_usaha", name: "Jenis Usaha", desc: "Jenis usaha", type: "text", required: true, satuan: null },
+      { key: "alamat_usaha", name: "Alamat Usaha", desc: "Alamat usaha", type: "text", required: true, satuan: null }
     ]
   },
   {
     id: "skyatimpiatu",
     name: "Surat Keterangan Yatim / Piatu / Yatim Piatu",
     syaratDokumen: [
-      {
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
-        key: "pengantar_kelian",
+      { key: "ktp_kia_kk", name: "KTP / KIA / KK", desc: "Fotokopi KTP/KIA/KK", required: true, satuan: null }
-        name: "Pengantar Kelian",
-        desc: "Surat Pengantar Kelian Banjar Dinas"
-      },
-      {
-        key: "ktp_kia_kk",
-        name: "KTP / KIA / KK",
-        desc: "Fotokopi KTP, KIA, atau Kartu Keluarga"
-      }
     ],
     dataText: [],
     dataPelengkap: [
-      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan" },
+      { key: "nik", name: "NIK", desc: "NIK anak", type: "number", required: true, satuan: null },
-      { key: "nama", name: "Nama Lengkap", desc: "Nama anak" },
+      { key: "nama", name: "Nama", desc: "Nama anak", type: "text", required: true, satuan: null },
-      { key: "ttl", name: "Tempat & Tanggal Lahir", desc: "Tempat dan tanggal lahir anak" },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
-      { key: "jenis_kelamin", name: "Jenis Kelamin", desc: "Jenis kelamin anak" },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
-      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal" },
+      {
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan (jika ada)" },
+        key: "jenis_kelamin",
-      { key: "nama_ayah", name: "Nama Ayah", desc: "Nama ayah kandung" },
+        name: "Jenis Kelamin",
-      { key: "status_ayah", name: "Status Ayah", desc: "Status ayah (hidup / meninggal)" },
+        desc: "Jenis kelamin anak",
-      { key: "nama_ibu", name: "Nama Ibu", desc: "Nama ibu kandung" },
+        type: "enum",
-      { key: "status_ibu", name: "Status Ibu", desc: "Status ibu (hidup / meninggal)" }
+        options: enumJenisKelamin,
+        required: true, satuan: null
+      },
+      { key: "alamat", name: "Alamat", desc: "Alamat", type: "text", required: true, satuan: null },
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan (jika ada)", type: "text", required: false, satuan: null },
+      { key: "nama_ayah", name: "Nama Ayah", desc: "Nama ayah", type: "text", required: true, satuan: null },
+      {
+        key: "status_ayah",
+        name: "Status Ayah",
+        desc: "Status ayah",
+        type: "enum",
+        options: enumStatusHidup,
+        required: true, satuan: null
+      },
+      { key: "nama_ibu", name: "Nama Ibu", desc: "Nama ibu", type: "text", required: true, satuan: null },
+      {
+        key: "status_ibu",
+        name: "Status Ibu",
+        desc: "Status ibu",
+        type: "enum",
+        options: enumStatusHidup,
+        required: true, satuan: null
+      }
     ]
   }
 ];

src/lib/listPermission.json

@@ -246,16 +246,6 @@
               "label": "View Detail",
               "default": true
             },
-            {
-              "key": "setting.kategori_pelayanan.tambah",
-              "label": "Tambah",
-              "default": true
-            },
-            {
-              "key": "setting.kategori_pelayanan.edit",
-              "label": "Edit",
-              "default": true
-            },
             {
               "key": "setting.kategori_pelayanan.delete",
               "label": "Delete",

src/lib/valueEnum.ts

@@ -0,0 +1,31 @@
+export const enumJenisKelamin = [
+   { label: "Laki-laki", value: "Laki-laki" },
+   { label: "Perempuan", value: "Perempuan" }
+];
+
+export const enumAgama = [
+   { label: "Islam", value: "Islam" },
+   { label: "Kristen", value: "Kristen" },
+   { label: "Katolik", value: "Katolik" },
+   { label: "Hindu", value: "Hindu" },
+   { label: "Buddha", value: "Buddha" },
+   { label: "Konghucu", value: "Konghucu" }
+];
+
+export const enumStatusHidup = [
+   { label: "Hidup", value: "Hidup" },
+   { label: "Meninggal", value: "Meninggal" }
+];
+
+export const enumStatusPerkawinan = [
+   { label: "Belum Kawin", value: "Belum Kawin" },
+   { label: "Kawin", value: "Kawin" },
+   { label: "Cerai Hidup", value: "Cerai Hidup" },
+   { label: "Cerai Mati", value: "Cerai Mati" }
+];
+
+export const enumStatusTempatUsaha = [
+   { label: "Milik Sendiri", value: "Milik Sendiri" },
+   { label: "Sewa", value: "Sewa" },
+   { label: "Pinjam", value: "Pinjam" }
+];

src/pages/Login.tsx

@@ -1,12 +1,12 @@
 import clientRoutes from "@/clientRoutes";
 import {
   Button,
-  Container,
+  Center,
-  Group,
+  Paper,
   PasswordInput,
   Stack,
   Text,
-  TextInput,
+  TextInput
 } from "@mantine/core";
 import { useState } from "react";
 import apiFetch from "../lib/apiFetch";
@@ -73,25 +73,73 @@ export default function Login() {
   };
 
   return (
-    <Container>
+    <Center
-      <Stack>
+      h="100vh"
-        <Text>Login</Text>
+      style={{
-        <TextInput
+        background:
-          placeholder="Email"
+          "radial-gradient(circle at top, #1f2d2b 0%, #0b0f0e 60%)",
-          value={email}
+      }}
-          onChange={(e) => setEmail(e.target.value)}
+    >
-        />
+      <Paper
-        <PasswordInput
+        radius="lg"
-          placeholder="Password"
+        p="xl"
-          value={password}
+        w={420}
-          onChange={(e) => setPassword(e.target.value)}
+        style={{
-        />
+          background: "rgba(20, 20, 20, 0.75)",
-        <Group justify="right">
+          backdropFilter: "blur(12px)",
-          <Button onClick={handleSubmit} disabled={loading}>
+          border: "1px solid rgba(255, 255, 255, 0.08)",
+          boxShadow: "0 20px 60px rgba(0,0,0,0.6)",
+        }}
+      >
+        <Stack>
+          <Text
+            size="xl"
+            fw={700}
+            ta="center"
+            c="white"
+          >
+            Welcome Back
+          </Text>
+
+          <Text
+            size="sm"
+            ta="center"
+            c="dimmed"
+          >
+            Sign in to continue to your dashboard
+          </Text>
+
+          <TextInput
+            label="Email"
+            placeholder="Email"
+            value={email}
+            onChange={(e) => setEmail(e.target.value)}
+          />
+
+          <PasswordInput
+            label="Password"
+            placeholder="Password"
+            value={password}
+            onChange={(e) => setPassword(e.target.value)}
+          />
+
+          <Button
+            fullWidth
+            mt="md"
+            radius="md"
+            size="md"
+            variant="gradient"
+            gradient={{ from: "teal", to: "cyan", deg: 45 }}
+            style={{
+              transition: "all 0.2s ease",
+            }}
+            onClick={handleSubmit}
+            disabled={loading}
+          >
             Login
           </Button>
-        </Group>
+        </Stack>
-      </Stack>
+      </Paper>
-    </Container>
+    </Center>
   );
 }

src/pages/darmasaba/surat.tsx

@@ -22,13 +22,19 @@ import {
   TextInput,
   Tooltip,
 } from "@mantine/core";
+import { DateInput } from "@mantine/dates";
 import { useDisclosure, useShallowEffect } from "@mantine/hooks";
 import {
   IconBuildingCommunity,
+  IconCategory,
+  IconFiles,
   IconInfoCircle,
-  IconUpload,
+  IconNotes,
-  IconUser,
+  IconPhone,
+  IconUpload
 } from "@tabler/icons-react";
+import dayjs from "dayjs";
+import "dayjs/locale/id";
 import React, { useState } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
 import useSWR from "swr";
@@ -36,6 +42,7 @@ import useSWR from "swr";
 type DataItem = {
   key: string;
   value: string;
+  required: boolean;
 };
 
 type FormSurat = {
@@ -46,7 +53,10 @@ type FormSurat = {
   syaratDokumen: DataItem[];
 };
 
+type ErrorState = Record<string, string | null>;
+
 export default function FormSurat() {
+  const [errors, setErrors] = useState<ErrorState>({});
   const [opened, { open, close }] = useDisclosure(false);
   const [noPengajuan, setNoPengajuan] = useState("");
   const [submitLoading, setSubmitLoading] = useState(false);
@@ -87,7 +97,7 @@ export default function FormSurat() {
         setJenisSuratFix({ name: "", id: "" });
       } else {
         const namaJenis = fromSlug(jenisSurat);
-        const data = listCategory.find((item: any) => item.name == namaJenis);
+        const data = listCategory.find((item: any) => item.name.toUpperCase() == namaJenis.toUpperCase());
         if (!data) return;
         setJenisSuratFix(data);
       }
@@ -110,15 +120,17 @@ export default function FormSurat() {
         nama: "",
         phone: "",
         dataPelengkap: (get.data?.dataPelengkap || []).map(
-          (item: { key: string }) => ({
+          (item: { key: string, required: boolean }) => ({
             key: item.key,
             value: "",
+            required: item.required
           }),
         ),
         syaratDokumen: (get.data?.syaratDokumen || []).map(
-          (item: { key: string }) => ({
+          (item: { key: string, required: boolean }) => ({
             key: item.key,
             value: "",
+            required: item.required
           }),
         ),
       });
@@ -144,22 +156,24 @@ export default function FormSurat() {
   }, [jenisSuratFix.id]);
 
   function onChecking() {
+    const hasError = Object.values(errors).some((v) => v);
+
+    if (hasError) {
+      return notification({
+        title: "Gagal",
+        message: "Masih ada form yang belum valid",
+        type: "error",
+      });
+    }
+
     const isFormKosong = Object.values(formSurat).some((value) => {
       if (Array.isArray(value)) {
-        return (
+        return value.some(
-          value.length === 0 ||
+          (item) =>
-          value.some(
+            (typeof item.value === "string" && item.value.trim() === "" && item.required) || (typeof item.value === "object" && item.value === null && item.required),
-            (item) =>
-              typeof item.value === "string" && item.value.trim() === "",
-          )
         );
       }
-
+      return typeof value === "string" && value.trim() === "";
-      if (typeof value === "string") {
-        return value.trim() === "";
-      }
-
-      return false;
     });
 
     if (isFormKosong) {
@@ -168,9 +182,9 @@ export default function FormSurat() {
         message: "Silahkan lengkapi form surat",
         type: "error",
       });
-    } else {
-      open();
     }
+
+    open();
   }
 
   async function onSubmit() {
@@ -233,6 +247,30 @@ export default function FormSurat() {
     );
   }
 
+
+  function validateField(key: string, value: any) {
+    const stringValue = String(value ?? "").trim();
+
+    // wajib diisi
+    if (!stringValue) {
+      return "Field wajib diisi";
+    }
+
+    // 🔥 semua key yang mengandung "nik"
+    if (key.toLowerCase().includes("nik")) {
+      if (!/^\d+$/.test(stringValue)) {
+        return "NIK harus berupa angka";
+      }
+
+      if (stringValue.length !== 16) {
+        return "NIK harus 16 digit";
+      }
+    }
+
+    return null;
+  }
+
+
   function validationForm({
     key,
     value,
@@ -240,12 +278,28 @@ export default function FormSurat() {
     key: "nama" | "phone" | "dataPelengkap" | "syaratDokumen";
     value: any;
   }) {
-    if (key == "dataPelengkap" || key == "syaratDokumen") {
+    if (key === "dataPelengkap" || key === "syaratDokumen") {
+      if (value.required == true) {
+        const errorMsg = validateField(value.key, value.value);
+
+        setErrors((prev) => ({
+          ...prev,
+          [value.key]: errorMsg,
+        }));
+      }
       setFormSurat((prev) => ({
         ...prev,
         [key]: updateArrayByKey(prev[key], value.key, value.value),
       }));
     } else {
+      const keyFix = key == "nama" ? "nama_kontak" : key;
+      const errorMsg = validateField(keyFix, value);
+
+      setErrors((prev) => ({
+        ...prev,
+        [keyFix]: errorMsg,
+      }));
+
       setFormSurat({
         ...formSurat,
         [key]: value,
@@ -253,6 +307,7 @@ export default function FormSurat() {
     }
   }
 
+
   return (
     <Container size="md" w={"100%"} pb={"lg"}>
       <Modal
@@ -262,9 +317,7 @@ export default function FormSurat() {
         overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
       >
         <Stack gap="sm">
-          <Text>
+          <Text>Apakah anda yakin ingin mengirim pengajuan surat ini?</Text>
-            Apakah anda yakin ingin mengirim pengajuan surat ini?
-          </Text>
           <Group justify="center" grow>
             <Button variant="light" onClick={close}>
               Tidak
@@ -292,8 +345,7 @@ export default function FormSurat() {
           }}
           category="create"
         />
-      )
+      ) : (
-        :
         <Box>
           <Stack gap="lg">
             <Group justify="space-between" align="center">
@@ -310,46 +362,18 @@ export default function FormSurat() {
                 </div>
               </Group>
               <Group>
-                <Badge radius="sm">Form Length: 3 Sections</Badge>
+                <Badge radius="sm">Form Length: 4 Sections</Badge>
               </Group>
             </Group>
             <Stack gap="lg">
-              {/* Header Section */}
               <FormSection
-                title="Pemohon"
+                title="Jenis Surat Pengajuan"
-                icon={<IconUser size={16} />}
+                icon={<IconCategory size={16} />}
-                description="Informasi identitas pemohon"
               >
                 <Grid>
-                  <Grid.Col span={6}>
-                    <TextInput
-                      label={<FieldLabel label="Nama" hint="Nama pemohon" />}
-                      placeholder="Budi Setiawan"
-                      value={formSurat.nama}
-                      onChange={(e) =>
-                        validationForm({ key: "nama", value: e.target.value })
-                      }
-                    />
-                  </Grid.Col>
-
-                  <Grid.Col span={6}>
-                    <TextInput
-                      label={
-                        <FieldLabel
-                          label="Nomor Telephone"
-                          hint="Nomor telephone yang dapat dihubungi / terhubung dengan whatsapp"
-                        />
-                      }
-                      placeholder="08123456789"
-                      value={formSurat.phone}
-                      onChange={(e) =>
-                        validationForm({ key: "phone", value: e.target.value })
-                      }
-                    />
-                  </Grid.Col>
-
                   <Grid.Col span={12}>
                     <Select
+                      allowDeselect={false}
                       label={
                         <FieldLabel
                           label="Jenis Surat"
@@ -361,7 +385,7 @@ export default function FormSurat() {
                         value: item.name,
                         label: item.name,
                       }))}
-                      value={jenisSuratFix.name}
+                      value={jenisSuratFix.name == "" ? null : jenisSuratFix.name}
                       onChange={(value) => {
                         const slug = toSlug(String(value));
                         navigate("/darmasaba/surat?jenis=" + slug);
@@ -371,83 +395,209 @@ export default function FormSurat() {
                 </Grid>
               </FormSection>
 
-              {jenisSuratFix.id != "" && dataSurat && dataSurat.dataPelengkap && (
+              {/* Kontak Section */}
-                <>
+              <FormSection
-                  <FormSection
+                title="Kontak"
-                    title="Data Pelengkap"
+                icon={<IconPhone size={16} />}
-                    description="Data pelengkap yang diperlukan"
+                description="Informasi kontak yg dapat dihubungi"
-                  >
+              >
-                    <Grid>
+                <Grid>
-                      {dataSurat.dataPelengkap.map((item: any, index: number) => (
+                  <Grid.Col span={6}>
-                        <Grid.Col span={6} key={index}>
+                    <TextInput
-                          <TextInput
+                      label={<FieldLabel label="Nama" hint="Nama kontak" required />}
-                            label={
+                      placeholder="Budi Setiawan"
-                              <FieldLabel label={item.name} hint={item.desc} />
+                      value={formSurat.nama}
-                            }
+                      error={errors.nama_kontak}
-                            placeholder={item.name}
+                      onChange={(e) =>
-                            onChange={(e) =>
+                        validationForm({ key: "nama", value: e.target.value })
-                              validationForm({
+                      }
-                                key: "dataPelengkap",
+                    />
-                                value: { key: item.key, value: e.target.value },
+                  </Grid.Col>
-                              })
-                            }
-                            value={
-                              formSurat.dataPelengkap.find(
-                                (n: any) => n.key == item.key,
-                              )?.value
-                            }
-                          />
-                        </Grid.Col>
-                      ))}
-                    </Grid>
-                  </FormSection>
 
-                  <FormSection
+                  <Grid.Col span={6}>
-                    title="Syarat Dokumen"
+                    <TextInput
-                    description="Syarat dokumen yang diperlukan"
+                      label={
-                  >
+                        <FieldLabel
-                    <Grid>
+                          required
-                      {dataSurat.syaratDokumen.map((item: any, index: number) => (
+                          label="Nomor Telephone"
-                        <Grid.Col span={6} key={index}>
+                          hint="Nomor telephone yang dapat dihubungi / terhubung dengan whatsapp"
-                          <FileInputWrapper
+                        />
-                            label={item.desc}
+                      }
-                            placeholder={"Upload file "}
+                      placeholder="08123456789"
-                            accept="image/*,application/pdf"
+                      value={formSurat.phone}
-                            onChange={(file) =>
+                      error={errors.phone}
-                              validationForm({
+                      type="number"
-                                key: "syaratDokumen",
+                      onChange={(e) =>
-                                value: { key: item.key, value: file },
+                        validationForm({ key: "phone", value: e.target.value })
-                              })
+                      }
-                            }
+                    />
-                            name={item.name}
+                  </Grid.Col>
-                          />
+                </Grid>
-                        </Grid.Col>
+              </FormSection>
-                      ))}
-                    </Grid>
-                  </FormSection>
 
-                  {/* Actions */}
+              {jenisSuratFix.id != "" &&
-                  <Group justify="right" mt="md">
+                dataSurat &&
-                    {/* <Button variant="default" onClick={() => { }}>
+                dataSurat.dataPelengkap && (
+                  <>
+                    <FormSection
+                      title="Data Yang Diperlukan"
+                      description="Data yang diperlukan untuk mengajukan surat"
+                      icon={<IconNotes size={16} />}
+                    >
+                      <Grid>
+                        {dataSurat.dataPelengkap.map(
+                          (item: any, index: number) => (
+                            <Grid.Col span={6} key={index}>
+                              {item.type == "enum" ? (
+                                <Select
+                                  allowDeselect={false}
+                                  label={
+                                    <FieldLabel
+                                      label={item.name}
+                                      hint={item.desc}
+                                      required={item.required}
+                                    />
+                                  }
+                                  data={item.options ?? []}
+                                  placeholder={item.name}
+                                  onChange={(e) => {
+                                    validationForm({
+                                      key: "dataPelengkap",
+                                      value: { key: item.key, value: e, required: item.required },
+                                    });
+                                  }}
+                                  value={
+                                    formSurat.dataPelengkap.find(
+                                      (n: any) => n.key == item.key,
+                                    )?.value
+                                  }
+                                />
+                              ) : item.type == "date" ? (
+                                <DateInput
+                                  locale="id"
+                                  valueFormat="DD MMMM YYYY"
+                                  label={
+                                    <FieldLabel
+                                      label={item.name}
+                                      hint={item.desc}
+                                      required={item.required}
+                                    />
+                                  }
+                                  placeholder={item.name}
+                                  onChange={(e) => {
+                                    const formatted = e
+                                      ? dayjs(e)
+                                        .locale("id")
+                                        .format("DD MMMM YYYY")
+                                      : "";
+                                    validationForm({
+                                      key: "dataPelengkap",
+                                      value: {
+                                        key: item.key,
+                                        value: formatted,
+                                        required: item.required,
+                                      },
+                                    });
+                                  }}
+                                />
+                              ) : (
+                                <TextInput
+                                  error={errors[item.key]}
+                                  type={item.type}
+                                  label={
+                                    <FieldLabel
+                                      label={item.name}
+                                      hint={item.desc}
+                                      required={item.required}
+                                    />
+                                  }
+                                  placeholder={item.name}
+                                  onChange={(e) =>
+                                    validationForm({
+                                      key: "dataPelengkap",
+                                      value: {
+                                        key: item.key,
+                                        value: e.target.value,
+                                        required: item.required,
+                                      },
+                                    })
+                                  }
+                                  value={
+                                    formSurat.dataPelengkap.find(
+                                      (n: any) => n.key == item.key,
+                                    )?.value
+                                  }
+                                  rightSection={
+                                    item.satuan != null &&
+                                    <Text mr={"lg"}>{item.satuan}</Text>
+                                  }
+                                />
+                              )}
+                            </Grid.Col>
+                          ),
+                        )}
+                      </Grid>
+                    </FormSection>
+
+                    <FormSection
+                      title="Syarat Dokumen"
+                      description="Syarat dokumen yang diperlukan"
+                      icon={<IconFiles size={16} />}
+                    >
+                      <Grid>
+                        {dataSurat.syaratDokumen.map(
+                          (item: any, index: number) => (
+                            <Grid.Col span={6} key={index}>
+                              <FileInputWrapper
+                                label={item.desc}
+                                placeholder={"Upload file "}
+                                accept="image/*,application/pdf"
+                                onChange={(file) =>
+                                  validationForm({
+                                    key: "syaratDokumen",
+                                    value: { key: item.key, value: file },
+                                  })
+                                }
+                                name={item.name}
+                                required={item.required}
+                              />
+                            </Grid.Col>
+                          ),
+                        )}
+                      </Grid>
+                    </FormSection>
+
+                    {/* Actions */}
+                    <Group justify="right" mt="md">
+                      {/* <Button variant="default" onClick={() => { }}>
                     Reset
                   </Button> */}
-                    <Button onClick={onChecking}>Kirim</Button>
+                      <Button onClick={onChecking}>Kirim</Button>
-                  </Group>
+                    </Group>
-                </>
+                  </>
-              )}
+                )}
             </Stack>
           </Stack>
         </Box>
-      }
+      )}
-
     </Container>
   );
 }
 
-function FieldLabel({ label, hint }: { label: string; hint?: string }) {
+function FieldLabel({ label, hint, required = false, }: { label: string; hint?: string; required?: boolean; }) {
   return (
     <Group justify="apart" gap="xs" align="center">
-      <Text fw={600}>{label}</Text>
+      <Group gap={4} align="center">
+        <Text fw={600}>
+          {label}
+          {required && (
+            <Text span c="red" ml={4}>
+              *
+            </Text>
+          )}
+        </Text>
+      </Group>
+
       {hint && (
         <Tooltip label={hint} withArrow>
           <ActionIcon size={24} variant="subtle">
@@ -459,6 +609,7 @@ function FieldLabel({ label, hint }: { label: string; hint?: string }) {
   );
 }
 
+
 function FormSection({
   title,
   icon,
@@ -494,6 +645,7 @@ function FileInputWrapper({
   preview,
   name,
   description,
+  required = false,
 }: {
   label: string;
   placeholder?: string;
@@ -502,12 +654,20 @@ function FileInputWrapper({
   preview?: string | null;
   name: string;
   description?: string;
+  required?: boolean;
 }) {
   return (
     <Stack gap="xs">
       <Flex direction={"column"}>
         <Group justify="apart" align="center">
-          <Text fw={500}>{label}</Text>
+          <Text fw={500}>
+            {label}
+            {required && (
+              <Text span c="red" ml={4}>
+                *
+              </Text>
+            )}
+          </Text>
         </Group>
         {description && (
           <Text size="sm" c="dimmed" mt={4} style={{ lineHeight: 1.2 }}>
@@ -523,6 +683,7 @@ function FileInputWrapper({
         leftSection={<IconUpload />}
         aria-label={label}
         name={name}
+        clearable={true}
       />
 
       {preview ? (

src/pages/scr/dashboard/dashboard_layout.tsx

@@ -73,7 +73,7 @@ export default function DashboardLayout() {
     <AppShell
       padding="lg"
       navbar={{
-        width: 260,
+        width: 300,
         breakpoint: "sm",
         collapsed: { mobile: !opened, desktop: !opened },
       }}
@@ -290,22 +290,31 @@ function NavigationDashboard() {
         .map((item) => (
           <NavLink
             key={item.path}
-            active={isActive(item.path as keyof typeof clientRoute)}
+            active={isActive(item.path as keyof typeof clientRoute) ||
+              (location.pathname == "/scr/dashboard/pelayanan-surat/detail-pelayanan" && item.path == "/scr/dashboard/pelayanan-surat/list-pelayanan") ||
+              (location.pathname == "/scr/dashboard/pengaduan/detail" && item.path == "/scr/dashboard/pengaduan/list") ||
+              (location.pathname == "/scr/dashboard/warga/detail-warga" && item.path == "/scr/dashboard/warga/list-warga")}
             leftSection={item.icon}
             label={
               <Flex align="center" gap={6}>
                 <Text fw={500}>{item.label}</Text>
-                {isActive(item.path as keyof typeof clientRoute) && (
+                {(
-                  <Badge
+                  isActive(item.path as keyof typeof clientRoute) ||
-                    variant="light"
+                  (location.pathname == "/scr/dashboard/pelayanan-surat/detail-pelayanan" && item.path == "/scr/dashboard/pelayanan-surat/list-pelayanan") ||
-                    color="teal"
+                  (location.pathname == "/scr/dashboard/pengaduan/detail" && item.path == "/scr/dashboard/pengaduan/list") ||
-                    radius="sm"
+                  (location.pathname == "/scr/dashboard/warga/detail-warga" && item.path == "/scr/dashboard/warga/list-warga")
-                    size="xs"
+                )
-                    style={{ textTransform: "none" }}
+                  && (
-                  >
+                    <Badge
-                    Active
+                      variant="light"
-                  </Badge>
+                      color="teal"
-                )}
+                      radius="sm"
+                      size="xs"
+                      style={{ textTransform: "none" }}
+                    >
+                      Active
+                    </Badge>
+                  )}
               </Flex>
             }
             description={item.description}
@@ -313,7 +322,10 @@ function NavigationDashboard() {
               navigate(clientRoutes[item.path as keyof typeof clientRoute])
             }
             style={{
-              backgroundColor: isActive(item.path as keyof typeof clientRoute)
+              backgroundColor: isActive(item.path as keyof typeof clientRoute) ||
+                (location.pathname == "/scr/dashboard/pelayanan-surat/detail-pelayanan" && item.path == "/scr/dashboard/pelayanan-surat/list-pelayanan") ||
+                (location.pathname == "/scr/dashboard/pengaduan/detail" && item.path == "/scr/dashboard/pengaduan/list") ||
+                (location.pathname == "/scr/dashboard/warga/detail-warga" && item.path == "/scr/dashboard/warga/list-warga")
                 ? "rgba(0,255,200,0.1)"
                 : "transparent",
               borderRadius: "8px",

src/pages/scr/dashboard/pelayanan-surat/detail_pelayanan_page.tsx

@@ -1,8 +1,12 @@
+import BreadCrumbs from "@/components/BreadCrumbs";
+import FullScreenLoading from "@/components/FullScreenLoading";
 import ModalFile from "@/components/ModalFile";
 import ModalSurat from "@/components/ModalSurat";
 import notification from "@/components/notificationGlobal";
 import apiFetch from "@/lib/apiFetch";
+import { parseTanggalID } from "@/server/lib/stringToDate";
 import {
+  ActionIcon,
   Anchor,
   Badge,
   Button,
@@ -14,23 +18,31 @@ import {
   Group,
   List,
   Modal,
+  Select,
+  Spoiler,
   Stack,
   Table,
   Text,
   Textarea,
+  TextInput,
   ThemeIcon,
   Title,
+  Tooltip
 } from "@mantine/core";
+import { DateInput } from "@mantine/dates";
 import { useDisclosure, useShallowEffect } from "@mantine/hooks";
 import {
   IconAlignJustified,
   IconCheck,
+  IconEdit,
   IconFileCertificate,
   IconFileCheck,
+  IconInfoCircle,
   IconMessageReport,
   IconPhone,
   IconUser,
 } from "@tabler/icons-react";
+import dayjs from "dayjs";
 import type { User } from "generated/prisma";
 import type { JsonValue } from "generated/prisma/runtime/library";
 import _ from "lodash";
@@ -39,6 +51,11 @@ import { useLocation } from "react-router-dom";
 import useSwr from "swr";
 
 export default function DetailPengajuanPage() {
+  const dataMenu = [
+    { title: "Dashboard", link: "/scr/dashboard/dashboard-home", active: false },
+    { title: "Pelayanan Surat", link: "/scr/dashboard/pelayanan-surat/list-pelayanan", active: false },
+    { title: "Detail Pengajuan Surat", link: "#", active: true },
+  ];
   const { search } = useLocation();
   const query = new URLSearchParams(search);
   const id = query.get("id");
@@ -57,10 +74,14 @@ export default function DetailPengajuanPage() {
   return (
     <Container size="xl" py="xl" w={"100%"}>
       <Grid>
+        <Grid.Col span={12}>
+          <BreadCrumbs dataLink={dataMenu} back />
+        </Grid.Col>
         <Grid.Col span={8}>
           <Stack gap={"xl"}>
             <DetailDataPengajuan
               data={data?.data?.pengajuan}
+              warga={data && data.data && data.data.warga ? data.data.warga : undefined}
               syaratDokumen={data?.data?.syaratDokumen}
               dataText={data?.data?.dataText}
               onAction={() => {
@@ -80,15 +101,18 @@ export default function DetailPengajuanPage() {
 
 function DetailDataPengajuan({
   data,
+  warga,
   syaratDokumen,
   dataText,
   onAction,
 }: {
   data: any;
+  warga?: { phone?: string | null } | null;
   syaratDokumen: any;
   dataText: any;
   onAction: () => void;
 }) {
+
   const [opened, { open, close }] = useDisclosure(false);
   const [catModal, setCatModal] = useState<"tolak" | "terima">("tolak");
   const [keterangan, setKeterangan] = useState("");
@@ -97,7 +121,12 @@ function DetailDataPengajuan({
   const [openedPreview, setOpenedPreview] = useState(false);
   const [openedPreviewFile, setOpenedPreviewFile] = useState(false);
   const [permissions, setPermissions] = useState<JsonValue[]>([]);
-  const [viewImg, setViewImg] = useState("");
+  const [viewImg, setViewImg] = useState({ file: "", folder: "" });
+  const [uploading, setUploading] = useState({ ok: false, file: "" });
+  const [editValue, setEditValue] = useState({ id: "", jenis: "", val: "", satuan: null as string | null, option: null as any, type: "", key: "" })
+  const [openEdit, setOpenEdit] = useState(false)
+  const [loadingUpdate, setLoadingUpdate] = useState(false)
+  const [loadingFS, setLoadingFS] = useState({ value: false, text: "" })
 
   useEffect(() => {
     async function fetchHost() {
@@ -114,22 +143,88 @@ function DetailDataPengajuan({
     fetchHost();
   }, []);
 
+  async function sendWA({ status, linkSurat, linkUpdate }: { status: string, linkSurat: string, linkUpdate: string }) {
+    try {
+      setLoadingFS({ value: true, text: "Sending message to warga" })
+      const resWA = await apiFetch.api["send-wa"]["pengajuan-surat"].post({
+        noPengajuan: data?.noPengajuan ?? "",
+        jenisSurat: data?.category ?? "",
+        alasan: keterangan,
+        status,
+        linkSurat,
+        linkUpdate,
+        tlp: warga?.phone ?? "",
+      })
+
+      if (resWA?.status === 200) {
+        if (resWA.data?.success) {
+          notification({
+            title: "Success",
+            message: "Success send message to warga",
+            type: "success",
+          });
+
+          if (status == "selesai") {
+            onAction()
+          }
+
+        } else {
+          notification({
+            title: "Failed",
+            message: "Failed send message to warga",
+            type: "error",
+          });
+        }
+      } else {
+        notification({
+          title: "Failed",
+          message: "Failed send message to warga",
+          type: "error",
+        });
+      }
+    } catch (error) {
+      notification({
+        title: "Failed",
+        message: "Failed send message to warga",
+        type: "error",
+      });
+    }
+    finally {
+      setLoadingFS({ value: false, text: "" })
+    }
+  }
+
   const handleKonfirmasi = async (cat: "terima" | "tolak") => {
     try {
+      setLoadingFS({ value: true, text: "Updating status" })
+      const statusFix = cat == "tolak"
+        ? "ditolak"
+        : data.status == "antrian"
+          ? "diterima"
+          : "selesai"
+
       const res = await apiFetch.api.pelayanan["update-status"].post({
         id: data?.id,
-        status:
+        status: statusFix,
-          cat == "tolak"
-            ? "ditolak"
-            : data.status == "antrian"
-              ? "diterima"
-              : "selesai",
         keterangan: keterangan,
         idUser: host?.id ?? "",
         noSurat: noSurat,
       });
 
       if (res?.status === 200) {
+        if (statusFix == "selesai") {
+          setTimeout(() => {
+            setOpenedPreview(true)
+          }, 1000)
+        } else {
+          sendWA({
+            status: statusFix,
+            linkSurat: "",
+            linkUpdate: statusFix == "ditolak" ? res.data?.linkUpdate ?? '' : '',
+          });
+        }
+
+
         onAction();
         close();
         notification({
@@ -151,24 +246,158 @@ function DetailDataPengajuan({
         message: "Failed to update pengajuan surat",
         type: "error",
       });
+    } finally {
+      setLoadingFS({ value: false, text: "" })
     }
   };
 
+  async function updateDataText() {
+    try {
+      setLoadingUpdate(true)
+      const res = await apiFetch.api.pelayanan["update-data-pelengkap"].post({
+        id: editValue.id,
+        value: editValue.val,
+        jenis: editValue.key,
+        idUser: host?.id ?? "",
+      })
+
+      if (res?.status === 200) {
+        notification({
+          title: "Success",
+          message: "Success update data",
+          type: "success",
+        })
+      } else {
+        notification({
+          title: "Error",
+          message: "Failed to update data",
+          type: "error",
+        })
+      }
+    } catch (error) {
+      console.error(error)
+      notification({
+        title: "Error",
+        message: "Failed to update data",
+        type: "error",
+      })
+    } finally {
+      setLoadingUpdate(false)
+      setOpenEdit(false)
+      onAction()
+    }
+  }
+
   useShallowEffect(() => {
     if (viewImg) {
       setOpenedPreviewFile(true);
     }
   }, [viewImg]);
 
+  useShallowEffect(() => {
+    if (uploading.ok && uploading.file) {
+      sendWA({
+        status: "selesai",
+        linkSurat: uploading.file,
+        linkUpdate: "",
+      });
+    }
+  }, [uploading]);
+
+  function FieldLabel({ label, hint }: { label: string; hint?: string }) {
+    return (
+      <Group justify="apart" gap="xs" align="center">
+        <Text fw={600}>{label}</Text>
+        {hint && (
+          <Tooltip label={hint} withArrow>
+            <ActionIcon size={24} variant="subtle">
+              <IconInfoCircle size={16} />
+            </ActionIcon>
+          </Tooltip>
+        )}
+      </Group>
+    );
+  }
+
   return (
     <>
+
+      <FullScreenLoading visible={loadingFS.value} text={loadingFS.text} />
+      {/* MODAL EDIT DATA PELENGKAP */}
+      <Modal
+        opened={openEdit}
+        onClose={() => setOpenEdit(false)}
+        title={"Edit"}
+        overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
+      >
+        <Stack gap="ld">
+          {editValue.type == "enum" ? (
+            <Select
+              allowDeselect={false}
+              label={<FieldLabel label={editValue.jenis} />}
+              data={editValue.option ?? []}
+              placeholder={editValue.jenis}
+              onChange={(e) => { setEditValue({ ...editValue, val: e ?? "" }) }}
+              value={editValue.val}
+            />
+          ) : editValue.type == "date" ? (
+            <DateInput
+              locale="id"
+              valueFormat="DD MMMM YYYY"
+              label={<FieldLabel label={editValue.jenis} />}
+              placeholder={editValue.jenis}
+              onChange={(e) => {
+                const formatted = e
+                  ? dayjs(e).locale("id").format("DD MMMM YYYY")
+                  : "";
+                setEditValue({
+                  ...editValue,
+                  val: formatted
+                })
+              }}
+              value={
+                editValue.val
+                  ? parseTanggalID(editValue.val)
+                  : parseTanggalID(editValue.val)
+              }
+            />
+          ) : (
+            <TextInput
+              label={<FieldLabel label={editValue.jenis} />}
+              placeholder={editValue.jenis}
+              type={editValue.type}
+              onChange={(e) => { setEditValue({ ...editValue, val: e.target.value }) }}
+              value={editValue.val}
+              rightSection={
+                editValue.satuan != null &&
+                <Text mr={"lg"}>{editValue.satuan}</Text>
+              }
+            />
+          )}
+          <Group justify="center" grow>
+            <Button variant="light" onClick={() => { setOpenEdit(false) }}>
+              Batal
+            </Button>
+            <Button
+              variant="filled"
+              onClick={updateDataText}
+              disabled={loadingUpdate || !editValue.val}
+              loading={loadingUpdate}
+            >
+              Simpan
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
+
       <ModalFile
-        open={openedPreviewFile && !_.isEmpty(viewImg)}
+        open={openedPreviewFile && !_.isEmpty(viewImg.file)}
         onClose={() => {
           setOpenedPreviewFile(false);
+          setViewImg({ file: "", folder: "" })
         }}
-        folder="syarat-dokumen"
+        folder={viewImg.folder}
-        fileName={viewImg}
+        fileName={viewImg.file}
       />
 
       {/* MODAL KONFIRMASI */}
@@ -240,10 +469,15 @@ function DetailDataPengajuan({
           )}
         </Stack>
       </Modal>
-      {data?.status == "selesai" && (
+
+      {/* MODAL PREVIEW SURAT */}
+      {data?.status == "selesai" && !data?.fileSurat && (
         <ModalSurat
           open={openedPreview}
-          onClose={() => setOpenedPreview(false)}
+          onClose={(val) => {
+            setOpenedPreview(false)
+            setUploading({ ok: val.success, file: val.data })
+          }}
           surat={data?.idSurat}
         />
       )}
@@ -311,7 +545,7 @@ function DetailDataPengajuan({
                       <List.Item key={v.id}>
                         <Anchor
                           onClick={() => {
-                            setViewImg(v.value);
+                            setViewImg({ file: v.value, folder: "syarat-dokumen" });
                           }}
                         >
                           {v.jenis}
@@ -338,7 +572,25 @@ function DetailDataPengajuan({
                           </Table.Td>
                           <Table.Td>:</Table.Td>
                           <Table.Td style={{ width: "85%" }}>
-                            {_.upperFirst(item.value)}
+                            <Flex
+                              gap="md"
+                              justify="flex-start"
+                              align="center"
+                              direction="row"
+                            >
+                              <Text>
+                                {_.upperFirst(item.value)} {item.satuan}
+                              </Text>
+                              <ActionIcon
+                                variant="subtle"
+                                aria-label="Edit"
+                                onClick={() => {
+                                  setEditValue({ id: item.id, val: item.value, type: item.type, satuan: item.satuan, option: item.options, jenis: item.jenis, key: item.key })
+                                  setOpenEdit(true)
+                                }}>
+                                <IconEdit size={16} />
+                              </ActionIcon>
+                            </Flex>
                           </Table.Td>
                         </Table.Tr>
                       ))}
@@ -396,18 +648,31 @@ function DetailDataPengajuan({
                     Setujui
                   </Button>
                 </Group>
-              ) : data?.status === "selesai" ? (
+              ) : data?.status === "selesai" ?
-                <Group justify="center" grow>
+                !data?.fileSurat ?
-                  <Button
+                  (
-                    variant="light"
+                    <Group justify="center" grow>
-                    onClick={() => setOpenedPreview(!openedPreview)}
+                      <Button
-                  >
+                        variant="light"
-                    Surat
+                        onClick={() => { setOpenedPreview(true) }}
-                  </Button>
+                      >
-                </Group>
+                        Kirim Ulang Surat
-              ) : (
+                      </Button>
-                <></>
+                    </Group>
-              )}
+                  )
+                  :
+                  (
+                    <Group justify="center" grow>
+                      <Button
+                        variant="light"
+                        onClick={() => { setViewImg({ file: data?.fileSurat, folder: "surat" }) }}
+                      >
+                        Surat
+                      </Button>
+                    </Group>
+                  ) : (
+                  <></>
+                )}
             </Grid.Col>
           </Grid>
         </Stack>
@@ -432,41 +697,48 @@ function DetailDataHistori({ data }: { data: any }) {
       <Stack gap="md">
         <Flex align="center" justify="space-between">
           <Title order={4} c="gray.2">
-            Histori Pengajuan Surat
+            Riwayat Pengajuan Surat
           </Title>
         </Flex>
         <Divider my={0} />
-        <Table>
+        <Spoiler
-          <Table.Thead>
+          maxHeight={200}
-            <Table.Tr>
+          showLabel="Show more"
-              <Table.Th>Tanggal</Table.Th>
+          hideLabel="Hide"
-              <Table.Th>Deskripsi</Table.Th>
+          transitionDuration={1000}
-              <Table.Th>Status</Table.Th>
+        >
-              <Table.Th>User</Table.Th>
+          <Table>
-            </Table.Tr>
+            <Table.Thead>
-          </Table.Thead>
+              <Table.Tr>
-          <Table.Tbody>
+                <Table.Th>Tanggal</Table.Th>
-            {data?.map((item: any) => (
+                <Table.Th>Deskripsi</Table.Th>
-              <Table.Tr key={item.id}>
+                <Table.Th>Status</Table.Th>
-                <Table.Td style={{ whiteSpace: "nowrap" }}>
+                <Table.Th>User</Table.Th>
-                  {item.createdAt.toLocaleString("id-ID", {
-                    day: "2-digit",
-                    month: "short",
-                    year: "numeric",
-                    hour: "2-digit",
-                    minute: "2-digit",
-                    hour12: false,
-                  })}
-                </Table.Td>
-                <Table.Td>{item.deskripsi}</Table.Td>
-                <Table.Td>{item.status}</Table.Td>
-                <Table.Td style={{ whiteSpace: "nowrap" }}>
-                  {item.nameUser ? item.nameUser : "-"}
-                </Table.Td>
               </Table.Tr>
-            ))}
+            </Table.Thead>
-          </Table.Tbody>
+            <Table.Tbody>
-        </Table>
+              {data?.map((item: any) => (
+                <Table.Tr key={item.id}>
+                  <Table.Td style={{ whiteSpace: "nowrap" }}>
+                    {item.createdAt.toLocaleString("id-ID", {
+                      day: "2-digit",
+                      month: "short",
+                      year: "numeric",
+                      hour: "2-digit",
+                      minute: "2-digit",
+                      hour12: false,
+                    })}
+                  </Table.Td>
+                  <Table.Td>{item.deskripsi}</Table.Td>
+                  <Table.Td>{item.status}</Table.Td>
+                  <Table.Td style={{ whiteSpace: "nowrap" }}>
+                    {item.nameUser ? item.nameUser : "-"}
+                  </Table.Td>
+                </Table.Tr>
+              ))}
+            </Table.Tbody>
+          </Table>
+        </Spoiler>
       </Stack>
     </Card>
   );

src/pages/scr/dashboard/pengaduan/detail_page.tsx

@@ -1,3 +1,4 @@
+import BreadCrumbs from "@/components/BreadCrumbs";
 import ModalFile from "@/components/ModalFile";
 import notification from "@/components/notificationGlobal";
 import apiFetch from "@/lib/apiFetch";
@@ -12,6 +13,7 @@ import {
   Grid,
   Group,
   Modal,
+  Spoiler,
   Stack,
   Table,
   Text,
@@ -37,7 +39,13 @@ import { useEffect, useState } from "react";
 import { useLocation } from "react-router-dom";
 import useSwr from "swr";
 
+
 export default function DetailPengaduanPage() {
+  const dataMenu = [
+    { title: "Dashboard", link: "/scr/dashboard/dashboard-home", active: false },
+    { title: "Pengaduan", link: "/scr/dashboard/pengaduan/list", active: false },
+    { title: "Detail Pengaduan", link: "#", active: true },
+  ];
   const { search } = useLocation();
   const query = new URLSearchParams(search);
   const id = query.get("id");
@@ -56,10 +64,14 @@ export default function DetailPengaduanPage() {
   return (
     <Container size="xl" py="xl" w={"100%"}>
       <Grid>
+        <Grid.Col span={12}>
+          <BreadCrumbs dataLink={dataMenu} back />
+        </Grid.Col>
         <Grid.Col span={8}>
           <Stack gap={"xl"}>
             <DetailDataPengaduan
               data={data?.data?.pengaduan}
+              phone={data && data.data && data.data.warga ? data.data.warga.phone : null}
               onAction={() => {
                 mutate();
               }}
@@ -77,9 +89,11 @@ export default function DetailPengaduanPage() {
 
 function DetailDataPengaduan({
   data,
+  phone,
   onAction,
 }: {
   data: any | null;
+  phone?: string | null;
   onAction: () => void;
 }) {
   const [opened, { open, close }] = useDisclosure(false);
@@ -88,6 +102,7 @@ function DetailDataPengaduan({
   const [keterangan, setKeterangan] = useState("");
   const [host, setHost] = useState<User | null>(null);
   const [permissions, setPermissions] = useState<JsonValue[]>([]);
+  const [isLoading, setIsLoading] = useState(false);
 
   useEffect(() => {
     async function fetchHost() {
@@ -106,6 +121,7 @@ function DetailDataPengaduan({
 
   const handleKonfirmasi = async (cat: "terima" | "tolak") => {
     try {
+      setIsLoading(true);
       const res = await apiFetch.api.pengaduan["update-status"].post({
         id: data?.id,
         status:
@@ -121,6 +137,21 @@ function DetailDataPengaduan({
       });
 
       if (res?.status === 200) {
+        const resWA = await apiFetch.api["send-wa"].pengaduan.post({
+          noPengaduan: data?.noPengaduan,
+          judulPengaduan: data?.title,
+          status:
+            cat == "tolak"
+              ? "ditolak"
+              : data.status == "antrian"
+                ? "diterima"
+                : data.status == "diterima"
+                  ? "dikerjakan"
+                  : "selesai",
+          alasan: keterangan,
+          tlp: String(phone),
+        })
+
         onAction();
         close();
         notification({
@@ -128,6 +159,28 @@ function DetailDataPengaduan({
           message: "Success update pengaduan",
           type: "success",
         });
+
+        if (resWA?.status === 200) {
+          if (resWA.data?.success) {
+            notification({
+              title: "Success",
+              message: "Success send message to warga",
+              type: "success",
+            });
+          } else {
+            notification({
+              title: "Failed",
+              message: "Failed send message to warga",
+              type: "error",
+            });
+          }
+        } else {
+          notification({
+            title: "Failed",
+            message: "Failed send message to warga",
+            type: "error",
+          });
+        }
       } else {
         notification({
           title: "Error",
@@ -142,6 +195,8 @@ function DetailDataPengaduan({
         message: "Failed to update pengaduan",
         type: "error",
       });
+    } finally {
+      setIsLoading(false);
     }
   };
 
@@ -176,6 +231,7 @@ function DetailDataPengaduan({
                   color="red"
                   disabled={keterangan.length < 1}
                   onClick={() => handleKonfirmasi("tolak")}
+                  loading={isLoading}
                 >
                   Tolak
                 </Button>
@@ -200,6 +256,7 @@ function DetailDataPengaduan({
                   variant="filled"
                   color="green"
                   onClick={() => handleKonfirmasi("terima")}
+                  loading={isLoading}
                 >
                   Ya
                 </Button>
@@ -420,41 +477,48 @@ function DetailDataHistori({ data }: { data: any }) {
       <Stack gap="md">
         <Flex align="center" justify="space-between">
           <Title order={4} c="gray.2">
-            Histori Pengaduan
+            Riwayat Pengaduan
           </Title>
         </Flex>
         <Divider my={0} />
-        <Table>
+        <Spoiler
-          <Table.Thead>
+          maxHeight={200}
-            <Table.Tr>
+          showLabel="Show more"
-              <Table.Th>Tanggal</Table.Th>
+          hideLabel="Hide"
-              <Table.Th>Deskripsi</Table.Th>
+          transitionDuration={1000}
-              <Table.Th>Status</Table.Th>
+        >
-              <Table.Th>User</Table.Th>
+          <Table>
-            </Table.Tr>
+            <Table.Thead>
-          </Table.Thead>
+              <Table.Tr>
-          <Table.Tbody>
+                <Table.Th>Tanggal</Table.Th>
-            {data?.map((item: any) => (
+                <Table.Th>Deskripsi</Table.Th>
-              <Table.Tr key={item.id}>
+                <Table.Th>Status</Table.Th>
-                <Table.Td style={{ whiteSpace: "nowrap" }}>
+                <Table.Th>User</Table.Th>
-                  {item.createdAt.toLocaleString("id-ID", {
-                    day: "2-digit",
-                    month: "short",
-                    year: "numeric",
-                    hour: "2-digit",
-                    minute: "2-digit",
-                    hour12: false,
-                  })}
-                </Table.Td>
-                <Table.Td>{item.deskripsi}</Table.Td>
-                <Table.Td>{item.status}</Table.Td>
-                <Table.Td style={{ whiteSpace: "nowrap" }}>
-                  {item.nameUser ? item.nameUser : "-"}
-                </Table.Td>
               </Table.Tr>
-            ))}
+            </Table.Thead>
-          </Table.Tbody>
+            <Table.Tbody>
-        </Table>
+              {data?.map((item: any) => (
+                <Table.Tr key={item.id}>
+                  <Table.Td style={{ whiteSpace: "nowrap" }}>
+                    {item.createdAt.toLocaleString("id-ID", {
+                      day: "2-digit",
+                      month: "short",
+                      year: "numeric",
+                      hour: "2-digit",
+                      minute: "2-digit",
+                      hour12: false,
+                    })}
+                  </Table.Td>
+                  <Table.Td>{item.deskripsi}</Table.Td>
+                  <Table.Td>{item.status}</Table.Td>
+                  <Table.Td style={{ whiteSpace: "nowrap" }}>
+                    {item.nameUser ? item.nameUser : "-"}
+                  </Table.Td>
+                </Table.Tr>
+              ))}
+            </Table.Tbody>
+          </Table>
+        </Spoiler>
       </Stack>
     </Card>
   );

src/pages/scr/dashboard/setting/detail_setting_page.tsx

@@ -1,3 +1,4 @@
+import BreadCrumbs from "@/components/BreadCrumbs";
 import DesaSetting from "@/components/DesaSetting";
 import KategoriPelayananSurat from "@/components/KategoriPelayananSurat";
 import KategoriPengaduan from "@/components/KategoriPengaduan";
@@ -15,14 +16,21 @@ import {
   IconUsersGroup,
 } from "@tabler/icons-react";
 import type { JsonValue } from "generated/prisma/runtime/library";
+import _ from "lodash";
 import { useEffect, useState } from "react";
-import { useLocation } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
 
 export default function DetailSettingPage() {
   const { search } = useLocation();
   const query = new URLSearchParams(search);
   const type = query.get("type");
+  const navigate = useNavigate();
   const [permissions, setPermissions] = useState<JsonValue[]>([]);
+  const dataMenu = [
+    { title: "Dashboard", link: "/scr/dashboard/dashboard-home", active: false },
+    { title: "Setting", link: "#", active: false },
+    { title: type == "cat-pengaduan" ? "Kategori Pengaduan" : type == "cat-pelayanan" ? "Kategori Pelayanan Surat" : type ? _.upperFirst(type) : "Profile", link: "#", active: true },
+  ];
 
   useEffect(() => {
     async function fetchPermissions() {
@@ -87,6 +95,9 @@ export default function DetailSettingPage() {
   return (
     <Container size="xl" py="xl" w={"100%"}>
       <Grid>
+        <Grid.Col span={12}>
+          <BreadCrumbs dataLink={dataMenu} back />
+        </Grid.Col>
         <Grid.Col span={3}>
           <Card
             radius="md"
@@ -104,7 +115,7 @@ export default function DetailSettingPage() {
               .map((item) => (
                 <NavLink
                   key={item.key}
-                  href={"?type=" + item.path}
+                  onClick={()=>{navigate("?type=" + item.path)}}
                   label={item.label}
                   leftSection={item.icon}
                   active={

src/pages/scr/dashboard/warga/detail_warga_page.tsx

@@ -1,62 +1,75 @@
+import BreadCrumbs from "@/components/BreadCrumbs";
+import notification from "@/components/notificationGlobal";
 import apiFetch from "@/lib/apiFetch";
 import {
   Avatar,
   Box,
   Button,
   Card,
+  CloseButton,
   Container,
   Divider,
   Flex,
   Grid,
   Group,
+  Input,
   LoadingOverlay,
+  Pagination,
   Stack,
   Table,
   Text,
   Title,
 } from "@mantine/core";
 import { useShallowEffect } from "@mantine/hooks";
-import { IconPhone } from "@tabler/icons-react";
+import { IconPhone, IconSearch } from "@tabler/icons-react";
 import _ from "lodash";
+import { useState } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
-import useSwr from "swr";
 
 export default function DetailWargaPage() {
+  const dataMenu = [
+    { title: "Dashboard", link: "/scr/dashboard/dashboard-home", active: false },
+    { title: "Warga", link: "/scr/dashboard/warga/list-warga", active: false },
+    { title: "Detail Warga", link: "#", active: true },
+  ];
   const { search } = useLocation();
   const query = new URLSearchParams(search);
   const id = query.get("id");
-  const { data, mutate, isLoading } = useSwr("/", () =>
+  // const { data, mutate, isLoading } = useSwr("/", () =>
-    apiFetch.api.warga.detail.get({
+  //   apiFetch.api.warga.detail.get({
-      query: {
+  //     query: {
-        id: id!,
+  //       id: id!,
-      },
+  //     },
-    }),
+  //   }),
-  );
+  // );
 
-  useShallowEffect(() => {
+  // useShallowEffect(() => {
-    mutate();
+  //   mutate();
-  }, []);
+  // }, []);
 
   return (
     <>
       <LoadingOverlay
-        visible={isLoading}
+        // visible={isLoading}
         zIndex={1000}
         overlayProps={{ radius: "sm", blur: 2 }}
       />
       <Container size="xl" py="xl" w={"100%"}>
         <Grid>
+          <Grid.Col span={12}>
+            <BreadCrumbs dataLink={dataMenu} back />
+          </Grid.Col>
           <Grid.Col span={4}>
-            <DetailWarga data={data?.data?.warga} />
+            <DetailWarga id={id!} />
           </Grid.Col>
           <Grid.Col span={8}>
             <Stack gap={"xl"}>
               <DetailDataHistori
-                data={data?.data?.pengaduan}
+                id={id!}
                 kategori="pengaduan"
               />
               <DetailDataHistori
-                data={data?.data?.pelayanan}
+                id={id!}
                 kategori="pelayanan"
               />
             </Stack>
@@ -68,13 +81,66 @@ export default function DetailWargaPage() {
 }
 
 function DetailDataHistori({
-  data,
+  id,
   kategori,
 }: {
-  data: any;
+  id: string;
   kategori: "pengaduan" | "pelayanan";
 }) {
   const navigate = useNavigate();
+  const [data, setData] = useState<any>([]);
+  const [totalPages, setTotalPages] = useState(1);
+  const [totalRows, setTotalRows] = useState(0);
+  const [page, setPage] = useState(1);
+  const [search, setSearch] = useState("");
+
+  async function getData() {
+    try {
+      const res = await apiFetch.api.warga.detail.get({
+        query: {
+          id,
+          category: kategori,
+          page: String(page),
+          search
+        }
+      }) as { data: { success: boolean; data: any[]; totalPages: number, totalRows: number } };
+
+      if (res?.data?.success) {
+        setData(res.data.data)
+        setTotalPages(res?.data?.totalPages)
+        setTotalRows(res?.data?.totalRows)
+      } else {
+        setData([])
+        setTotalPages(1)
+        setTotalRows(0)
+        notification({
+          title: "Failed",
+          message: "Failed to get data",
+          type: "error",
+        });
+      }
+
+    } catch (error) {
+      console.error(error);
+      notification({
+        title: "Failed",
+        message: "Failed to get data",
+        type: "error",
+      });
+    }
+  }
+
+  useShallowEffect(() => {
+    getData()
+  }, [page])
+
+
+  useShallowEffect(() => {
+    setPage(1)
+    if (page == 1) {
+      getData()
+    }
+  }, [search]);
 
   return (
     <Card
@@ -93,6 +159,36 @@ function DetailDataHistori({
           <Title order={4} c="gray.2">
             Histori {_.upperFirst(kategori)}
           </Title>
+          <Flex
+            gap="md"
+            justify="flex-start"
+            align="center"
+            direction="row"
+          >
+            <Input
+              value={search}
+              placeholder="Cari data..."
+              onChange={(event) => setSearch(event.currentTarget.value)}
+              leftSection={<IconSearch size={16} />}
+              rightSectionPointerEvents="all"
+              rightSection={
+                <CloseButton
+                  aria-label="Clear input"
+                  onClick={() => setSearch("")}
+                  style={{ display: search ? undefined : "none" }}
+                />
+              }
+            />
+            <Text size="sm" c="gray.5" >
+              {`${5 * (page - 1) + 1} – ${Math.min(totalRows, 5 * page)} of ${totalRows}`}
+            </Text>
+            <Pagination
+              total={totalPages}
+              value={page}
+              onChange={setPage}
+              withPages={false}
+            />
+          </Flex>
         </Flex>
         <Divider my={0} />
         <Table>
@@ -110,7 +206,7 @@ function DetailDataHistori({
             {data?.length > 0 ? (
               data?.map((item: any, index: number) => (
                 <Table.Tr key={index}>
-                  <Table.Td>{item.noPengaduan}</Table.Td>
+                  <Table.Td w={"180"}>{item.noPengaduan}</Table.Td>
                   <Table.Td>
                     {kategori == "pengaduan" ? item.title : item.category}
                   </Table.Td>
@@ -121,11 +217,11 @@ function DetailDataHistori({
                       onClick={() => {
                         kategori == "pengaduan"
                           ? navigate(
-                              `/scr/dashboard/pengaduan/detail?id=${item.id}`,
+                            `/scr/dashboard/pengaduan/detail?id=${item.id}`,
-                            )
+                          )
                           : navigate(
-                              `/scr/dashboard/pelayanan-surat/detail-pelayanan?id=${item.id}`,
+                            `/scr/dashboard/pelayanan-surat/detail-pelayanan?id=${item.id}`,
-                            );
+                          );
                       }}
                     >
                       Detail
@@ -147,7 +243,33 @@ function DetailDataHistori({
   );
 }
 
-function DetailWarga({ data }: { data: any }) {
+function DetailWarga({ id }: { id: string }) {
+  const [data, setData] = useState<any>(null);
+
+  async function getWarga() {
+    try {
+      const res = await apiFetch.api.warga.detail.get({
+        query: {
+          id: id,
+          category: "warga",
+          page: "1",
+          search: "",
+        },
+      });
+      setData(res.data);
+    } catch (error) {
+      console.error(error);
+      notification({
+        title: "Failed",
+        message: "Failed to get data warga",
+        type: "error",
+      });
+    }
+  }
+
+  useShallowEffect(() => {
+    getWarga();
+  }, []);
   return (
     <Card
       radius="md"

src/server/lib/create-surat.ts

@@ -8,16 +8,19 @@ export async function createSurat({ idPengajuan, idCategory, idWarga, noSurat }:
             idCategory,
             idWarga,
             noSurat,
+         },
+         select: {
+            id: true
          }
       })
 
       if (!surat.id) {
-         return { success: false, message: 'gagal membuat surat' }
+         return { success: false, message: 'gagal membuat surat', idSurat: '' }
       }
 
-      return { success: true, message: 'surat sudah dibuat' }
+      return { success: true, message: 'surat sudah dibuat', idSurat: surat.id }
    } catch (error) {
-      console.log(error)
+      console.error(error)
       return { success: false, message: 'gagal membuat surat' }
    }
 

src/server/lib/seafile.ts

@@ -248,14 +248,23 @@ export async function moveFile(config: Config, oldName: string, newName: string)
    return `✏️  Renamed ${oldName} → ${newName}`
 }
 
-export async function downloadFile(config: Config, remoteFile: string, localFile?: string): Promise<string> {
+export async function downloadFile(config: Config, fileName: string, folder: string, localFile?: string): Promise<string> {
-   const localName = localFile || remoteFile;
+   const localName = localFile || fileName;
-   const downloadUrlResponse = await fetchWithAuth(config, `${config.URL}/${config.REPO}/file/?p=/${remoteFile}`);
+   // 🔹 gabungkan path folder + file
-   const downloadUrl = (await downloadUrlResponse.text()).replace(/"/g, '');
+   const filePath = `/${folder}/${fileName}`.replace(/\/+/g, "/");
 
+   // 🔹 encode path agar aman (spasi, dll)
+   const params = new URLSearchParams({
+      p: filePath,
+   });
+
+   const downloadUrlResponse = await fetchWithAuth(config, `${config.URL}/${config.REPO}/file/?${params.toString()}`);
+   if(!downloadUrlResponse.ok)
+      return 'gagal'
+   const downloadUrl = (await downloadUrlResponse.text()).replace(/"/g, '');
    const buffer = Buffer.from(await (await fetchWithAuth(config, downloadUrl)).arrayBuffer());
    await fs.writeFile(localName, buffer);
-   return `⬇️  Downloaded ${remoteFile} → ${localName}`
+   return `⬇️  Downloaded ${fileName} → ${localName}`
 }
 
 export async function getFileLink(config: Config, fileName: string): Promise<string> {

src/server/lib/stringToDate.ts

@@ -0,0 +1,11 @@
+import dayjs from "dayjs";
+import customParseFormat from "dayjs/plugin/customParseFormat";
+import "dayjs/locale/id";
+dayjs.extend(customParseFormat);
+
+export function parseTanggalID( value: string ): Date | null {
+   if (!value) return null;
+
+   const parsed = dayjs(value, "DD MMMM YYYY", "id", true);
+   return parsed.isValid() ? parsed.toDate() : null;
+}

src/server/routes/pelayanan_surat_route.ts

@@ -39,7 +39,7 @@ const PelayananRoute = new Elysia({
    }, {
       detail: {
          summary: "List Kategori Pelayanan Surat",
-         description: `tool untuk mendapatkan list kategori pelayanan surat beserta syaratnya untuk memenuhi syarat dokumen sesuai kategori yg dipilih saat melakukan pengajuan surat`,
+         description: `tool untuk mendapatkan list kategori pelayanan surat dan juga berisi link form pengajuan surat`,
          tags: ["mcp"]
       }
    })
@@ -265,6 +265,7 @@ const PelayananRoute = new Elysia({
          select: {
             id: true,
             idCategory: true,
+            file: true
          }
       })
 
@@ -307,9 +308,14 @@ const PelayananRoute = new Elysia({
       })
 
       const dataTextCategory = (data?.CategoryPelayanan?.dataPelengkap ?? []) as {
-         name: string;
+         type: string;
+         options?: {
+            label: string,
+            value: string
+         }[]; name: string;
          desc: string;
          key: string;
+         satuan?: string;
       }[];
 
       const refMap = new Map(
@@ -326,13 +332,18 @@ const PelayananRoute = new Elysia({
             return {
                id: item.id,
                jenis: nama,
+               key: ref?.key,
                value: item.value,
+               type: ref?.type ?? "",
+               options: ref?.options ?? [],
                order: ref?.order ?? Infinity,
+               satuan: ref?.satuan ?? null
             };
          })
          .sort((a, b) => a.order - b.order)
          .map(({ order, ...rest }) => rest); // hapus order
 
+
       const dataHistory = await prisma.historyPelayanan.findMany({
          where: {
             idPengajuanLayanan: data?.id,
@@ -348,6 +359,9 @@ const PelayananRoute = new Elysia({
                   name: true,
                }
             }
+         },
+         orderBy: {
+            createdAt: "desc"
          }
       })
 
@@ -377,6 +391,7 @@ const PelayananRoute = new Elysia({
          createdAt: data?.createdAt,
          updatedAt: data?.updatedAt,
          idSurat: dataSurat?.id,
+         fileSurat: dataSurat?.file,
       }
 
       const datafix = {
@@ -589,7 +604,10 @@ const PelayananRoute = new Elysia({
       const { nomerPengajuan } = body
       const data = await prisma.pelayananAjuan.findFirst({
          where: {
-            noPengajuan: nomerPengajuan
+            noPengajuan: {
+               equals: nomerPengajuan,
+               mode: "insensitive"
+            }
          },
          select: {
             id: true,
@@ -669,24 +687,34 @@ const PelayananRoute = new Elysia({
          name: string;
          desc: string;
          key: string;
+         required: boolean;
       }[];
 
       const dataSyaratFix = dataSyarat.map((item) => {
          const desc = syaratDokumen.find((v) => v.key == item.jenis)?.desc
          const name = syaratDokumen.find((v) => v.key == item.jenis)?.name
+         const required = syaratDokumen.find((v) => v.key == item.jenis)?.required
          return {
             id: item.id,
             key: item.jenis,
             value: item.value,
             name: name ?? '',
-            desc: desc ?? ''
+            desc: desc ?? '',
+            required: required ?? true
          }
       })
 
       const dataPelengkapList = (data?.CategoryPelayanan?.dataPelengkap ?? []) as {
+         type: string;
+         options?: {
+            label: string,
+            value: string
+         }[];
          name: string;
          desc: string;
          key: string;
+         required: boolean;
+         satuan?: string;
       }[];
 
       const refMap = new Map(
@@ -706,7 +734,11 @@ const PelayananRoute = new Elysia({
                value: item.value,
                desc: ref?.desc ?? "",
                name: ref?.name ?? "",
+               type: ref?.type ?? "",
+               options: ref?.options ?? [],
                order: ref?.order ?? Infinity,
+               required: ref?.required ?? true,
+               satuan: ref?.satuan ?? null
             };
          })
          .sort((a, b) => a.order - b.order)
@@ -731,6 +763,19 @@ const PelayananRoute = new Elysia({
          }
       })
 
+      const alasanDitolak = await prisma.historyPelayanan.findFirst({
+         where: {
+            idPengajuanLayanan: data?.id,
+            status: "ditolak"
+         },
+         select: {
+            keteranganAlasan: true,
+         },
+         orderBy: {
+            createdAt: "desc"
+         }
+      })
+
       const dataHistoryFix = dataHistory.map((item) => {
          return {
             id: item.id,
@@ -757,12 +802,14 @@ const PelayananRoute = new Elysia({
          createdAt: data?.createdAt,
          updatedAt: data?.updatedAt,
          idSurat: dataSurat?.id,
+         alasan: alasanDitolak?.keteranganAlasan,
       }
 
       const datafix = {
          success: true,
          message: 'sukses',
          pengajuan: dataPengajuan,
+         linkUpdate: `${process.env.BUN_PUBLIC_BASE_URL}/darmasaba/update-data-surat?pengajuan=${data.noPengajuan}`,
          history: dataHistoryFix,
          warga: warga,
          syaratDokumen: dataSyaratFix,
@@ -805,9 +852,14 @@ const PelayananRoute = new Elysia({
       })
 
       if (!pengajuan) {
-         return { success: false, message: 'gagal update status pengajuan surat' }
+         return { success: false, message: 'gagal update status pengajuan surat', linkUpdate: '', idSurat: '' }
       }
 
+      const dataPengajuan = await prisma.pelayananAjuan.findUnique({
+         where: { id: pengajuan.id },
+         select: { noPengajuan: true }
+      });
+
       if (status === "diterima") {
          deskripsi = "Pengajuan surat diterima"
       } else if (status === "ditolak") {
@@ -826,11 +878,19 @@ const PelayananRoute = new Elysia({
          }
       })
 
+
+      let idSurat = "";
       if (status === "selesai") {
-         await createSurat({ idPengajuan: pengajuan.id, idCategory: pengajuan.idCategory, idWarga: pengajuan.idWarga, noSurat })
+         const result = await createSurat({ idPengajuan: pengajuan.id, idCategory: pengajuan.idCategory, idWarga: pengajuan.idWarga, noSurat })
+         idSurat = result.idSurat ?? "";
       }
 
-      return { success: true, message: 'pengajuan surat sudah diperbarui' }
+      return {
+         success: true,
+         message: 'pengajuan surat sudah diperbarui',
+         linkUpdate: status == "ditolak" ? `${process.env.BUN_PUBLIC_BASE_URL}/darmasaba/update-data-surat?pengajuan=${dataPengajuan?.noPengajuan}` : '',
+         idSurat: idSurat,
+      }
    }, {
       body: t.Object({
          id: t.String({ minLength: 1, error: "id harus diisi" }),
@@ -1006,6 +1066,73 @@ const PelayananRoute = new Elysia({
          description: `tool untuk update data pengajuan pelayanan surat`,
       }
    })
+   .post("/update-data-pelengkap", async ({ body }) => {
+      const { id, value, jenis, idUser } = body
+
+      const dataPelengkap = await prisma.dataTextPelayanan.findUnique({
+         where: {
+            id
+         },
+         select: {
+            idPengajuanLayanan: true,
+            PelayananAjuan: {
+               select: {
+                  status: true
+               }
+            }
+         }
+
+      })
+
+      if (!dataPelengkap) {
+         return { success: false, message: 'data pelengkap surat tidak ditemukan' }
+      }
+
+      const upd = await prisma.dataTextPelayanan.update({
+         where: {
+            id
+         },
+         data: {
+            value: value,
+         }
+      })
+
+      const history = await prisma.historyPelayanan.create({
+         data: {
+            idPengajuanLayanan: dataPelengkap.idPengajuanLayanan,
+            deskripsi: `Pengajuan surat diupdate oleh user (data yg diupdate: ${jenis})`,
+            status: dataPelengkap.PelayananAjuan.status,
+            idUser
+         }
+      })
+
+
+      return { success: true, message: 'data pelengkap surat sudah diperbarui' }
+
+   }, {
+      body: t.Object({
+         id: t.String({
+            error: "id harus diisi",
+            description: "ID yang ingin diupdate"
+         }),
+         value: t.String({
+            error: "value harus diisi",
+            description: "Value yang ingin diupdate"
+         }),
+         jenis: t.String({
+            error: "jenis harus diisi",
+            description: "Jenis data yang ingin diupdate"
+         }),
+         idUser: t.String({
+            error: "idUser harus diisi",
+            description: "ID user yang melakukan update"
+         })
+      }),
+      detail: {
+         summary: "Update Data Pelengkap Pengajuan Pelayanan Surat oleh user admin",
+         description: `tool untuk update data pelengkap pengajuan pelayanan surat oleh user admin`,
+      }
+   })
    .get("/list", async ({ query }) => {
       const { take, page, search, status } = query
       const skip = !page ? 0 : (Number(page) - 1) * (!take ? 10 : Number(take))

src/server/routes/pengaduan_route.ts

@@ -1,14 +1,16 @@
-import Elysia, { t } from "elysia"
+import Elysia, { t } from "elysia";
-import type { StatusPengaduan } from "generated/prisma"
+import fs from 'fs';
-import _ from "lodash"
+import type { StatusPengaduan } from "generated/prisma";
-import { v4 as uuidv4 } from "uuid"
+import _ from "lodash";
-import { getLastUpdated } from "../lib/get-last-updated"
+import path from "path";
-import { mimeToExtension } from "../lib/mimetypeToExtension"
+import { v4 as uuidv4 } from "uuid";
-import { generateNoPengaduan } from "../lib/no-pengaduan"
+import { getLastUpdated } from "../lib/get-last-updated";
-import { isValidPhone, normalizePhoneNumber } from "../lib/normalizePhone"
+import { mimeToExtension } from "../lib/mimetypeToExtension";
-import { prisma } from "../lib/prisma"
+import { generateNoPengaduan } from "../lib/no-pengaduan";
-import { renameFile } from "../lib/rename-file"
+import { isValidPhone, normalizePhoneNumber } from "../lib/normalizePhone";
-import { catFile, defaultConfigSF, removeFile, uploadFile, uploadFileToFolder } from "../lib/seafile"
+import { prisma } from "../lib/prisma";
+import { renameFile } from "../lib/rename-file";
+import { catFile, defaultConfigSF, downloadFile, removeFile, uploadFile, uploadFileToFolder } from "../lib/seafile";
 
 const PengaduanRoute = new Elysia({
    prefix: "pengaduan",
@@ -415,7 +417,7 @@ const PengaduanRoute = new Elysia({
          const datafix = {
             pengaduan: {},
             history: [],
-            warga: {},
+            warga: null,
          }
 
          return datafix
@@ -436,6 +438,9 @@ const PengaduanRoute = new Elysia({
                   name: true,
                }
             }
+         },
+         orderBy: {
+            createdAt: "desc"
          }
       })
 
@@ -602,6 +607,43 @@ const PengaduanRoute = new Elysia({
          consumes: ["multipart/form-data"]
       },
    })
+   .get("/download", async ({ query, set }) => {
+      const { file, folder } = query;
+
+      // Validasi file
+      if (!file) {
+         return { success: false, message: "File tidak ditemukan" };
+      }
+
+      // if (!folder) {
+      //    return { success: false, message: "Folder tidak ditemukan" };
+      // }
+
+      const localPath = path.join("/tmp", file);
+
+      // Upload ke Seafile (pastikan uploadFile menerima Blob atau ArrayBuffer)
+      // const buffer = await file.arrayBuffer();
+      const result = await downloadFile(defaultConfigSF, file, 'surat', localPath);
+
+      if(result=="gagal") {
+         return { success: false, message: "Download gagal" };
+      }
+
+      set.headers["Content-Type"] = "application/pdf";
+      set.headers["Content-Disposition"] = `attachment; filename="${file}"`;
+
+      // 🔹 kirim file ke browser
+      return fs.createReadStream(localPath);
+   }, {
+      body: t.Object({
+         file: t.Any(),
+         folder: t.String(),
+      }),
+      detail: {
+         summary: "Download Surat",
+         description: "Tool untuk download surat dari Seafile",
+      },
+   })
    .post("/upload-file-form-data", async ({ body }) => {
       const { file } = body;
 

src/server/routes/send_wa_route.ts

@@ -0,0 +1,153 @@
+import Elysia, { t } from "elysia";
+
+const SendWaRoute = new Elysia({
+   prefix: "send-wa",
+   tags: ["send-wa"],
+})
+
+   // --- KATEGORI PENGADUAN ---
+   .post("/pengaduan", async ({ body }) => {
+      const { noPengaduan, judulPengaduan, status, alasan, tlp } = body
+
+      let text = ""
+
+      if (status === "ditolak") {
+         text = `Pemberitahuan Aduan
+
+Aduan dengan Nomor Pengaduan: ${noPengaduan}
+Judul Pengaduan: ${judulPengaduan}
+Kami informasikan bahwa aduan tersebut tidak dapat ditindaklanjuti (ditolak).
+Alasan penolakan:${alasan}
+
+Terima kasih atas pengertian Bapak/Ibu.`
+      } else if (status == "diterima") {
+         text = `Pemberitahuan Aduan
+
+Aduan dengan Nomor Pengaduan: ${noPengaduan}
+Judul Pengaduan: ${judulPengaduan}
+Telah kami terima dan akan segera diproses sesuai ketentuan yang berlaku.
+
+Terima kasih atas laporan Bapak/Ibu.`
+      } else if (status == "dikerjakan") {
+         text = `Pemberitahuan Aduan
+
+Aduan dengan Nomor Pengaduan: ${noPengaduan}
+Judul Pengaduan: ${judulPengaduan}
+Saat ini sedang dalam proses penanganan oleh petugas terkait.
+
+Mohon menunggu informasi selanjutnya.`
+      } else if (status == "selesai") {
+         text = `Pemberitahuan Aduan
+
+Aduan dengan Nomor Pengaduan: ${noPengaduan}
+Judul Pengaduan: ${judulPengaduan}
+Telah selesai ditindaklanjuti.
+
+Terima kasih atas partisipasi dan kepercayaan Bapak/Ibu.`
+      }
+
+      const textFix = encodeURIComponent(text)
+
+      const res = await fetch(
+         `https://cld-dkr-prod-wajs-server.wibudev.com/api/wa/code?nom=${tlp}&text=${textFix}`,
+         {
+            cache: "no-cache",
+            headers: {
+               Authorization: `Bearer ${process.env.WA_SERVER_TOKEN}`,
+            },
+         }
+      );
+
+      if (res.status !== 200)
+         return { success: false, message: "Nomor Whatsapp Tidak Aktif" }
+
+
+      return { success: true, message: 'Pemberitahuan berhasil dikirim ke warga' }
+   }, {
+      body: t.Object({
+         noPengaduan: t.String({ minLength: 1, error: "nomer pengaduan harus diisi" }),
+         judulPengaduan: t.String({ minLength: 1, error: "judul pengaduan harus diisi" }),
+         status: t.String({ minLength: 1, error: "status harus diisi" }),
+         alasan: t.String({ optional: true }),
+         tlp: t.String({ minLength: 1, error: "nomor telepon harus diisi" }),
+      }),
+      detail: {
+         summary: "Send pemberitahuan pengaduan lewat WA",
+         description: `tool untuk send pemberitahuan pengaduan lewat WA`
+      }
+   })
+   .post("/pengajuan-surat", async ({ body }) => {
+      const { noPengajuan, jenisSurat, status, alasan, tlp, linkSurat, linkUpdate } = body
+
+      let text = ""
+
+      if (status === "ditolak") {
+         text = `Pemberitahuan Pengajuan Surat
+
+Nomor Pengajuan: ${noPengajuan}
+Surat: ${jenisSurat}
+Kami informasikan bahwa pengajuan surat tersebut tidak dapat diproses (ditolak).
+Alasan penolakan: ${alasan}
+
+Bapak/Ibu dapat melakukan perbaikan atau pembaruan data melalui tautan berikut:
+👉 ${linkUpdate}
+Setelah data diperbarui, pengajuan akan diproses kembali sesuai ketentuan yang berlaku.
+
+Terima kasih atas pengertian Bapak/Ibu.`
+      } else if (status == "diterima") {
+         text = `Pemberitahuan Pengajuan Surat
+
+Nomor Pengajuan: ${noPengajuan}
+Surat: ${jenisSurat}
+Kami informasikan bahwa pengajuan surat yang Bapak/Ibu ajukan telah kami terima dan sedang menunggu proses verifikasi serta penanganan lebih lanjut.
+
+Terima kasih atas kesabaran Bapak/Ibu.`
+      } else if (status == "selesai") {
+         text = `Pemberitahuan Pengajuan Surat
+
+Nomor Pengajuan: ${noPengajuan}
+Surat: ${jenisSurat}
+Kami informasikan bahwa pengajuan surat tersebut telah selesai diproses.
+
+Bapak/Ibu dapat mengunduh surat melalui tautan berikut:
+👉 ${linkSurat}
+
+Terima kasih atas kepercayaan Bapak/Ibu.`
+      }
+
+      const textFix = encodeURIComponent(text)
+
+
+      const res = await fetch(
+         `https://cld-dkr-prod-wajs-server.wibudev.com/api/wa/code?nom=${tlp}&text=${textFix}`,
+         {
+            cache: "no-cache",
+            headers: {
+               Authorization: `Bearer ${process.env.WA_SERVER_TOKEN}`,
+            },
+         }
+      );
+
+      if (res.status !== 200)
+         return { success: false, message: "Nomor Whatsapp Tidak Aktif" }
+
+
+      return { success: true, message: 'Pemberitahuan berhasil dikirim ke warga' }
+   }, {
+      body: t.Object({
+         noPengajuan: t.String({ minLength: 1, error: "nomer pengajuan harus diisi" }),
+         jenisSurat: t.String({ minLength: 1, error: "jenis surat harus diisi" }),
+         status: t.String({ minLength: 1, error: "status harus diisi" }),
+         alasan: t.String({ optional: true }),
+         linkSurat: t.String({ optional: true }),
+         linkUpdate: t.String({ optional: true }),
+         tlp: t.String({ minLength: 1, error: "nomor telepon harus diisi" }),
+      }),
+      detail: {
+         summary: "Send pemberitahuan pengajuan surat lewat WA",
+         description: `tool untuk send pemberitahuan pengajuan surat lewat WA`
+      }
+   })
+   ;
+
+export default SendWaRoute

src/server/routes/surat_route.ts

@@ -17,6 +17,7 @@ const SuratRoute = new Elysia({
             noSurat: true,
             idCategory: true,
             createdAt: true,
+            file: true,
             PelayananAjuan: {
                select: {
                   DataTextPelayanan: true,
@@ -44,6 +45,7 @@ const SuratRoute = new Elysia({
             idCategory: dataSurat?.idCategory,
             nameCategory: dataSurat?.CategoryPelayanan?.name,
             noSurat: dataSurat?.noSurat,
+            file: dataSurat?.file,
             dataText: dataSurat?.PelayananAjuan?.DataTextPelayanan,
             createdAt: dataSurat?.createdAt.toLocaleDateString("id-ID", { day: "numeric", month: "long", year: "numeric" }),
          },
@@ -60,6 +62,33 @@ const SuratRoute = new Elysia({
       }
 
    })
+   .post("/update", async ({ body }) => {
+      const { id, filename } = body
+
+      await prisma.suratPelayanan.update({
+         where: {
+            id,
+         },
+         data: {
+            file: filename,
+         }
+      })
+
+      return {
+         success: true,
+         message: 'surat sudah diperbarui',
+         link: `${process.env.BUN_PUBLIC_BASE_URL}/api/pengaduan/download?file=${filename}`
+      }
+   }, {
+      body: t.Object({
+         id: t.String({ minLength: 1, error: "id harus diisi" }),
+         filename: t.String({ minLength: 1, error: "filename harus diisi" }),
+      }),
+      detail: {
+         summary: "update file surat",
+         description: `tool untuk update file surat`
+      }
+   })
    ;
 
 export default SuratRoute

src/server/routes/warga_route.ts

@@ -97,68 +97,137 @@ const WargaRoute = new Elysia({
       }
    })
    .get("/detail", async ({ query }) => {
-      const { id } = query
+      const { id, category, search, page } = query
+      const skip = !page ? 0 : (Number(page) - 1) * 5
+
       const dataWarga = await prisma.warga.findUnique({
          where: {
             id
          }
       })
 
-      const dataPengaduan = await prisma.pengaduan.findMany({
+      if (!dataWarga)
-         orderBy: {
+         return { success: false, message: "data warga tidak ditemukan", data: null, totalPages: 1, totalRows: 0 }
-            createdAt: "desc"
+
-         },
+      if (category == "warga") {
-         where: {
+         return dataWarga
+      } else if (category == "pengaduan") {
+         const where: any = {
             isActive: true,
-            idWarga: id
+            idWarga: id,
-         },
+            OR: [
-         select: {
+               {
-            id: true,
+                  title: {
-            status: true,
+                     contains: search ?? "",
-            noPengaduan: true,
+                     mode: "insensitive"
-            title: true
+                  },
+               },
+               {
+                  noPengaduan: {
+                     contains: search ?? "",
+                     mode: "insensitive"
+                  },
+               }
+            ]
          }
-      })
 
+         const totalData = await prisma.pengaduan.count({
+            where
+         });
+         const dataPengaduan = await prisma.pengaduan.findMany({
+            skip,
+            take: 5,
+            orderBy: {
+               createdAt: "desc"
+            },
+            where,
+            select: {
+               id: true,
+               status: true,
+               noPengaduan: true,
+               title: true
+            }
+         })
 
+         const dataReturn = {
+            success: true,
+            message: "data pengaduan berhasil diambil",
+            data: dataPengaduan,
+            totalRows: totalData,
+            totalPages: Math.ceil(totalData / 5)
+         }
 
-      const dataPelayanan = await prisma.pelayananAjuan.findMany({
+         return dataReturn
-         orderBy: {
+      } else if (category == "pelayanan") {
-            createdAt: "desc"
+         const where: any = {
-         },
-         where: {
             isActive: true,
-            idWarga: id
+            idWarga: id,
-         },
+            OR: [
-         select: {
+               {
-            id: true,
+                  CategoryPelayanan: {
-            noPengajuan: true,
+                     name: {
-            status: true,
+                        contains: search ?? "",
-            CategoryPelayanan: {
+                        mode: "insensitive"
-               select: {
+                     },
-                  name: true
+                  },
+               },
+               {
+                  noPengajuan: {
+                     contains: search ?? "",
+                     mode: "insensitive"
+                  },
+               },
+            ]
+         }
+
+         const totalData = await prisma.pelayananAjuan.count({
+            where
+         });
+
+         const dataPelayanan = await prisma.pelayananAjuan.findMany({
+            skip,
+            take: 5,
+            orderBy: {
+               createdAt: "desc"
+            },
+            where,
+            select: {
+               id: true,
+               noPengajuan: true,
+               status: true,
+               CategoryPelayanan: {
+                  select: {
+                     name: true
+                  }
                }
             }
+         })
+
+         const dataPelayanFix = dataPelayanan.map((v: any) => ({
+            ..._.omit(v, ["CategoryPelayanan"]),
+            id: v.id,
+            noPengaduan: v.noPengajuan,
+            status: v.status,
+            category: v.CategoryPelayanan.name
+         }))
+
+         const dataReturn = {
+            success: true,
+            message: "data pelayanan berhasil diambil",
+            data: dataPelayanFix,
+            totalRows: totalData,
+            totalPages: Math.ceil(totalData / 5)
          }
-      })
 
-      const dataPelayanFix = dataPelayanan.map((v: any) => ({
+         return dataReturn
-         ..._.omit(v, ["CategoryPelayanan"]),
-         id: v.id,
-         noPengaduan: v.noPengajuan,
-         status: v.status,
-         category: v.CategoryPelayanan.name
-      }))
-
-      return {
-         warga: dataWarga,
-         pengaduan: dataPengaduan,
-         pelayanan: dataPelayanFix
       }
 
    }, {
       query: t.Object({
-         id: t.String({ minLength: 1, error: "id harus diisi" })
+         id: t.String({ minLength: 1, error: "id harus diisi" }),
+         category: t.String({ minLength: 1, error: "kategori harus diisi" }),
+         page: t.String({ optional: true }),
+         search: t.String({ optional: true }),
       }),
       detail: {
          summary: "Detail Warga",