diff --git a/src/app/admin/(dashboard)/_state/desa/berita.ts b/src/app/admin/(dashboard)/_state/desa/berita.ts
index 4782cde3..64245619 100644
--- a/src/app/admin/(dashboard)/_state/desa/berita.ts
+++ b/src/app/admin/(dashboard)/_state/desa/berita.ts
@@ -1,10 +1,11 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
 import { proxy } from "valtio";
 import { z } from "zod";
 
+// 1. Schema validasi dengan Zod
 const templateForm = z.object({
   judul: z.string().min(3, "Judul minimal 3 karakter"),
   deskripsi: z.string().min(3, "Deskripsi minimal 3 karakter"),
@@ -13,6 +14,16 @@ const templateForm = z.object({
   imageId: z.string().nonempty(),
 });
 
+// 2. Default value form berita (hindari uncontrolled input)
+const defaultForm = {
+  judul: "",
+  deskripsi: "",
+  imageId: "",
+  content: "",
+  kategoriBeritaId: "",
+};
+
+// 3. Kategori proxy
 const category = proxy({
   findMany: {
     data: null as
@@ -27,19 +38,10 @@ const category = proxy({
   },
 });
 
-type BeritaForm = Prisma.BeritaGetPayload<{
-  select: {
-    judul: true;
-    deskripsi: true;
-    imageId: true;
-    content: true;
-    kategoriBeritaId: true;
-  };
-}>;
-
+// 4. Berita proxy
 const berita = proxy({
   create: {
-    form: {} as BeritaForm,
+    form: { ...defaultForm }, // ✅ ini kunci fix-nya
     loading: false,
     async create() {
       const cek = templateForm.safeParse(berita.create.form);
@@ -49,6 +51,7 @@ const berita = proxy({
           .join("\n")}] required`;
         return toast.error(err);
       }
+
       try {
         berita.create.loading = true;
         const res = await ApiFetch.api.desa.berita["create"].post(
@@ -56,7 +59,7 @@ const berita = proxy({
         );
         if (res.status === 200) {
           berita.findMany.load();
-          return toast.success("succes create");
+          return toast.success("success create");
         }
 
         return toast.error("failed create");
@@ -66,28 +69,65 @@ const berita = proxy({
         berita.create.loading = false;
       }
     },
+    resetForm() {
+      berita.create.form = { ...defaultForm };
+    },
   },
+
   findMany: {
     data: null as
-      | Prisma.BeritaGetPayload<{ 
-        include: {
-          image: true,
-          kategoriBerita: true
-        }
-      }>[]
+      | Prisma.BeritaGetPayload<{
+          include: {
+            image: true;
+            kategoriBerita: true;
+          };
+        }>[]
       | null,
     async load() {
       const res = await ApiFetch.api.desa.berita["find-many"].get();
       if (res.status === 200) {
-        berita.findMany.data = (res.data?.data as any) ?? [];
+        berita.findMany.data = (res.data?.data ) ?? [];
       }
     },
   },
+  delete: {
+    loading: false,
+    async byId(id: string) {
+      if (!id) return toast.warn("ID tidak valid");
+
+      try {
+        berita.delete.loading = true;
+
+        const response = await fetch(`/api/desa/berita/delete/${id}`, {
+          method: 'DELETE',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        });
+        
+        const result = await response.json();
+        
+        if (response.ok && result?.success) {
+          toast.success(result.message || "Berita berhasil dihapus");
+          await berita.findMany.load(); // refresh list
+        } else {
+          toast.error(result?.message || "Gagal menghapus berita");
+        }
+      } catch (error) {
+        console.error("Gagal delete:", error);
+        toast.error("Terjadi kesalahan saat menghapus berita");
+      } finally {
+        berita.delete.loading = false;
+      }
+    },
+  },
+ 
 });
 
+// 5. State global
 const stateDashboardBerita = proxy({
   category,
   berita,
 });
 
-export default stateDashboardBerita;
\ No newline at end of file
+export default stateDashboardBerita;
diff --git a/src/app/admin/(dashboard)/desa/berita/_com/BeritaEditor.tsx b/src/app/admin/(dashboard)/desa/berita/_com/BeritaEditor.tsx
index c912c9d7..4efd681f 100644
--- a/src/app/admin/(dashboard)/desa/berita/_com/BeritaEditor.tsx
+++ b/src/app/admin/(dashboard)/desa/berita/_com/BeritaEditor.tsx
@@ -34,6 +34,7 @@ import { useEffect } from 'react';
         TextAlign.configure({ types: ['heading', 'paragraph'] }),
       ],
       content: '',
+      immediatelyRender: false
     });
   
     useEffect(() => {
diff --git a/src/app/admin/(dashboard)/desa/berita/page.tsx b/src/app/admin/(dashboard)/desa/berita/page.tsx
index 51a3ab45..af5f0801 100644
--- a/src/app/admin/(dashboard)/desa/berita/page.tsx
+++ b/src/app/admin/(dashboard)/desa/berita/page.tsx
@@ -1,16 +1,17 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 'use client'
-import { Box, Button, Center, FileInput, Group, Image, Paper, Select, SimpleGrid, Skeleton, Stack, Text, TextInput, Title } from '@mantine/core';
+import colors from '@/con/colors';
+import ApiFetch from '@/lib/api-fetch';
+import { ActionIcon, Box, Button, Center, FileInput, Flex, Image, Paper, Select, SimpleGrid, Skeleton, Stack, Text, TextInput, Title } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { Prisma } from '@prisma/client';
-import { IconImageInPicture } from '@tabler/icons-react';
+import { IconEdit, IconImageInPicture, IconX } from '@tabler/icons-react';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 import stateDashboardBerita from '../../_state/desa/berita';
 import { BeritaEditor } from './_com/BeritaEditor';
-import colors from '@/con/colors';
-import { useState } from 'react';
-import { toast } from 'react-toastify';
-import ApiFetch from '@/lib/api-fetch';
 
 function Page() {
   return (
@@ -175,32 +176,32 @@ function BeritaCreate() {
 
   return (
     <Box py={10}>
-      <Paper bg={colors["white-1"]} p={"md"} w={{base: "100%", md: "50%"}}>
+      <Paper bg={colors["white-1"]} p={"md"} w={{ base: "100%", md: "50%" }}>
         <Stack gap={"xs"}>
+          <TextInput
+            value={beritaState.berita.create.form.judul}
+            onChange={(val) => {
+              beritaState.berita.create.form.judul = val.target.value;
+            }}
+            label={<Text fz={"sm"} fw={"bold"}>Judul</Text>}
+            placeholder="masukkan judul"
+          />
           <SelectCategory
             onChange={(val) => {
               beritaState.berita.create.form.kategoriBeritaId = val.id;
             }}
           />
-          <TextInput
-            value={beritaState.berita.create.form.judul}
-            onChange={(val) => {
-              beritaState.berita.create.form.judul = val.target.value;
-            }}
-            label={"Judul"}
-            placeholder="masukkan judul"
-          />
           <TextInput
             value={beritaState.berita.create.form.deskripsi}
             onChange={(val) => {
               beritaState.berita.create.form.deskripsi = val.target.value;
             }}
-            label={"Deskripsi"}
+            label={<Text fz={"sm"} fw={"bold"}>Deskripsi</Text>}
             placeholder="masukkan deskripsi"
           />
 
           <FileInput
-            label="Upload Gambar"
+            label={<Text fz={"sm"} fw={"bold"}>Upload Gambar</Text>}
             value={file}
             onChange={async (e) => {
               if (!e) return;
@@ -218,12 +219,13 @@ function BeritaCreate() {
               <IconImageInPicture />
             </Center>
           )}
-
-          <BeritaEditor
-            showSubmit={false}
-            onEditorReady={(ed) => setEditorInstance(ed)}
-          />
-
+          <Box>
+            <Text fz={"sm"} fw={"bold"}>Konten</Text>
+            <BeritaEditor
+              showSubmit={false}
+              onEditorReady={(ed) => setEditorInstance(ed)}
+            />
+          </Box>
           <Button onClick={handleSubmit}>Simpan Berita</Button>
         </Stack>
       </Paper>
@@ -240,6 +242,10 @@ function BeritaList() {
     beritaState.berita.findMany.load()
   }, [])
 
+
+
+  const router = useRouter()
+
   if (!beritaState.berita.findMany.data) return <Stack py={10}>
     {Array.from({ length: 10 }).map((v, k) => <Skeleton key={k} h={40} />)}
   </Stack>
@@ -249,28 +255,41 @@ function BeritaList() {
         <Stack>
           <Text fz={"xl"} fw={"bold"}>List Berita</Text>
           <SimpleGrid cols={{ base: 1, md: 4 }}>
-          {beritaState.berita.findMany.data?.map((item) => (
-            <Paper key={item.id} bg={colors['BG-trans']} p={'md'}>
-            <Box >
-              <Text fw={"bold"} fz={"sm"}>
-                Kategori
-              </Text>
-              <Text>{item.kategoriBerita?.name}</Text>
-              <Text fw={"bold"} fz={"sm"}>
-                Judul
-              </Text>
-              <Text>{item.judul}</Text>
-              <Text lineClamp={1} fw={"bold"} fz={"sm"}>
-                Deskripsi
-              </Text>
-              <Text size='sm' lineClamp={2}>{item.deskripsi}</Text>
-              <Text fw={"bold"} fz={"sm"}>
-                Gambar
-              </Text>
-              <Image w={200} src={item.image?.link} alt="gambar" />
-            </Box>
-            </Paper>
-          ))}
+            {beritaState.berita.findMany.data?.map((item) => (
+              <Paper key={item.id} bg={colors['BG-trans']} p={'md'}>
+                <Box >
+                  <Flex justify="flex-end" mt={10}>
+                    <ActionIcon
+                      onClick={() => beritaState.berita.delete.byId(item.id)}
+                      disabled={beritaState.berita.delete.loading}
+                      color={colors['blue-button']} variant='transparent'>
+                      <IconX size={20} />
+                    </ActionIcon>
+                    <ActionIcon onClick={() => {
+                      router.push("/desa/berita/edit");
+                    }} color={colors['blue-button']} variant='transparent'>
+                      <IconEdit size={20} />
+                    </ActionIcon>
+                  </Flex>
+                  <Text fw={"bold"} fz={"sm"}>
+                    Kategori
+                  </Text>
+                  <Text>{item.kategoriBerita?.name}</Text>
+                  <Text fw={"bold"} fz={"sm"}>
+                    Judul
+                  </Text>
+                  <Text>{item.judul}</Text>
+                  <Text lineClamp={1} fw={"bold"} fz={"sm"}>
+                    Deskripsi
+                  </Text>
+                  <Text size='sm' lineClamp={2}>{item.deskripsi}</Text>
+                  <Text fw={"bold"} fz={"sm"}>
+                    Gambar
+                  </Text>
+                  <Image w={{ base: 100, md: 150 }} src={item.image?.link} alt="gambar" />
+                </Box>
+              </Paper>
+            ))}
           </SimpleGrid>
         </Stack>
       </Paper>
@@ -278,30 +297,71 @@ function BeritaList() {
   )
 }
 
-function SelectCategory({ onChange }: {
+function SelectCategory({
+  onChange,
+}: {
   onChange: (value: Prisma.KategoriBeritaGetPayload<{
     select: {
-      name: true,
-      id: true
-    }
-  }>) => void
+      name: true;
+      id: true;
+    };
+  }>) => void;
 }) {
-  const beritaState = useProxy(stateDashboardBerita)
-  useShallowEffect(() => {
-    beritaState.category.findMany.load()
-  }, [])
+  const categoryState = useProxy(stateDashboardBerita.category);
 
-  if (!beritaState.category.findMany.data) return <Skeleton h={40} />
-  return <Group>
-    <Select placeholder='pilih kategori' label={<Text fz={"sm"} fw={"bold"}>Pilih Kategori</Text>} data={beritaState.category.findMany.data.map((item) => ({
-      value: item.id,
-      label: item.name
-    }))} onChange={(v) => {
-      const data = beritaState.category.findMany.data?.find((item) => item.id === v)
-      if (!data) return
-      onChange(data)
-    }} />
-  </Group>
+  useShallowEffect(() => {
+    categoryState.findMany.load();
+  }, []);
+
+  if (!categoryState.findMany.data) {
+    return <Skeleton height={38} />;
+  }
+
+  return (
+    <Select
+      label={<Text fz={"sm"} fw={"bold"}>Kategori</Text>}
+      placeholder="Pilih kategori"
+      data={categoryState.findMany.data.map((item) => ({
+        label: item.name,
+        value: item.id,
+      }))}
+      onChange={(val) => {
+        const selected = categoryState.findMany.data?.find((item) => item.id === val);
+        if (selected) {
+          onChange(selected);
+        }
+      }}
+      searchable
+      nothingFoundMessage="Tidak ditemukan"
+    />
+  );
 }
 
+
+// function SelectCategory({ onChange }: {
+//   onChange: (value: Prisma.KategoriBeritaGetPayload<{
+//     select: {
+//       name: true,
+//       id: true
+//     }
+//   }>) => void
+// }) {
+//   const beritaState = useProxy(stateDashboardBerita)
+//   useShallowEffect(() => {
+//     beritaState.category.findMany.load()
+//   }, [])
+
+//   if (!beritaState.category.findMany.data) return <Skeleton h={40} />
+//   return <Group>
+//     <Select placeholder='pilih kategori' label={<Text fz={"sm"} fw={"bold"}>Pilih Kategori</Text>} data={beritaState.category.findMany.data.map((item) => ({
+//       value: item.id,
+//       label: item.name
+//     }))} onChange={(v) => {
+//       const data = beritaState.category.findMany.data?.find((item) => item.id === v)
+//       if (!data) return
+//       onChange(data)
+//     }} />
+//   </Group>
+// }
+
 export default Page;
diff --git a/src/app/api/[[...slugs]]/_lib/desa/berita/del.ts b/src/app/api/[[...slugs]]/_lib/desa/berita/del.ts
new file mode 100644
index 00000000..bb5df949
--- /dev/null
+++ b/src/app/api/[[...slugs]]/_lib/desa/berita/del.ts
@@ -0,0 +1,55 @@
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+import fs from "fs/promises";
+import path from "path";
+
+const beritaDelete = async (context: Context) => {
+  const id = context.params?.id as string;
+
+  if (!id) {
+    return {
+      status: 400,
+      body: "ID tidak diberikan",
+    };
+  }
+
+  const berita = await prisma.berita.findUnique({
+    where: { id },
+    include: {
+      image: true,
+      kategoriBerita: true, // pastikan relasi image sudah ada di prisma schema
+    },
+  });
+
+  if (!berita) {
+    return {
+      status: 404,
+      body: "Berita tidak ditemukan",
+    };
+  }
+
+  // Hapus file gambar dari filesystem jika ada
+  if (berita.image) {
+    try {
+      const filePath = path.join(berita.image.path, berita.image.name);
+      await fs.unlink(filePath);
+      await prisma.fileStorage.delete({
+        where: { id: berita.image.id },
+      });
+    } catch (err) {
+      console.error("Gagal hapus file image:", err);
+    }
+  }
+
+  // Hapus berita dari DB
+  await prisma.berita.delete({
+    where: { id },
+  });
+
+  return {
+    success: true,
+    message: "Berita dan file terkait berhasil dihapus",
+  };
+};
+
+export default beritaDelete;
diff --git a/src/app/api/[[...slugs]]/_lib/desa/berita/index.ts b/src/app/api/[[...slugs]]/_lib/desa/berita/index.ts
index cd8be88d..dace0724 100644
--- a/src/app/api/[[...slugs]]/_lib/desa/berita/index.ts
+++ b/src/app/api/[[...slugs]]/_lib/desa/berita/index.ts
@@ -2,6 +2,8 @@ import Elysia, { t } from "elysia";
 import kategoriBeritaFindMany from "./category";
 import beritaFindMany from "./find-many";
 import beritaCreate from "./create";
+import beritaDelete from "./del";
+import beritaUpdate from "./updt";
 
 const Berita = new Elysia({ prefix: "/berita", tags: ["Desa/Berita"] })
   .get("/category/find-many", kategoriBeritaFindMany)
@@ -14,6 +16,16 @@ const Berita = new Elysia({ prefix: "/berita", tags: ["Desa/Berita"] })
       content: t.String(),
       kategoriBeritaId: t.Union([t.String(), t.Null()]),
     }),
+  })
+  .delete("/delete/:id", beritaDelete)
+  .put("/update/:id", beritaUpdate, {
+    body: t.Object({
+      judul: t.String(),
+      deskripsi: t.String(),
+      imageId: t.String(),
+      content: t.String(),
+      kategoriBeritaId: t.Union([t.String(), t.Null()]),
+    }),
   });
 
 export default Berita;
diff --git a/src/app/api/[[...slugs]]/_lib/desa/berita/updt.ts b/src/app/api/[[...slugs]]/_lib/desa/berita/updt.ts
new file mode 100644
index 00000000..1d33a88b
--- /dev/null
+++ b/src/app/api/[[...slugs]]/_lib/desa/berita/updt.ts
@@ -0,0 +1,153 @@
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+import { Prisma } from "@prisma/client";
+import fs from "fs/promises";
+import path from "path";
+
+type FormUpdate = Prisma.BeritaGetPayload<{
+  select: {
+    id: true;
+    judul: true;
+    deskripsi: true;
+    content: true;
+    kategoriBeritaId: true;
+    imageId: true;
+  };
+}>;
+
+// async function beritaUpdate(context: Context) {
+//   const body = (await context.body) as FormUpdate;
+
+//   const {
+//     id,
+//     judul,
+//     deskripsi,
+//     content,
+//     kategoriBeritaId,
+//     imageId,
+//   } = body;
+
+//   if (!id) {
+//     return {
+//       status: 400,
+//       body: "ID tidak boleh kosong",
+//     };
+//   }
+
+//   const existing = await prisma.berita.findUnique({
+//     where: { id },
+//     include: {
+//       image: true,
+//     },
+//   });
+
+//   if (!existing) {
+//     return {
+//       status: 404,
+//       body: "Berita tidak ditemukan",
+//     };
+//   }
+
+//   // Cek jika imageId diubah
+//   if (existing.imageId && existing.imageId !== imageId) {
+//     const oldImage = existing.image;
+//     if (oldImage) {
+//       try {
+//         const filePath = path.join(oldImage.path, oldImage.name);
+//         await fs.unlink(filePath); // hapus file dari filesystem
+//         await prisma.fileStorage.delete({
+//           where: { id: oldImage.id }, // hapus record dari DB
+//         });
+//       } catch (err) {
+//         console.error("Gagal hapus gambar lama:", err);
+//       }
+//     }
+//   }
+
+//   const updated = await prisma.berita.update({
+//     where: { id },
+//     data: {
+//       judul,
+//       deskripsi,
+//       content,
+//       kategoriBeritaId,
+//       imageId,
+//     },
+//   });
+
+//   return {
+//     success: true,
+//     message: "Berita berhasil diupdate (gambar lama juga dihapus jika ada)",
+//     data: updated,
+//   };
+// }
+
+// export default beritaUpdate;
+
+
+async function beritaUpdate(context: Context) {
+    const id = context.params.id as string; // ambil dari URL
+    const body = (await context.body) as Omit<FormUpdate, "id">;
+  
+    const {
+      judul,
+      deskripsi,
+      content,
+      kategoriBeritaId,
+      imageId,
+    } = body;
+  
+    if (!id) {
+      return {
+        status: 400,
+        body: "ID tidak boleh kosong",
+      };
+    }
+  
+    const existing = await prisma.berita.findUnique({
+      where: { id },
+      include: {
+        image: true,
+      },
+    });
+  
+    if (!existing) {
+      return {
+        status: 404,
+        body: "Berita tidak ditemukan",
+      };
+    }
+  
+    if (existing.imageId && existing.imageId !== imageId) {
+      const oldImage = existing.image;
+      if (oldImage) {
+        try {
+          const filePath = path.join(oldImage.path, oldImage.name);
+          await fs.unlink(filePath);
+          await prisma.fileStorage.delete({
+            where: { id: oldImage.id },
+          });
+        } catch (err) {
+          console.error("Gagal hapus gambar lama:", err);
+        }
+      }
+    }
+  
+    const updated = await prisma.berita.update({
+      where: { id },
+      data: {
+        judul,
+        deskripsi,
+        content,
+        kategoriBeritaId,
+        imageId,
+      },
+    });
+  
+    return {
+      success: true,
+      message: "Berita berhasil diupdate",
+      data: updated,
+    };
+  }
+  export default beritaUpdate;
diff --git a/src/app/api/[[...slugs]]/_lib/fileStorage/_lib/del.ts b/src/app/api/[[...slugs]]/_lib/fileStorage/_lib/del.ts
new file mode 100644
index 00000000..65d1469a
--- /dev/null
+++ b/src/app/api/[[...slugs]]/_lib/fileStorage/_lib/del.ts
@@ -0,0 +1,60 @@
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+import fs from "fs/promises";
+import path from "path";
+
+const UPLOAD_DIR = process.env.WIBU_UPLOAD_DIR;
+
+const fileStorageDelete = async (context: Context) => {
+  const { params } = context;
+
+  const id = params?.id as string;
+
+  if (!id) {
+    return {
+      status: 400,
+      body: "ID file tidak ditemukan",
+    };
+  }
+
+  if (!UPLOAD_DIR) {
+    return {
+      status: 500,
+      body: "UPLOAD_DIR belum dikonfigurasi",
+    };
+  }
+
+  // Cek file dari database
+  const file = await prisma.fileStorage.findUnique({
+    where: { id },
+  });
+
+  if (!file) {
+    return {
+      status: 404,
+      body: "File tidak ditemukan di database",
+    };
+  }
+
+  const filePath = path.join(file.path, file.name);
+
+  try {
+    // Hapus file dari filesystem
+    await fs.unlink(filePath);
+  } catch (err) {
+    console.error("Gagal hapus file:", err);
+    // Tetap lanjutkan hapus dari database meskipun file fisik tidak ditemukan
+  }
+
+  // Hapus dari database
+  await prisma.fileStorage.delete({
+    where: { id },
+  });
+
+  return {
+    message: "File berhasil dihapus",
+    deletedId: id,
+  };
+};
+
+export default fileStorageDelete;
diff --git a/src/app/api/[[...slugs]]/_lib/fileStorage/index.ts b/src/app/api/[[...slugs]]/_lib/fileStorage/index.ts
index 5b98ad18..45adedf6 100644
--- a/src/app/api/[[...slugs]]/_lib/fileStorage/index.ts
+++ b/src/app/api/[[...slugs]]/_lib/fileStorage/index.ts
@@ -2,6 +2,7 @@ import Elysia, { t } from "elysia";
 import fileStorageCreate from "./_lib/create";
 import fileStorageFindUnique from "./_lib/findUniq";
 import { fileStorageFindMany } from "./_lib/findMany";
+import fileStorageDelete from "./_lib/del";
 
 const FileStorage = new Elysia({
   prefix: "/api/fileStorage",
@@ -14,6 +15,7 @@ const FileStorage = new Elysia({
     }),
   })
   .get("/findUnique/:name", fileStorageFindUnique)
-  .get("/findMany", fileStorageFindMany);
+  .get("/findMany", fileStorageFindMany)
+  .delete("/delete/:id", fileStorageDelete);
 
 export default FileStorage;