Fix Bug SubMenu Struktur PPID, SubMenu Struktur Organisasi BumDes

prisma/data/ekonomi/struktur-organisasi/hubungan-organisasi.json

@@ -1,8 +0,0 @@
-[
-  {
-    "id": "650e8400-e29b-41d4-a716-446655440001",
-    "atasanId": "550e8400-e29b-41d4-a716-446655440001", 
-    "bawahanId": "550e8400-e29b-41d4-a716-446655440002",
-    "tipe": "Langsung Melapor"
-  }
-]

prisma/data/ekonomi/struktur-organisasi/pegawai-bumdes.json

@@ -0,0 +1,91 @@
+[
+  {
+    "id": "cmgewz4gt000704ib91i3f169",
+    "namaLengkap": "Ida Bagus Surya Prabhawa Manuaba, S.H.,M.H., NL.P.",
+    "gelarAkademik": "S.H.,M.H.,NL.P.",
+    "tanggalMasuk": "2020-01-01T00:00:00.000Z",
+    "email": "bagus@desa.id",
+    "telepon": "081234567891",
+    "alamat": "Jl. Raya Desa No. 1",
+    "posisiId": "kepala_desa",
+    "isActive": true
+  },
+  {
+    "id": "cmgewxfvw000004ibee5013f4",
+    "namaLengkap": "I Ketut Suwanta",
+    "gelarAkademik": "S.Pt",
+    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
+    "email": "suwanta@desa.id",
+    "telepon": "081234567892",
+    "alamat": "Jl. Raya Desa No. 2",
+    "posisiId": "sekretaris_desa",
+    "isActive": true
+  },
+  {
+    "id": "cmgewxvqw000104ibgm5l8fzs",
+    "namaLengkap": "Ni Wayan Supardiati",
+    "gelarAkademik": "S.Pd",
+    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
+    "email": "supardiati@desa.id",
+    "telepon": "081234567892",
+    "alamat": "Jl. Raya Desa No. 2",
+    "posisiId": "kaur_keuangan",
+    "isActive": true
+  },
+  {
+    "id": "cmgewy1g9000204ib2n7hbx0i",
+    "namaLengkap": "I Wayan Agus Juni Artha Saputra",
+    "gelarAkademik": "S.T.",
+    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
+    "email": "agus@desa.id",
+    "telepon": "081234567892",
+    "alamat": "Jl. Raya Desa No. 2",
+    "posisiId": "kadus_banjar_dinas_menesa",
+    "isActive": true
+  },
+  {
+    "id": "cmgewybah000304ibgqhn1gm2",
+    "namaLengkap": "I Wayan Sueca",
+    "gelarAkademik": "S.H.",
+    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
+    "email": "sueca@desa.id",
+    "telepon": "081234567893",
+    "alamat": "Jl. Raya Desa No. 2",
+    "posisiId": "kadus_banjar_dinas_darmasaba",
+    "isActive": true
+  },
+  {
+    "id": "cmgewygqz000404ib20sv8nvg",
+    "namaLengkap": "Si Gede Ketut Astawa",
+    "gelarAkademik": "S.T.",
+    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
+    "email": "astawa@desa.id",
+    "telepon": "081234567893",
+    "alamat": "Jl. Raya Desa No. 2",
+    "posisiId": "kadus_banjar_dinas_bucu",
+    "isActive": true
+  },
+  {
+    "id": "cmgewyos1000504ibcu8o2gyk",
+    "namaLengkap": "I Kadek Arya Minarta",
+    "gelarAkademik": "S.T.",
+    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
+    "email": "minarta@desa.id",
+    "telepon": "081234567893",
+    "alamat": "Jl. Raya Desa No. 2",
+    "posisiId": "kadus_banjar_dinas_gulingan",
+    "isActive": true
+  },
+  {
+    "id": "cmgewyxk7000604ib8djs3i6c",
+    "namaLengkap": "I Gede Andika Pradnya Diputra",
+    "gelarAkademik": "S.E.",
+    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
+    "email": "diputra@desa.id",
+    "telepon": "081234567893",
+    "alamat": "Jl. Raya Desa No. 2",
+    "posisiId": "kadus_banjar_dinas_taman",
+    "isActive": true
+  }
+
+]

prisma/data/ekonomi/struktur-organisasi/pegawai.json

@@ -1,24 +0,0 @@
-[
-    {
-      "id": "550e8400-e29b-41d4-a716-446655440001",
-      "namaLengkap": "Budi Santoso",
-      "gelarAkademik": "S.IP",
-      "tanggalMasuk": "2020-01-01T00:00:00.000Z",
-      "email": "budi@desa.id",
-      "telepon": "081234567891",
-      "alamat": "Jl. Raya Desa No. 1",
-      "posisiId": "kepala_desa",
-      "isActive": true
-    },
-    {
-      "id": "550e8400-e29b-41d4-a716-446655440002",
-      "namaLengkap": "Ani Lestari",
-      "gelarAkademik": "S.Pd",
-      "tanggalMasuk": "2020-02-01T00:00:00.000Z",
-      "email": "ani@desa.id",
-      "telepon": "081234567892",
-      "alamat": "Jl. Raya Desa No. 2",
-      "posisiId": "sekretaris_desa",
-      "isActive": true
-    }
-  ]

prisma/data/ekonomi/struktur-organisasi/posisi-organisasi-bumdes.json

@@ -0,0 +1,159 @@
+[
+    [
+      {
+        "id": "kepala_desa",
+        "nama": "Kepala Desa",
+        "deskripsi": "Pemimpin desa Darmasaba",
+        "hierarki": 1,
+        "parentId": null
+      },
+      {
+        "id": "kepala_urusan",
+        "nama": "Kepala Urusan",
+        "deskripsi": "Pemimpin urusan desa Darmasaba",
+        "hierarki": 2,
+        "parentId": "kepala_desa"
+      },
+      {
+        "id": "sekretaris_desa",
+        "nama": "Sekretaris Desa",
+        "deskripsi": "Pengelola administrasi desa",
+        "hierarki": 2,
+        "parentId": "kepala_desa"
+      },
+      {
+        "id": "kaur_keuangan",
+        "nama": "Kaur Keuangan",
+        "deskripsi": "Pengelola keuangan desa",
+        "hierarki": 3,
+        "parentId": "kaur_umum"
+      },
+      {
+        "id": "kaur_perencanaan",
+        "nama": "Kaur Perencanaan",
+        "deskripsi": "Penyusun program kerja desa",
+        "hierarki": 3,
+        "parentId": "kaur_umum"
+      },
+      {
+        "id": "kaur_umum",
+        "nama": "Kaur Umum & TU",
+        "deskripsi": "Pelayanan umum dan administrasi",
+        "hierarki": 2,
+        "parentId": "kepala_desa"
+      },
+      {
+        "id": "kasi_pemerintahan",
+        "nama": "Kasi Pemerintahan",
+        "deskripsi": "Urusan pemerintahan dan keamanan",
+        "hierarki": 2,
+        "parentId": "kepala_desa"
+      },
+      {
+        "id": "kasi_pelayanan",
+        "nama": "Kasi Pelayanan",
+        "deskripsi": "Urusan pelayanan masyarakat",
+        "hierarki": 2,
+        "parentId": "kepala_desa"
+      },
+      {
+        "id": "kasi_kesejahteraan",
+        "nama": "Kasi Kesejahteraan",
+        "deskripsi": "Urusan sosial dan kesejahteraan",
+        "hierarki": 2,
+        "parentId": "kepala_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_cabe",
+        "nama": "Kepala Dusun Banjar Dinas Cabe",
+        "deskripsi": "Pimpinan wilayah Banjar Dinas Cabe",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_menesa",
+        "nama": "Kepala Dusun Banjar Dinas Menesa",
+        "deskripsi": "Pimpinan wilayah Banjar Menesa",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_penenjoan",
+        "nama": "Kepala Dusun Banjar Dinas Penenjoan",
+        "deskripsi": "Pimpinan wilayah Banjar Dinas Penenjoan",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_telanga",
+        "nama": "Kepala Dusun Banjar Dinas Telanga",
+        "deskripsi": "Pimpinan wilayah Banjar Dinas Telanga",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_tengah",
+        "nama": "Kepala Dusun Banjar Dinas Tengah",
+        "deskripsi": "Pimpinan wilayah Banjar Dinas Tengah",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_baler_pasar",
+        "nama": "Kepala Dusun Banjar Dinas Baler Pasar",
+        "deskripsi": "Pimpinan wilayah Banjar Dinas Baler Pasar",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_bucu",
+        "nama": "Kepala Dusun Banjar Dinas Bucu",
+        "deskripsi": "Pimpinan wilayah Banjar Dinas Bucu",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_gulingan",
+        "nama": "Kepala Dusun Banjar Dinas Gulingan",
+        "deskripsi": "Pimpinan wilayah Banjar Dinas Gulingan",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_bersih",
+        "nama": "Kepala Dusun Banjar Dinas Bersih",
+        "deskripsi": "Pimpinan wilayah Banjar Dinas Bersih",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_umahanyar",
+        "nama": "Kepala Dusun Banjar Dinas Umahanyar",
+        "deskripsi": "Pimpinan wilayah Banjar Dinas Umahanyar",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_taman",
+        "nama": "Kepala Dusun Banjar Dinas Taman",
+        "deskripsi": "Pimpinan wilayah Banjar Dinas Taman",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "kadus_banjar_dinas_darmasaba",
+        "nama": "Kepala Dusun Banjar Dinas Darmasaba",
+        "deskripsi": "Pimpinan wilayah Banjar Dinas Darmasaba",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      },
+      {
+        "id": "staf_desa",
+        "nama": "Staf Desa",
+        "deskripsi": "Staf Desa",
+        "hierarki": 3,
+        "parentId": "sekretaris_desa"
+      }
+    ]
+  ]
+  

prisma/data/ekonomi/struktur-organisasi/posisi-organisasi.json

@@ -1,27 +0,0 @@
-[
-    {
-        "id": "kepala_desa",
-        "nama": "Kepala Desa",
-        "deskripsi": "Kepala Desa",
-        "hierarki": 1
-    },
-    {
-        "id": "sekretaris_desa",
-        "nama": "Sekretaris Desa",
-        "deskripsi": "Sekretaris Desa",
-        "hierarki": 2
-    },
-    {
-        "id": "bendahara_desa",
-        "nama": "Bendahara Desa",
-        "deskripsi": "Bendahara Desa",
-        "hierarki": 3
-    },
-    {
-        "id": "staff_umum",
-        "nama": "Staff Umum",
-        "deskripsi": "Staff Umum",
-        "hierarki": 4
-    }
- ]
- 

prisma/data/ppid/struktur-ppid/pegawai-PPID.json

@@ -1,6 +1,6 @@
 [
     {
-      "id": "550e8400-e29b-41d4-a716-446655440001",
+      "id": "cmgewz4gt000704ib91i3f169",
       "namaLengkap": "Ida Bagus Surya Prabhawa Manuaba, S.H.,M.H., NL.P.",
       "gelarAkademik": "S.H.,M.H.,NL.P.",
       "tanggalMasuk": "2020-01-01T00:00:00.000Z",
@@ -11,7 +11,7 @@
       "isActive": true
     },
     {
-      "id": "550e8400-e29b-41d4-a716-446655440002",
+      "id": "cmgewxfvw000004ibee5013f4",
       "namaLengkap": "I Ketut Suwanta",
       "gelarAkademik": "S.Pt",
       "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -22,7 +22,7 @@
       "isActive": true
     },
     {
-      "id": "550e8400-e29b-41d4-a716-446655440006",
+      "id": "cmgewxvqw000104ibgm5l8fzs",
       "namaLengkap": "Ni Wayan Supardiati",
       "gelarAkademik": "S.Pd",
       "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -33,7 +33,7 @@
       "isActive": true
     },
     {
-      "id": "550e8400-e29b-41d4-a716-446655440011",
+      "id": "cmgewy1g9000204ib2n7hbx0i",
       "namaLengkap": "I Wayan Agus Juni Artha Saputra",
       "gelarAkademik": "S.T.",
       "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -44,7 +44,7 @@
       "isActive": true
     },
     {
-      "id": "550e8400-e29b-41d4-a716-446655440012",
+      "id": "cmgewybah000304ibgqhn1gm2",
       "namaLengkap": "I Wayan Sueca",
       "gelarAkademik": "S.H.",
       "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -55,7 +55,7 @@
       "isActive": true
     },
     {
-      "id": "550e8400-e29b-41d4-a716-446655440017",
+      "id": "cmgewygqz000404ib20sv8nvg",
       "namaLengkap": "Si Gede Ketut Astawa",
       "gelarAkademik": "S.T.",
       "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -66,7 +66,7 @@
       "isActive": true
     },
     {
-      "id": "550e8400-e29b-41d4-a716-446655440018",
+      "id": "cmgewyos1000504ibcu8o2gyk",
       "namaLengkap": "I Kadek Arya Minarta",
       "gelarAkademik": "S.T.",
       "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -77,7 +77,7 @@
       "isActive": true
     },
     {
-      "id": "550e8400-e29b-41d4-a716-446655440021",
+      "id": "cmgewyxk7000604ib8djs3i6c",
       "namaLengkap": "I Gede Andika Pradnya Diputra",
       "gelarAkademik": "S.E.",
       "tanggalMasuk": "2020-02-01T00:00:00.000Z",

prisma/schema.prisma

@@ -81,7 +81,7 @@ model FileStorage {
   PelayananSuratKeteranganImage  PelayananSuratKeterangan[] @relation("PelayananSuratKeteranganImage")
   PelayananSuratKeteranganImage2 PelayananSuratKeterangan[] @relation("PelayananSuratKeteranganImage2")
   PasarDesa                      PasarDesa[]
-  Pegawai                        Pegawai[]
+  PegawaiBumDes                  PegawaiBumDes[]
   DesaDigital                    DesaDigital[]
   InfoTekno                      InfoTekno[]
   PengaduanMasyarakat            PengaduanMasyarakat[]
@@ -101,6 +101,7 @@ model FileStorage {
   MitraKolaborasi MitraKolaborasi[]
 
   ArtikelKesehatan ArtikelKesehatan[]
+  StrukturBumDes   StrukturBumDes[]
 }
 
 //========================================= MENU LANDING PAGE ========================================= //
@@ -286,49 +287,51 @@ model StrukturPPID {
 }
 
 model PosisiOrganisasiPPID {
-  id                 String                 @id @default(cuid())
+  id                     String                   @id @default(cuid())
-  nama               String                 @db.VarChar(100)
+  nama                   String                   @db.VarChar(100)
-  deskripsi          String?                @db.Text
+  deskripsi              String?                  @db.Text
-  hierarki           Int
+  hierarki               Int
-  pegawai            PegawaiPPID[]
+  pegawai                PegawaiPPID[]
-  strukturOrganisasi StrukturPPID[] // Relasi balik
+  strukturOrganisasi     StrukturPPID[] // Relasi balik
-  parentId           String?
+  parentId               String?
-  isActive           Boolean                @default(true)
+  isActive               Boolean                  @default(true)
-  createdAt          DateTime               @default(now())
+  createdAt              DateTime                 @default(now())
-  updatedAt          DateTime               @updatedAt
+  updatedAt              DateTime                 @updatedAt
-  parent             PosisiOrganisasiPPID?  @relation("Parent", fields: [parentId], references: [id])
+  parent                 PosisiOrganisasiPPID?    @relation("Parent", fields: [parentId], references: [id])
-  children           PosisiOrganisasiPPID[] @relation("Parent")
+  children               PosisiOrganisasiPPID[]   @relation("Parent")
+  StrukturOrganisasiPPID StrukturOrganisasiPPID[]
 }
 
 model PegawaiPPID {
-  id                 String               @id @default(cuid())
+  id                     String                   @id @default(cuid())
-  namaLengkap        String               @db.VarChar(255)
+  namaLengkap            String                   @db.VarChar(255)
-  gelarAkademik      String?              @db.VarChar(100)
+  gelarAkademik          String?                  @db.VarChar(100)
-  image              FileStorage?         @relation(fields: [imageId], references: [id])
+  image                  FileStorage?             @relation(fields: [imageId], references: [id])
-  imageId            String?
+  imageId                String?
-  tanggalMasuk       DateTime?            @db.Date
+  tanggalMasuk           DateTime?                @db.Date
-  email              String?              @unique @db.VarChar(255)
+  email                  String?                  @unique @db.VarChar(255)
-  telepon            String?              @db.VarChar(20)
+  telepon                String?                  @db.VarChar(20)
-  alamat             String?              @db.Text
+  alamat                 String?                  @db.Text
-  posisiId           String               @db.VarChar(50)
+  posisiId               String                   @db.VarChar(50)
-  isActive           Boolean              @default(true)
+  isActive               Boolean                  @default(true)
-  createdAt          DateTime             @default(now())
+  createdAt              DateTime                 @default(now())
-  updatedAt          DateTime             @updatedAt
+  updatedAt              DateTime                 @updatedAt
-  posisi             PosisiOrganisasiPPID @relation(fields: [posisiId], references: [id])
+  posisi                 PosisiOrganisasiPPID     @relation(fields: [posisiId], references: [id])
-  strukturOrganisasi StrukturPPID[] // Relasi balik
+  strukturOrganisasi     StrukturPPID[] // Relasi balik
+  StrukturOrganisasiPPID StrukturOrganisasiPPID[]
 }
 
 model StrukturOrganisasiPPID {
-  id                   String           @id @default(uuid())
+  id                   String               @id @default(uuid())
-  posisiOrganisasiId   String           @db.VarChar(50)
+  posisiOrganisasiId   String               @db.VarChar(50)
-  pegawaiId            String           @db.Uuid
+  pegawaiId            String               
-  hubunganOrganisasiId String           @db.Uuid
+  hubunganOrganisasiId String               
-  posisiOrganisasi     PosisiOrganisasi @relation(fields: [posisiOrganisasiId], references: [id])
+  posisiOrganisasi     PosisiOrganisasiPPID @relation(fields: [posisiOrganisasiId], references: [id])
-  pegawai              Pegawai          @relation(fields: [pegawaiId], references: [id])
+  pegawai              PegawaiPPID          @relation(fields: [pegawaiId], references: [id])
-  createdAt            DateTime         @default(now())
+  createdAt            DateTime             @default(now())
-  updatedAt            DateTime         @updatedAt
+  updatedAt            DateTime             @updatedAt
   deletedAt            DateTime?
-  isActive             Boolean          @default(true)
+  isActive             Boolean              @default(true)
 }
 
 // ========================================= VISI MISI PPID ========================================= //
@@ -850,7 +853,7 @@ model JadwalKegiatan {
   syaratKetentuanJadwalKegiatanId String
   dokumenjadwalkegiatan           DokumenJadwalKegiatan         @relation(fields: [dokumenJadwalKegiatanId], references: [id])
   dokumenJadwalKegiatanId         String
-  pendaftaranjadwalkegiatan       PendaftaranJadwalKegiatan?     @relation(fields: [pendaftaranJadwalKegiatanId], references: [id])
+  pendaftaranjadwalkegiatan       PendaftaranJadwalKegiatan?    @relation(fields: [pendaftaranJadwalKegiatanId], references: [id])
   pendaftaranJadwalKegiatanId     String?
   createdAt                       DateTime                      @default(now())
   updatedAt                       DateTime                      @updatedAt
@@ -1394,79 +1397,67 @@ model LowonganPekerjaan {
 
 // ========================================= STRUKTUR ORGANISASI ========================================= //
 
-model PosisiOrganisasi {
+model StrukturBumDes {
-  id        String  @id @default(uuid()) @db.VarChar(50)
+  id                       String                  @id @default(cuid())
-  nama      String  @db.VarChar(100)
+  name                     String                  @db.Text
-  deskripsi String? @db.Text
+  image                    FileStorage?            @relation(fields: [imageId], references: [id])
-  hierarki  Int
+  imageId                  String?
-
+  createdAt                DateTime                @default(now())
-  pegawai                Pegawai[]
+  updatedAt                DateTime                @updatedAt
-  strukturOrganisasi     StrukturOrganisasi[] // Relasi balik
+  deletedAt                DateTime                @default(now())
-  StrukturOrganisasiPPID StrukturOrganisasiPPID[]
+  isActive                 Boolean                 @default(true)
-  isActive               Boolean                  @default(true)
+  PosisiOrganisasiBumDes   PosisiOrganisasiBumDes? @relation(fields: [posisiOrganisasiBumDesId], references: [id])
-  createdAt              DateTime                 @default(now())
+  posisiOrganisasiBumDesId String?
-  updatedAt              DateTime                 @updatedAt
+  PegawaiBumDes            PegawaiBumDes?          @relation(fields: [pegawaiBumDesId], references: [id])
-
+  pegawaiBumDesId          String?
-  @@map("posisi_organisasi")
 }
 
-model Pegawai {
+model PosisiOrganisasiBumDes {
-  id            String       @id @default(uuid()) @db.Uuid
+  id                       String                     @id @default(cuid())
-  namaLengkap   String       @db.VarChar(255)
+  nama                     String                     @db.VarChar(100)
-  gelarAkademik String?      @db.VarChar(100)
+  deskripsi                String?                    @db.Text
-  image         FileStorage? @relation(fields: [imageId], references: [id])
+  hierarki                 Int
-  imageId       String?
+  pegawai                  PegawaiBumDes[]
-  tanggalMasuk  DateTime?    @db.Date
+  strukturOrganisasi       StrukturBumDes[] // Relasi balik
-  email         String?      @unique @db.VarChar(255)
+  parentId                 String?
-  telepon       String?      @db.VarChar(20)
+  isActive                 Boolean                    @default(true)
-  alamat        String?      @db.Text
+  createdAt                DateTime                   @default(now())
-  posisiId      String       @db.VarChar(50)
+  updatedAt                DateTime                   @updatedAt
-  isActive      Boolean      @default(true)
+  parent                   PosisiOrganisasiBumDes?    @relation("Parent", fields: [parentId], references: [id])
-  createdAt     DateTime     @default(now())
+  children                 PosisiOrganisasiBumDes[]   @relation("Parent")
-  updatedAt     DateTime     @updatedAt
+  StrukturOrganisasiBumDes StrukturOrganisasiBumDes[]
-
-  posisi PosisiOrganisasi @relation(fields: [posisiId], references: [id])
-
-  sebagaiAtasan  HubunganOrganisasi[] @relation("AtasanToBawahan")
-  sebagaiBawahan HubunganOrganisasi[] @relation("BawahanToAtasan")
-
-  strukturOrganisasi     StrukturOrganisasi[] // Relasi balik
-  StrukturOrganisasiPPID StrukturOrganisasiPPID[]
-
-  @@map("pegawai")
 }
 
-model HubunganOrganisasi {
+model PegawaiBumDes {
-  id        String  @id @default(uuid()) @db.Uuid
+  id                       String                     @id @default(cuid())
-  atasanId  String  @db.Uuid
+  namaLengkap              String                     @db.VarChar(255)
-  bawahanId String  @db.Uuid
+  gelarAkademik            String?                    @db.VarChar(100)
-  tipe      String? @db.VarChar(50)
+  image                    FileStorage?               @relation(fields: [imageId], references: [id])
-
+  imageId                  String?
-  atasan  Pegawai @relation("AtasanToBawahan", fields: [atasanId], references: [id])
+  tanggalMasuk             DateTime?                  @db.Date
-  bawahan Pegawai @relation("BawahanToAtasan", fields: [bawahanId], references: [id])
+  email                    String?                    @unique @db.VarChar(255)
-
+  telepon                  String?                    @db.VarChar(20)
-  strukturOrganisasi StrukturOrganisasi[] // Relasi balik
+  alamat                   String?                    @db.Text
-
+  posisiId                 String                     @db.VarChar(50)
-  @@unique([atasanId, bawahanId])
+  isActive                 Boolean                    @default(true)
-  @@map("hubungan_organisasi")
+  createdAt                DateTime                   @default(now())
+  updatedAt                DateTime                   @updatedAt
+  posisi                   PosisiOrganisasiBumDes     @relation(fields: [posisiId], references: [id])
+  strukturOrganisasi       StrukturBumDes[] // Relasi balik
+  StrukturOrganisasiBumDes StrukturOrganisasiBumDes[]
 }
 
-model StrukturOrganisasi {
+model StrukturOrganisasiBumDes {
-  id                   String @id @default(uuid())
+  id                   String                 @id @default(uuid())
-  posisiOrganisasiId   String @db.VarChar(50)
+  posisiOrganisasiId   String                 @db.VarChar(50)
-  pegawaiId            String @db.Uuid
+  pegawaiId            String                 
-  hubunganOrganisasiId String @db.Uuid
+  hubunganOrganisasiId String                 
-
+  posisiOrganisasi     PosisiOrganisasiBumDes @relation(fields: [posisiOrganisasiId], references: [id])
-  posisiOrganisasi   PosisiOrganisasi   @relation(fields: [posisiOrganisasiId], references: [id])
+  pegawai              PegawaiBumDes          @relation(fields: [pegawaiId], references: [id])
-  pegawai            Pegawai            @relation(fields: [pegawaiId], references: [id])
+  createdAt            DateTime               @default(now())
-  hubunganOrganisasi HubunganOrganisasi @relation(fields: [hubunganOrganisasiId], references: [id])
+  updatedAt            DateTime               @updatedAt
-
+  deletedAt            DateTime?
-  createdAt DateTime  @default(now())
+  isActive             Boolean                @default(true)
-  updatedAt DateTime  @updatedAt
-  deletedAt DateTime?
-  isActive  Boolean   @default(true)
-
-  @@map("struktur_organisasi")
 }
 
 // ========================================= PROGRAM KEMISKINAN ========================================= //

prisma/seed.ts

@@ -31,9 +31,8 @@ import sejarahDesa from "./data/desa/profile/sejarah_desa.json";
 import visiMisiDesa from "./data/desa/profile/visi_misi_desa.json";
 import detailDataPengangguran from "./data/ekonomi/jumlah-pengangguran/detail-data-pengangguran.json";
 import kategoriProduk from "./data/ekonomi/pasar-desa/kategori-produk.json";
-import hubunganOrganisasi from "./data/ekonomi/struktur-organisasi/hubungan-organisasi.json";
+import pegawai from "./data/ekonomi/struktur-organisasi/pegawai-bumdes.json";
-import pegawai from "./data/ekonomi/struktur-organisasi/pegawai.json";
+import posisiOrganisasi from "./data/ekonomi/struktur-organisasi/posisi-organisasi-bumdes.json";
-import posisiOrganisasi from "./data/ekonomi/struktur-organisasi/posisi-organisasi.json";
 import kategoriBerita from "./data/kategori-berita.json";
 import contohEdukasiLingkungan from "./data/lingkungan/edukasi-lingkungan/contoh-kegiatan-di-desa-darmasaba.json";
 import materiEdukasiLingkungan from "./data/lingkungan/edukasi-lingkungan/materi-edukasi-yang-diberikan.json";
@@ -807,28 +806,34 @@ import { safeSeedUnique } from "./safeseedUnique";
   }
   console.log("kategori produk success ...");
 
-  for (const p of posisiOrganisasi) {
+  const flattenedPosisiBumdes = posisiOrganisasi.flat();
-    await prisma.posisiOrganisasi.upsert({
+
-      where: {
+  // ✅ Urutkan berdasarkan hierarki
-        id: p.id,
+  const sortedPosisiBumdes = flattenedPosisiBumdes.sort((a, b) => a.hierarki - b.hierarki);
-      },
+
-      update: {
+  for (const p of sortedPosisiBumdes) {
-        nama: p.nama,
+    console.log(`Seeding: ${p.nama} (id: ${p.id}, parent: ${p.parentId})`);
-        deskripsi: p.deskripsi,
+
-        hierarki: p.hierarki,
+    if (p.parentId) {
-      },
+      const parentExists = flattenedPosisi.some((pos) => pos.id === p.parentId);
-      create: {
+      if (!parentExists) {
-        id: p.id,
+        console.warn(
-        nama: p.nama,
+          `⚠️ Parent tidak ditemukan: ${p.parentId} untuk ${p.nama}`
-        deskripsi: p.deskripsi,
+        );
-        hierarki: p.hierarki,
+        continue;
-      },
+      }
+    }
+
+    await prisma.posisiOrganisasiBumDes.upsert({
+      where: { id: p.id },
+      update: p,
+      create: p,
     });
   }
-  console.log("posisi organisasi success ...");
+  console.log("posisi organisasi berhasil");
 
   for (const p of pegawai) {
-    await prisma.pegawai.upsert({
+    await prisma.pegawaiBumDes.upsert({
       where: {
         id: p.id,
       },
@@ -857,26 +862,6 @@ import { safeSeedUnique } from "./safeseedUnique";
   }
   console.log("pegawai success ...");
 
-  for (const p of hubunganOrganisasi) {
-    await prisma.hubunganOrganisasi.upsert({
-      where: {
-        atasanId_bawahanId: {
-          atasanId: p.atasanId,
-          bawahanId: p.bawahanId,
-        },
-      },
-      update: {
-        tipe: p.tipe,
-      },
-      create: {
-        atasanId: p.atasanId,
-        bawahanId: p.bawahanId,
-        tipe: p.tipe,
-      },
-    });
-  }
-  console.log("hubungan organisasi success ...");
-
   for (const d of detailDataPengangguran) {
     await prisma.detailDataPengangguran.upsert({
       where: {

src/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi.ts

@@ -1,9 +1,173 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { proxy } from "valtio";
-import { z } from "zod";
-import { toast } from "react-toastify";
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
+import { toast } from "react-toastify";
+import { proxy } from "valtio";
+import { z } from "zod";
+
+const templateForm = z.object({
+  name: z.string().min(3, "Nama minimal 3 karakter"),
+  imageId: z.string().min(1, "Gambar wajib dipilih"),
+});
+
+const defaultForm = {
+  name: "",
+  imageId: "",
+};
+
+type StrukturBumDesForm = Prisma.StrukturBumDesGetPayload<{
+  select: {
+    id: true;
+    name: true;
+    imageId: true;
+    image?: {
+      select: {
+        link: true;
+      };
+    };
+  };
+}>;
+
+const stateStruktur = proxy({
+  struktur: {
+    data: null as StrukturBumDesForm | null,
+    loading: false,
+    error: null as string | null,
+
+    async load(id: string) {
+      if (!id) {
+        toast.warn("ID tidak valid");
+        return null;
+      }
+
+      this.loading = true;
+      this.error = null;
+
+      try {
+        const response = await fetch(`/api/ekonomi/struktur-organisasi/${id}`);
+
+        if (!response.ok) {
+          throw new Error(`HTTP error! status: ${response.status}`);
+        }
+
+        const result = await response.json();
+
+        if (result.success) {
+          this.data = result.data;
+          return result.data;
+        } else {
+          throw new Error(result.message || "Gagal mengambil data struktur");
+        }
+      } catch (error) {
+        const errorMessage = (error as Error).message;
+        this.error = errorMessage;
+        console.error("Load struktur error:", errorMessage);
+        toast.error("Terjadi kesalahan saat mengambil data struktur");
+        return null;
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    reset() {
+      this.data = null;
+      this.error = null;
+      this.loading = false;
+    },
+  },
+
+  editStruktur: {
+    id: "",
+    form: { ...defaultForm },
+    loading: false,
+    error: null as string | null,
+    isReadOnly: false,
+
+    initialize(strukturData: StrukturBumDesForm) {
+      this.id = strukturData.id;
+      this.isReadOnly = false;
+      this.form = {
+        name: strukturData.name || "",
+        imageId: strukturData.imageId || "",
+      };
+    },
+
+    updateField(field: keyof typeof defaultForm, value: string) {
+      this.form[field] = value;
+    },
+
+    async submit() {
+      const validation = templateForm.safeParse(this.form);
+
+      if (!validation.success) {
+        const errors = validation.error.issues
+          .map((issue) => `${issue.path.join(".")}: ${issue.message}`)
+          .join(", ");
+        toast.error(`Form tidak valid: ${errors}`);
+        return false;
+      }
+
+      this.loading = true;
+      this.error = null;
+
+      try {
+        const response = await fetch(`/api/ekonomi/struktur-organisasi/${this.id}`, {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify(this.form),
+        });
+
+        if (!response.ok) {
+          const errorData = await response.json().catch(() => ({}));
+          throw new Error(
+            errorData.message || `HTTP error! status: ${response.status}`
+          );
+        }
+
+        const result = await response.json();
+
+        if (result.success) {
+          toast.success("Berhasil update struktur");
+          await stateStruktur.struktur.load(this.id);
+          return true;
+        } else {
+          throw new Error(result.message || "Gagal update struktur");
+        }
+      } catch (error) {
+        const errorMessage = (error as Error).message;
+        this.error = errorMessage;
+        console.error("Update struktur error:", errorMessage);
+        toast.error("Terjadi kesalahan saat update struktur");
+        return false;
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    reset() {
+      this.id = "";
+      this.form = { ...defaultForm };
+      this.error = null;
+      this.loading = false;
+      this.isReadOnly = false;
+    },
+  },
+
+  async loadForEdit(id: string) {
+    const strukturData = await this.struktur.load(id);
+    if (strukturData) {
+      this.editStruktur.initialize(strukturData);
+    }
+    return strukturData;
+  },
+
+  reset() {
+    this.struktur.reset();
+    this.editStruktur.reset();
+  },
+});
 
 const templatePosisiOrganisasi = z.object({
   nama: z.string().min(1, "Nama harus diisi"),
@@ -30,9 +194,7 @@ const posisiOrganisasi = proxy({
 
       try {
         this.loading = true;
-        const res = await ApiFetch.api.ekonomi["struktur-organisasi"][
+        const res = await ApiFetch.api.ekonomi['struktur-organisasi']['posisi-organisasi']['create'].post(this.form);
-          "posisi-organisasi"
-        ]["create"].post(this.form);
         if (res.status === 200) {
           toast.success("Berhasil menambahkan posisi organisasi");
           posisiOrganisasi.findMany.load();
@@ -52,6 +214,29 @@ const posisiOrganisasi = proxy({
     },
   },
 
+  findUnique: {
+    data: null as Prisma.StrukturOrganisasiBumDesGetPayload<{
+      omit: { isActive: true };
+    }> | null,
+    async load(id: string) {
+      try {
+        const res = await fetch(
+          `/api/ekonomi/struktur-organisasi/posisi-organisasi/${id}`
+        );
+        if (res.ok) {
+          const data = await res.json();
+          posisiOrganisasi.findUnique.data = data.data ?? null;
+        } else {
+          console.error("Failed to fetch posisiOrganisasi:", res.statusText);
+          posisiOrganisasi.findUnique.data = null;
+        }
+      } catch (error) {
+        console.error("Error fetching posisiOrganisasi:", error);
+        posisiOrganisasi.findUnique.data = null;
+      }
+    },
+  },
+
   edit: {
     id: "",
     form: { ...posisiOrganisasiDefaultForm },
@@ -165,17 +350,17 @@ const posisiOrganisasi = proxy({
     totalPages: 1,
     loading: false,
     search: "",
-    load: async (page = 1, limit = 10, search = "") => {
+    load: async (page = 1, limit?: number, search = "") => {
-      posisiOrganisasi.findMany.loading = true; // ✅ Akses langsung via nama path
+      const appliedLimit = limit ?? 10;
       posisiOrganisasi.findMany.page = page;
       posisiOrganisasi.findMany.search = search;
-  
+
       try {
-        const query: any = { page, limit };
+        const query: any = { page, limit: appliedLimit };
         if (search) query.search = search;
-    
+
-        const res = await ApiFetch.api.ekonomi["struktur-organisasi"]["posisi-organisasi"]["find-many"].get({ query });
+        const res = await ApiFetch.api.ekonomi['struktur-organisasi']['posisi-organisasi']['find-many'].get({ query });
-    
+
         if (res.status === 200 && res.data?.success) {
           posisiOrganisasi.findMany.data = res.data.data ?? [];
           posisiOrganisasi.findMany.totalPages = res.data.totalPages ?? 1;
@@ -192,7 +377,42 @@ const posisiOrganisasi = proxy({
       }
     },
   },
+  findManyAll: {
+    data: [] as Array<{
+      id: string;
+      nama: string;
+      deskripsi: string | null;
+      hierarki: number;
+    }>,
+    loading: false,
+    search: "",
+    load: async (search = "") => {
+      // Change to arrow function
+      posisiOrganisasi.findManyAll.loading = true; // Use the full path to access the property
+      posisiOrganisasi.findManyAll.search = search;
+      try {
+        const query: any = { search };
+        if (search) query.search = search;
 
+        const res = await ApiFetch.api.ekonomi['struktur-organisasi']['posisi-organisasi']['find-many-all'].get({
+          query,
+        });
+
+        if (res.status === 200 && res.data?.success) {
+          posisiOrganisasi.findManyAll.data = res.data.data || [];
+
+        } else {
+          console.error("Failed to load posisiOrganisasi:", res.data?.message);
+          posisiOrganisasi.findManyAll.data = [];
+        }
+      } catch (error) {
+        console.error("Error loading posisiOrganisasi:", error);
+        posisiOrganisasi.findManyAll.data = [];
+      } finally {
+        posisiOrganisasi.findManyAll.loading = false;
+      }
+    },
+  },
   delete: {
     loading: false,
     async byId(id: string) {
@@ -231,12 +451,12 @@ const posisiOrganisasi = proxy({
 
 const templatePegawai = z.object({
   namaLengkap: z.string().min(1, "Nama wajib diisi"),
-  gelarAkademik: z.string().optional(),
+  gelarAkademik: z.string().min(1, "Gelar Akademik wajib diisi"),
-  imageId: z.string().nullable().optional(),
+  imageId: z.string().min(1, "Gambar wajib dipilih"),
-  tanggalMasuk: z.string().optional(), // ISO format
+  tanggalMasuk: z.string().min(1, "Tanggal masuk wajib diisi"), // ISO format
   email: z.string().email("Email tidak valid").optional(),
-  telepon: z.string().optional(),
+  telepon: z.string().min(1, "Telepom wajib diisi"),
-  alamat: z.string().optional(),
+  alamat: z.string().min(1, "Alamat wajib diisi"),
   posisiId: z.string().min(1, "Posisi wajib diisi"),
   isActive: z.boolean().default(true),
 });
@@ -267,9 +487,9 @@ const pegawai = proxy({
 
       try {
         pegawai.create.loading = true;
-        const res = await ApiFetch.api.ekonomi["struktur-organisasi"][
+        const res = await ApiFetch.api.ekonomi['struktur-organisasi'].pegawai['create'].post(
-          "pegawai"
+          pegawai.create.form
-        ]["create"].post(pegawai.create.form);
+        );
         if (res.status === 200) {
           toast.success("Pegawai berhasil ditambahkan");
           await pegawai.findMany.load();
@@ -286,45 +506,56 @@ const pegawai = proxy({
   },
 
   // In struktur-organisasi.ts
-findMany: {
+  findMany: {
-  data: null as any[] | null,
+    data: null as
-  page: 1,
+      | Prisma.PegawaiBumDesGetPayload<{
-  totalPages: 1,
+          include: {
-  total: 0,
+            image: true;
-  loading: false,
+            posisi: true;
-  load: async (page = 1, limit = 10) => {  // Change to arrow function
+          };
-    pegawai.findMany.loading = true;  // Use the full path to access the property
+        }>[]
-    pegawai.findMany.page = page;
+      | null,
-    try {
+    page: 1,
-      const res = await ApiFetch.api.ekonomi["struktur-organisasi"][
+    totalPages: 1,
-        "pegawai"
+    total: 0,
-      ]["find-many"].get({
+    loading: false,
-        query: { page, limit },
+    search: "",
-      });
+    load: async (page = 1, limit = 10, search = "") => {
+      // Change to arrow function
+      pegawai.findMany.loading = true; // Use the full path to access the property
+      pegawai.findMany.page = page;
+      pegawai.findMany.search = search;
+      try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
 
-      if (res.status === 200 && res.data?.success) {
+        const res = await ApiFetch.api.ekonomi['struktur-organisasi'].pegawai['find-many'].get({
-        pegawai.findMany.data = res.data.data || [];
+          query,
-        pegawai.findMany.total = res.data.total || 0;
+        });
-        pegawai.findMany.totalPages = res.data.totalPages || 1;
+
-      } else {
+        if (res.status === 200 && res.data?.success) {
-        console.error("Failed to load pegawai:", res.data?.message);
+          pegawai.findMany.data = res.data.data || [];
+          pegawai.findMany.total = res.data.total || 0;
+          pegawai.findMany.totalPages = res.data.totalPages || 1;
+        } else {
+          console.error("Failed to load pegawai:", res.data?.message);
+          pegawai.findMany.data = [];
+          pegawai.findMany.total = 0;
+          pegawai.findMany.totalPages = 1;
+        }
+      } catch (error) {
+        console.error("Error loading pegawai:", error);
         pegawai.findMany.data = [];
         pegawai.findMany.total = 0;
         pegawai.findMany.totalPages = 1;
+      } finally {
+        pegawai.findMany.loading = false;
       }
-    } catch (error) {
+    },
-      console.error("Error loading pegawai:", error);
-      pegawai.findMany.data = [];
-      pegawai.findMany.total = 0;
-      pegawai.findMany.totalPages = 1;
-    } finally {
-      pegawai.findMany.loading = false;
-    }
   },
-},
   findUnique: {
     data: null as
-      | (Prisma.PegawaiGetPayload<{
+      | (Prisma.PegawaiBumDesGetPayload<{
           include: { posisi: true; image: true };
         }> & { isActive: boolean })
       | null,
@@ -350,12 +581,9 @@ findMany: {
       if (!id) return toast.warn("ID tidak valid");
       try {
         pegawai.delete.loading = true;
-        const res = await fetch(
+        const res = await fetch(`/api/ekonomi/struktur-organisasi/pegawai/del/${id}`, {
-          `/api/ekonomi/struktur-organisasi/pegawai/del/${id}`,
+          method: "DELETE",
-          {
+        });
-            method: "DELETE",
-          }
-        );
         const json = await res.json();
         if (res.ok) {
           toast.success(json.message ?? "Berhasil hapus pegawai");
@@ -372,6 +600,31 @@ findMany: {
     },
   },
 
+  nonActive: {
+    loading: false,
+    async byId(id: string) {
+      if (!id) return toast.warn("ID tidak valid");
+      try {
+        pegawai.nonActive.loading = true;
+        const res = await fetch(`/api/ekonomi/struktur-organisasi/pegawai/non-active/${id}`, {
+          method: "DELETE", // biasanya nonActive pakai PATCH
+        });
+        const json = await res.json();
+        if (res.ok) {
+          toast.success(json.message ?? "Pegawai berhasil dinonaktifkan");
+          await pegawai.findMany.load(); // refresh data
+        } else {
+          toast.error(json.message ?? "Gagal menonaktifkan pegawai");
+        }
+      } catch (error) {
+        console.error("Gagal nonActive:", error);
+        toast.error("Terjadi kesalahan saat menonaktifkan pegawai");
+      } finally {
+        pegawai.nonActive.loading = false;
+      }
+    },
+  },
+
   edit: {
     id: "",
     form: { ...pegawaiDefaultForm },
@@ -384,15 +637,12 @@ findMany: {
       }
 
       try {
-        const response = await fetch(
+        const response = await fetch(`/api/ekonomi/struktur-organisasi/pegawai/${id}`, {
-          `/api/ekonomi/struktur-organisasi/pegawai/${id}`,
+          method: "GET",
-          {
+          headers: {
-            method: "GET",
+            "Content-Type": "application/json",
-            headers: {
+          },
-              "Content-Type": "application/json",
+        });
-            },
-          }
-        );
 
         if (!response.ok) {
           throw new Error(`HTTP error! status: ${response.status}`);
@@ -503,299 +753,10 @@ findMany: {
   },
 });
 
-// Schema Zod untuk form validasi
+const stateStrukturBumDes = proxy({
-const templateHubunganOrganisasiForm = z.object({
+  stateStruktur,
-  atasanId: z.string().min(1, "Atasan wajib dipilih"),
-  bawahanId: z.string().min(1, "Bawahan wajib dipilih"),
-  tipe: z.string().optional(),
-});
-
-// Default form state
-const defaultHubunganOrganisasiForm = {
-  atasanId: "",
-  bawahanId: "",
-  tipe: "",
-};
-
-// ====================== STATE ===========================
-const hubunganOrganisasi = proxy({
-  create: {
-    form: { ...defaultHubunganOrganisasiForm },
-    loading: false,
-    async create() {
-      const cek = templateHubunganOrganisasiForm.safeParse(
-        hubunganOrganisasi.create.form
-      );
-      if (!cek.success) {
-        const err = `[${cek.error.issues
-          .map((v) => `${v.path.join(".")}: ${v.message}`)
-          .join("\n")}]`;
-        return toast.error(err);
-      }
-
-      try {
-        hubunganOrganisasi.create.loading = true;
-        const res = await ApiFetch.api.ekonomi["struktur-organisasi"][
-          "hubungan-organisasi"
-        ]["create"].post(hubunganOrganisasi.create.form);
-
-        if (res.status === 200 && res.data?.success) {
-          hubunganOrganisasi.findMany.load();
-          return toast.success("Berhasil menambahkan hubungan organisasi");
-        } else {
-          return toast.error(res.data?.message || "Gagal menambahkan data");
-        }
-      } catch (error) {
-        console.error("Gagal create:", error);
-        toast.error("Terjadi kesalahan saat menambahkan");
-      } finally {
-        hubunganOrganisasi.create.loading = false;
-      }
-    },
-  },
-  findMany: {
-    data: null as Array<{
-      id: string;
-      atasanId: string;
-      bawahanId: string;
-      tipe?: string | null;
-      atasan: {
-        id: string;
-        namaLengkap: string;
-        gelarAkademik: string | null;
-        imageId: string | null;
-        tanggalMasuk: Date | null;
-        email: string | null;
-        telepon: string | null;
-        alamat: string | null;
-        posisiId: string;
-        isActive: boolean;
-        createdAt: Date;
-        updatedAt: Date;
-      };
-      bawahan: {
-        id: string;
-        namaLengkap: string;
-        gelarAkademik: string | null;
-        imageId: string | null;
-        tanggalMasuk: Date | null;
-        email: string | null;
-        telepon: string | null;
-        alamat: string | null;
-        posisiId: string;
-        isActive: boolean;
-        createdAt: Date;
-        updatedAt: Date;
-      };
-    }> | null,
-
-    async load() {
-      try {
-        const res = await ApiFetch.api.ekonomi["struktur-organisasi"][
-          "hubungan-organisasi"
-        ]["find-many"].get();
-
-        if (res.status === 200) {
-          hubunganOrganisasi.findMany.data = (res.data?.data ?? []).map(
-            (item: any) => ({
-              ...item,
-              atasan: item.atasan
-                ? {
-                    ...item.atasan,
-                    isActive: item.atasan.isActive ?? item.atasan.aktif ?? true,
-                  }
-                : null,
-              bawahan: item.bawahan
-                ? {
-                    ...item.bawahan,
-                    isActive:
-                      item.bawahan.isActive ?? item.bawahan.aktif ?? true,
-                  }
-                : null,
-            })
-          );
-        } else {
-          hubunganOrganisasi.findMany.data = [];
-        }
-      } catch (error) {
-        console.error("Fetch list error:", error);
-        toast.error("Gagal memuat data hubungan organisasi");
-        hubunganOrganisasi.findMany.data = [];
-      }
-    },
-  },
-
-  findUnique: {
-    data: null as {
-      id: string;
-      atasanId: string;
-      bawahanId: string;
-      tipe?: string | null;
-      atasan?: {
-        id: string;
-        namaLengkap: string;
-        gelarAkademik: string | null;
-        imageId: string;
-        tanggalMasuk: Date | null;
-        email: string | null;
-        telepon: string | null;
-        alamat: string | null;
-        posisiId: string;
-        aktif: boolean;
-        createdAt: Date;
-        updatedAt: Date;
-      };
-      bawahan?: {
-        id: string;
-        namaLengkap: string;
-        gelarAkademik: string | null;
-        imageId: string;
-        tanggalMasuk: Date | null;
-        email: string | null;
-        telepon: string | null;
-        alamat: string | null;
-        posisiId: string;
-        aktif: boolean;
-        createdAt: Date;
-        updatedAt: Date;
-      };
-    } | null,
-
-    async load(id: string) {
-      try {
-        const res = await fetch(
-          `/api/ekonomi/struktur-organisasi/hubungan-organisasi/${id}`
-        );
-        const result = await res.json();
-
-        if (res.ok && result?.success) {
-          hubunganOrganisasi.findUnique.data = result.data;
-        } else {
-          hubunganOrganisasi.findUnique.data = null;
-          toast.error(result?.message || "Gagal mengambil data");
-        }
-      } catch (error) {
-        console.error("Find unique error:", error);
-        hubunganOrganisasi.findUnique.data = null;
-      }
-    },
-  },
-
-  edit: {
-    id: "",
-    form: { ...defaultHubunganOrganisasiForm },
-    loading: false,
-
-    async load(id: string) {
-      if (!id) return toast.warn("ID tidak valid");
-
-      try {
-        const res = await fetch(
-          `/api/ekonomi/struktur-organisasi/hubungan-organisasi/${id}`
-        );
-        const result = await res.json();
-
-        if (res.ok && result?.success) {
-          const data = result.data;
-          this.id = data.id;
-          this.form = {
-            atasanId: data.atasanId,
-            bawahanId: data.bawahanId,
-            tipe: data.tipe || "",
-          };
-          return data;
-        } else {
-          throw new Error(result?.message || "Gagal memuat data");
-        }
-      } catch (error) {
-        console.error("Error loading:", error);
-        toast.error(
-          error instanceof Error ? error.message : "Gagal memuat data"
-        );
-        return null;
-      }
-    },
-
-    async update() {
-      const cek = templateHubunganOrganisasiForm.safeParse(this.form);
-      if (!cek.success) {
-        const err = `[${cek.error.issues
-          .map((v) => `${v.path.join(".")}: ${v.message}`)
-          .join("\n")}]`;
-        return toast.error(err);
-      }
-
-      try {
-        this.loading = true;
-        const res = await fetch(
-          `/api/ekonomi/struktur-organisasi/hubungan-organisasi/${this.id}`,
-          {
-            method: "PUT",
-            headers: {
-              "Content-Type": "application/json",
-            },
-            body: JSON.stringify(this.form),
-          }
-        );
-
-        const result = await res.json();
-        if (res.ok && result.success) {
-          await hubunganOrganisasi.findMany.load();
-          toast.success("Berhasil mengupdate hubungan organisasi");
-          return true;
-        } else {
-          throw new Error(result?.message || "Gagal mengupdate");
-        }
-      } catch (error) {
-        console.error("Update error:", error);
-        toast.error(error instanceof Error ? error.message : "Gagal update");
-        return false;
-      } finally {
-        this.loading = false;
-      }
-    },
-
-    reset() {
-      hubunganOrganisasi.edit.id = "";
-      hubunganOrganisasi.edit.form = { ...defaultHubunganOrganisasiForm };
-    },
-  },
-
-  delete: {
-    loading: false,
-    async byId(id: string) {
-      if (!id) return toast.warn("ID tidak valid");
-
-      try {
-        hubunganOrganisasi.delete.loading = true;
-        const res = await fetch(
-          `/api/ekonomi/struktur-organisasi/hubungan-organisasi/del/${id}`,
-          {
-            method: "DELETE",
-          }
-        );
-
-        const result = await res.json();
-        if (res.ok && result?.success) {
-          toast.success("Hubungan organisasi berhasil dihapus");
-          hubunganOrganisasi.findMany.load();
-        } else {
-          toast.error(result?.message || "Gagal menghapus hubungan organisasi");
-        }
-      } catch (error) {
-        console.error("Delete error:", error);
-        toast.error("Terjadi kesalahan saat menghapus");
-      } finally {
-        hubunganOrganisasi.delete.loading = false;
-      }
-    },
-  },
-});
-
-const strukturorganisasiState = proxy({
   posisiOrganisasi,
   pegawai,
-  hubunganOrganisasi,
 });
 
-export default strukturorganisasiState;
+export default stateStrukturBumDes;

src/app/admin/(dashboard)/_state/ppid/struktur_ppid/struktur_PPID.ts

@@ -563,7 +563,7 @@ const pegawai = proxy({
   },
   findUnique: {
     data: null as
-      | (Prisma.PegawaiGetPayload<{
+      | (Prisma.PegawaiPPIDGetPayload<{
           include: { posisi: true; image: true };
         }> & { isActive: boolean })
       | null,

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/_lib/layoutTabs.tsx

@@ -2,6 +2,7 @@
 'use client'
 import colors from '@/con/colors';
 import {
+  ScrollArea,
   Stack,
   Tabs,
   TabsList,
@@ -9,28 +10,20 @@ import {
   TabsTab,
   Title,
   Tooltip,
-  ScrollArea,
 } from '@mantine/core';
+import {
+  IconBuildingCommunity,
+  IconHierarchy,
+  IconUsers
+} from '@tabler/icons-react';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
-import {
-  IconHierarchy,
-  IconUsers,
-  IconGitBranch,
-} from '@tabler/icons-react';
 
 function LayoutTabs({ children }: { children: React.ReactNode }) {
   const router = useRouter();
   const pathname = usePathname();
 
   const tabs = [
-    {
-      label: "Posisi Organisasi",
-      value: "posisiorganisasi",
-      href: "/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi",
-      icon: <IconHierarchy size={18} stroke={1.8} />,
-      tooltip: "Kelola daftar posisi organisasi",
-    },
     {
       label: "Pegawai",
       value: "pegawai",
@@ -39,12 +32,19 @@ function LayoutTabs({ children }: { children: React.ReactNode }) {
       tooltip: "Kelola data pegawai BUMDesa",
     },
     {
-      label: "Hubungan Organisasi",
+      label: "Posisi Organisasi",
-      value: "hubunganorganisasi",
+      value: "posisiorganisasi",
-      href: "/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/hubungan-organisasi",
+      href: "/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi",
-      icon: <IconGitBranch size={18} stroke={1.8} />,
+      icon: <IconHierarchy size={18} stroke={1.8} />,
-      tooltip: "Atur hubungan antar posisi organisasi",
+      tooltip: "Kelola daftar posisi organisasi",
     },
+    {
+      label: "Struktur Organisasi",
+      value: "strukturorganisasi",
+      href: "/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/struktur-organisasi",
+      icon: <IconBuildingCommunity size={18} stroke={1.8} />,
+      tooltip: "Kelola struktur organisasi BUMDesa"
+    }
   ];
 
   const currentTab = tabs.find((tab) => tab.href === pathname);

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/hubungan-organisasi/[id]/page.tsx

@@ -1,116 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-import { useParams, useRouter } from 'next/navigation';
-import { Box, Button, Paper, Select, Stack, TextInput, Title } from '@mantine/core';
-import { toast } from 'react-toastify';
-import { useProxy } from 'valtio/utils';
-import strukturorganisasiState from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
-
-export default function EditHubunganOrganisasi() {
-  const router = useRouter();
-  const { id } = useParams<{ id: string }>();
-  const state = useProxy(strukturorganisasiState.hubunganOrganisasi);
-  const pegawaiList = strukturorganisasiState.pegawai.findMany.data;
-
-  const [form, setForm] = useState({
-    atasanId: '',
-    bawahanId: '',
-    tipe: '',
-  });
-
-  // load data awal sekali aja
-  useEffect(() => {
-    strukturorganisasiState.pegawai.findMany.load();
-
-    if (id) {
-      (async () => {
-        const data = await state.edit.load(id);
-        if (data) {
-          setForm({
-            atasanId: data.atasanId ?? '',
-            bawahanId: data.bawahanId ?? '',
-            tipe: data.tipe ?? '',
-          });
-        }
-      })();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [id]);
-
-  const handleChange = (field: keyof typeof form, value: string) => {
-    setForm(prev => ({
-      ...prev,
-      [field]: value,
-    }));
-  };
-
-  const handleSubmit = async () => {
-    if (!form.atasanId || !form.bawahanId) {
-      toast.warn('Atasan dan bawahan harus diisi');
-      return;
-    }
-
-    // update global state cuma pas submit
-    state.edit.id = id;
-    state.edit.form = form;
-
-    const result = await state.edit.update();
-
-    if (result) {
-      toast.success('Data berhasil diperbarui');
-      router.push(
-        '/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/hubungan-organisasi'
-      );
-    }
-  };
-
-  return (
-    <Box>
-      <Paper p="md" w={{ base: '100%', md: '50%' }}>
-        <Stack>
-          <Title order={3}>Edit Hubungan Organisasi</Title>
-
-          <Select
-            label="Atasan"
-            placeholder="Pilih atasan"
-            searchable
-            data={
-              pegawaiList?.map(p => ({
-                value: p.id,
-                label: p.namaLengkap,
-              })) || []
-            }
-            value={form.atasanId}
-            onChange={val => handleChange('atasanId', val || '')}
-          />
-
-          <Select
-            label="Bawahan"
-            placeholder="Pilih bawahan"
-            searchable
-            data={
-              pegawaiList?.map(p => ({
-                value: p.id,
-                label: p.namaLengkap,
-              })) || []
-            }
-            value={form.bawahanId}
-            onChange={val => handleChange('bawahanId', val || '')}
-          />
-
-          <TextInput
-            label="Tipe"
-            placeholder="Contoh: langsung_melapor"
-            value={form.tipe}
-            onChange={e => handleChange('tipe', e.currentTarget.value)}
-          />
-
-          <Button onClick={handleSubmit} color="blue">
-            Simpan
-          </Button>
-        </Stack>
-      </Paper>
-    </Box>
-  );
-}

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/hubungan-organisasi/create/page.tsx

@@ -1,78 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-import { useRouter } from 'next/navigation';
-import { Box, Button, Paper, Select, Stack, TextInput, Title } from '@mantine/core';
-import { toast } from 'react-toastify';
-import { useProxy } from 'valtio/utils';
-import strukturorganisasiState from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
-
-export default function CreateHubunganOrganisasi() {
-  const router = useRouter();
-  const state = useProxy(strukturorganisasiState.hubunganOrganisasi);
-  const pegawaiList = strukturorganisasiState.pegawai.findMany.data;
-
-  const [form, setForm] = useState({
-    atasanId: '',
-    bawahanId: '',
-    tipe: '',
-  });
-
-  useEffect(() => {
-    strukturorganisasiState.pegawai.findMany.load();
-  }, []);
-
-  const handleSubmit = async () => {
-    if (!form.atasanId || !form.bawahanId) {
-      toast.warn("Atasan dan bawahan harus diisi");
-      return;
-    }
-
-    state.create.form = form;
-    const result = await state.create.create();
-
-    if (result) {
-      toast.success("Hubungan Organisasi berhasil ditambahkan");
-      router.push('/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/hubungan-organisasi');
-    }
-  };
-
-  return (
-    <Box>
-      <Paper p="md" w={{ base: '100%', md: '50%' }}>
-        <Stack>
-          <Title order={3}>Create Hubungan Organisasi</Title>
-          <Select
-            label="Atasan"
-            placeholder="Pilih atasan"
-            searchable
-            data={pegawaiList?.map(p => ({
-              value: p.id,
-              label: p.namaLengkap,
-            })) || []}
-            value={form.atasanId}
-            onChange={(val) => setForm({ ...form, atasanId: val || '' })}
-          />
-          <Select
-            label="Bawahan"
-            placeholder="Pilih bawahan"
-            searchable
-            data={pegawaiList?.map(p => ({
-              value: p.id,
-              label: p.namaLengkap,
-            })) || []}
-            value={form.bawahanId}
-            onChange={(val) => setForm({ ...form, bawahanId: val || '' })}
-          />
-          <TextInput
-            label="Tipe"
-            placeholder="Contoh: langsung_melapor"
-            defaultValue={form.tipe}
-            onChange={(e) => setForm({ ...form, tipe: e.currentTarget.value })}
-          />
-          <Button onClick={handleSubmit} color="blue">Simpan</Button>
-        </Stack>
-      </Paper>
-    </Box>
-  );
-}

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/hubungan-organisasi/page.tsx

@@ -1,130 +0,0 @@
-'use client'
-import colors from '@/con/colors';
-import { Box, Button, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr } from '@mantine/core';
-import { useShallowEffect } from '@mantine/hooks';
-import { IconEdit, IconSearch, IconTrash } from '@tabler/icons-react';
-import { useRouter } from 'next/navigation';
-import { useProxy } from 'valtio/utils';
-import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
-import strukturorganisasiState from '../../../_state/ekonomi/struktur-organisasi/struktur-organisasi';
-import { useState } from 'react';
-import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
-
-function HubunganOrganisasi() {
-  const [search, setSearch] = useState("");
-
-  return (
-    <Box>
-      <HeaderSearch
-        title='Hubungan Organisasi'
-        placeholder='pencarian'
-        searchIcon={<IconSearch size={20} />}
-        value={search}
-        onChange={(e) => setSearch(e.currentTarget.value)}
-      />
-      <ListHubunganOrganisasi search={search} />
-    </Box>
-  );
-}
-
-
-function ListHubunganOrganisasi({ search }: { search: string }) {
-  const stateOrganisasi = useProxy(strukturorganisasiState.hubunganOrganisasi);
-  const [modalHapus, setModalHapus] = useState(false);
-  const [selectedId, setSelectedId] = useState<string | null>(null);
-  const router = useRouter();
-
-  useShallowEffect(() => {
-    stateOrganisasi.findMany.load();
-  }, []);
-
-  const handleHapus = () => {
-    if (selectedId) {
-      stateOrganisasi.delete.byId(selectedId);
-      setModalHapus(false);
-      setSelectedId(null);
-    }
-  };
-
-  const filteredData = (stateOrganisasi.findMany.data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.atasan?.namaLengkap?.toLowerCase().includes(keyword) ||
-      item.bawahan?.namaLengkap?.toLowerCase().includes(keyword) ||
-      item.tipe?.toLowerCase().includes(keyword)
-    );
-  });
-
-  if (!stateOrganisasi.findMany.data) {
-    return (
-      <Stack py={10}>
-        <Skeleton h={500} />
-      </Stack>
-    );
-  }
-
-  return (
-    <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Hubungan Organisasi'
-          href='/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/hubungan-organisasi/create'
-        />
-        <Table striped withTableBorder withRowBorders>
-          <TableThead>
-            <TableTr>
-              <TableTh>Atasan</TableTh>
-              <TableTh>Bawahan</TableTh>
-              <TableTh>Tipe</TableTh>
-              <TableTh>Edit</TableTh>
-              <TableTh>Hapus</TableTh>
-            </TableTr>
-          </TableThead>
-          <TableTbody>
-            {filteredData
-              .sort((a, b) =>
-                a.atasan?.namaLengkap.localeCompare(b.atasan?.namaLengkap)
-              )
-              .map((item) => (
-                <TableTr key={item.id}>
-                  <TableTd>{item.atasan?.namaLengkap}</TableTd>
-                  <TableTd>{item.bawahan?.namaLengkap}</TableTd>
-                  <TableTd>{item.tipe}</TableTd>
-                  <TableTd>
-                    <Button
-                      bg="green"
-                      onClick={() => router.push(`/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/hubungan-organisasi/${item.id}`)}
-                    >
-                      <IconEdit size={25} />
-                    </Button>
-                  </TableTd>
-                  <TableTd>
-                    <Button
-                      color="red"
-                      onClick={() => {
-                        setSelectedId(item.id);
-                        setModalHapus(true);
-                      }}
-                    >
-                      <IconTrash size={20} />
-                    </Button>
-                  </TableTd>
-                </TableTr>
-              ))}
-          </TableTbody>
-        </Table>
-      </Paper>
-
-      <ModalKonfirmasiHapus
-        opened={modalHapus}
-        onClose={() => setModalHapus(false)}
-        onConfirm={handleHapus}
-        text='Apakah anda yakin ingin menghapus hubungan organisasi ini?'
-      />
-    </Box>
-  );
-}
-
-
-export default HubunganOrganisasi;

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/[id]/edit/page.tsx

@@ -1,8 +1,9 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
-import strukturorganisasiState from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
+
+import stateStrukturBumDes from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
 import colors from '@/con/colors';
+import ApiFetch from '@/lib/api-fetch';
 import {
   Box,
   Button,
@@ -13,7 +14,8 @@ import {
   Stack,
   Text,
   TextInput,
-  Title
+  Title,
+  Tooltip
 } from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
 import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
@@ -22,30 +24,12 @@ import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
-interface PreviewImage {
+export default function EditPegawaiBumDes() {
-  file?: File;
-  preview: string;
-}
-
-interface PegawaiFormData {
-  namaLengkap: string;
-  gelarAkademik: string;
-  imageId: string | null;
-  tanggalMasuk: string;
-  email: string;
-  telepon: string;
-  alamat: string;
-  posisiId: string;
-  isActive: boolean;
-}
-
-export default function EditPegawai() {
   const router = useRouter();
   const { id } = useParams<{ id: string }>();
-  const stateOrganisasi = useProxy(strukturorganisasiState.pegawai);
+  const stateOrganisasi = useProxy(stateStrukturBumDes.pegawai);
 
-  const [previewImage, setPreviewImage] = useState<PreviewImage | string | null>(null);
+  const [formData, setFormData] = useState({
-  const [formData, setFormData] = useState<PegawaiFormData>({
     namaLengkap: '',
     gelarAkademik: '',
     imageId: '',
@@ -56,16 +40,10 @@ export default function EditPegawai() {
     posisiId: '',
     isActive: true,
   });
+  const [previewImage, setPreviewImage] = useState<string | null>(null);
+  const [file, setFile] = useState<File | null>(null);
 
-  // helper buat update state formData
+  // Format date for <input type="date">
-  const updateForm = (field: keyof PegawaiFormData, value: any) => {
-    setFormData((prev) => ({
-      ...prev,
-      [field]: value,
-    }));
-  };
-
-  // Format date to YYYY-MM-DD for date input
   const formatDateForInput = (dateString: string) => {
     if (!dateString) return '';
     const date = new Date(dateString);
@@ -73,10 +51,10 @@ export default function EditPegawai() {
   };
 
   useEffect(() => {
-    strukturorganisasiState.posisiOrganisasi.findMany.load();
-
     const loadPegawai = async () => {
       try {
+        await stateStrukturBumDes.posisiOrganisasi.findManyAll.load();
+
         const data = await stateOrganisasi.edit.load(id);
         if (data) {
           setFormData({
@@ -95,9 +73,7 @@ export default function EditPegawai() {
         }
       } catch (error) {
         console.error('Error loading pegawai:', error);
-        toast.error(
+        toast.error(error instanceof Error ? error.message : 'Gagal mengambil data pegawai');
-          error instanceof Error ? error.message : 'Gagal mengambil data pegawai'
-        );
       }
     };
 
@@ -107,204 +83,182 @@ export default function EditPegawai() {
   const handleSubmit = async () => {
     try {
       if (!formData.namaLengkap.trim()) {
-        toast.error('Nama lengkap tidak boleh kosong');
+        return toast.error('Nama lengkap tidak boleh kosong');
-        return;
       }
 
-      stateOrganisasi.edit.form = {
+      // Update global state only on submit
-        ...formData,
+      const updatedForm = { ...formData };
-        namaLengkap: formData.namaLengkap.trim(),
-        gelarAkademik: formData.gelarAkademik.trim(),
-        imageId: formData.imageId ? formData.imageId.trim() : '',
-        tanggalMasuk: formData.tanggalMasuk.trim(),
-        email: formData.email.trim(),
-        telepon: formData.telepon.trim(),
-        alamat: formData.alamat.trim(),
-        posisiId: formData.posisiId.trim(),
-      };
 
-      if (id && !stateOrganisasi.edit.id) {
+      if (file) {
-        stateOrganisasi.edit.id = id;
+        const res = await ApiFetch.api.fileStorage.create.post({ file, name: file.name });
+        const uploaded = res.data?.data;
+        if (!uploaded?.id) return toast.error('Gagal upload gambar');
+        updatedForm.imageId = uploaded.id;
       }
 
+      stateOrganisasi.edit.form = updatedForm;
+      if (id && !stateOrganisasi.edit.id) stateOrganisasi.edit.id = id;
+
       const success = await stateOrganisasi.edit.submit();
-
+      if (success) router.push('/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai');
-      if (success) {
-        router.push(
-          '/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai'
-        );
-      }
     } catch (error) {
       console.error('Error updating pegawai:', error);
-      toast.error(
+      toast.error(error instanceof Error ? error.message : 'Gagal memperbarui data pegawai');
-        error instanceof Error ? error.message : 'Gagal memperbarui data pegawai'
-      );
     }
   };
 
   return (
-    <Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
-      <Box mb={10}>
+      <Group mb="md">
-        <Button onClick={() => router.back()} variant="subtle" color={'blue'}>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
-          <IconArrowBack color={colors['blue-button']} size={25} />
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
-        </Button>
+            <IconArrowBack color={colors['blue-button']} size={24} />
-      </Box>
+          </Button>
-
+        </Tooltip>
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
+        <Title order={4} ml="sm" c="dark">Edit Data Pegawai PPID</Title>
-        <Stack gap={'xs'}>
+      </Group>
-          <Title order={4}>Edit Data Pegawai</Title>
 
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          {/* Nama Lengkap */}
           <TextInput
             label="Nama Lengkap"
             placeholder="Masukkan nama lengkap"
             value={formData.namaLengkap}
-            onChange={(e) => updateForm('namaLengkap', e.target.value)}
+            onChange={(e) => setFormData({ ...formData, namaLengkap: e.target.value })}
+            required
           />
 
+          {/* Gelar Akademik */}
           <TextInput
             label="Gelar Akademik"
             placeholder="Contoh: S.Kom"
             value={formData.gelarAkademik}
-            onChange={(e) => updateForm('gelarAkademik', e.target.value)}
+            onChange={(e) => setFormData({ ...formData, gelarAkademik: e.target.value })}
           />
 
+          {/* Foto Profil */}
           <Box>
-            <Text fz={'md'} fw={'bold'}>
+            <Text fw="bold" fz="sm" mb={6}>Foto Profil</Text>
-              Gambar
+            <Dropzone
-            </Text>
+              onDrop={(files) => {
-            <Box>
+                const selectedFile = files[0];
-              <Dropzone
+                if (selectedFile) {
-                onDrop={(files) => {
+                  setFile(selectedFile);
-                  const file = files[0];
+                  setPreviewImage(URL.createObjectURL(selectedFile));
-                  if (file) {
+                }
-                    setPreviewImage({
+              }}
-                      file,
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
-                      preview: URL.createObjectURL(file),
+              maxSize={5 * 1024 ** 2}
-                    });
+              accept={{ 'image/*': ['.jpeg', '.jpg', '.png', '.webp'] }}
-                  }
+              radius="md"
-                }}
+              p="xl"
-                maxSize={5 * 1024 ** 2}
+            >
-                accept={{
+              <Group justify="center" gap="xl" mih={180}>
-                  'image/*': ['.jpeg', '.jpg', '.png', '.webp'],
+                <Dropzone.Accept><IconUpload size={48} color={colors['blue-button']} stroke={1.5} /></Dropzone.Accept>
-                }}
+                <Dropzone.Reject><IconX size={48} color="red" stroke={1.5} /></Dropzone.Reject>
-              >
+                <Dropzone.Idle><IconPhoto size={48} color="#868e96" stroke={1.5} /></Dropzone.Idle>
-                <Group
+                <Stack gap="xs" align="center">
-                  justify="center"
+                  <Text size="md" fw={500}>Seret gambar atau klik untuk memilih file</Text>
-                  gap="xl"
+                  <Text size="sm" c="dimmed">Maksimal 5MB, format gambar wajib</Text>
-                  mih={220}
+                </Stack>
-                  style={{ pointerEvents: 'none' }}
+              </Group>
-                >
+            </Dropzone>
-                  <Dropzone.Accept>
-                    <IconUpload
-                      size={52}
-                      color="var(--mantine-color-blue-6)"
-                      stroke={1.5}
-                    />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX
-                      size={52}
-                      color="var(--mantine-color-red-6)"
-                      stroke={1.5}
-                    />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconPhoto
-                      size={52}
-                      color="var(--mantine-color-dimmed)"
-                      stroke={1.5}
-                    />
-                  </Dropzone.Idle>
 
-                  <div>
+            {previewImage && (
-                    <Text size="xl" inline>
+              <Box mt="sm" style={{ display: 'flex', justifyContent: 'center' }}>
-                      Drag images here or click to select files
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Attach as many files as you like, each file should not
-                      exceed 5mb
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-
-              {previewImage && (
                 <Image
-                  src={
+                  src={previewImage}
-                    typeof previewImage === 'string'
+                  alt="Preview Gambar"
-                      ? previewImage
+                  radius="md"
-                      : previewImage?.preview
+                  style={{ maxHeight: 220, objectFit: 'contain', border: `1px solid ${colors['blue-button']}` }}
-                  }
-                  alt="Preview"
-                  width={280}
-                  height={180}
-                  fit="cover"
-                  radius="sm"
-                  mt="md"
                   loading="lazy"
                 />
-              )}
+              </Box>
-            </Box>
+            )}
           </Box>
 
+          {/* Tanggal Masuk */}
           <TextInput
             label="Tanggal Masuk"
             type="date"
             placeholder="Contoh: 2022-01-01"
             value={formatDateForInput(formData.tanggalMasuk)}
-            onChange={(e) => updateForm('tanggalMasuk', e.target.value)}
+            onChange={(e) => setFormData({ ...formData, tanggalMasuk: e.target.value })}
           />
 
+          {/* Email */}
           <TextInput
             label="Email"
-            placeholder="Contoh: email@example.com"
+            type="email"
+            placeholder="contoh@email.com"
             value={formData.email}
-            onChange={(e) => updateForm('email', e.currentTarget.value)}
+            onChange={(e) => setFormData({ ...formData, email: e.target.value })}
           />
 
+          {/* Telepon */}
           <TextInput
             label="Telepon"
-            placeholder="Contoh: 08123456789"
+            placeholder="08123456789"
             value={formData.telepon}
-            onChange={(e) => updateForm('telepon', e.currentTarget.value)}
+            onChange={(e) => setFormData({ ...formData, telepon: e.target.value })}
           />
 
+          {/* Alamat */}
           <TextInput
             label="Alamat"
-            placeholder="Contoh: Jl. Contoh No. 1"
+            placeholder="Jl. Contoh No. 123"
             value={formData.alamat}
-            onChange={(e) => updateForm('alamat', e.currentTarget.value)}
+            onChange={(e) => setFormData({ ...formData, alamat: e.target.value })}
           />
 
-          <Select
+          {/* Posisi */}
-            label="Posisi"
+          <Box>
-            placeholder="Pilih posisi"
+            <Text fw="bold" fz="sm" mb={6}>Posisi</Text>
-            data={
+            <Select
-              strukturorganisasiState.posisiOrganisasi.findMany.data?.map(
+              placeholder="Pilih posisi"
-                (p) => ({
+              data={stateStrukturBumDes.posisiOrganisasi.findManyAll.data?.map(p => ({ value: p.id, label: p.nama })) || []}
-                  value: p.id,
+              value={formData.posisiId}
-                  label: p.nama,
+              onChange={(value) => value && setFormData({ ...formData, posisiId: value })}
-                })
+              searchable
-              ) || []
+              clearable
-            }
+            />
-            value={formData.posisiId}
+          </Box>
-            onChange={(value) => {
-              if (value !== null) updateForm('posisiId', value);
-            }}
-          />
 
-          <Select
+          {/* Status Pegawai */}
-            label="Status Pegawai"
+          <Box>
-            data={[
+            <Text fw="bold" fz="sm" mb={6}>Status Pegawai</Text>
-              { value: 'true', label: 'Aktif' },
+            <Select
-              { value: 'false', label: 'Tidak Aktif' },
+              data={[
-            ]}
+                { value: 'true', label: 'Aktif' },
-            value={String(formData.isActive)}
+                { value: 'false', label: 'Tidak Aktif' },
-            onChange={(val) => updateForm('isActive', val === 'true')}
+              ]}
-          />
+              value={String(formData.isActive)}
+              onChange={(val) => setFormData({ ...formData, isActive: val === 'true' })}
+              clearable
+            />
+          </Box>
 
-          <Group>
+          {/* Submit Button */}
-            <Button onClick={handleSubmit} color="blue">
+          <Group justify="flex-end" mt="md">
+            <Button
+              onClick={handleSubmit}
+              loading={stateOrganisasi.edit.loading}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
               Simpan
             </Button>
           </Group>

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/[id]/page.tsx

@@ -1,42 +1,56 @@
 'use client'
 import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
-import strukturorganisasiState from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
+import stateStrukturBumDes from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
+
 import colors from '@/con/colors';
-import { Box, Button, Flex, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Button, Group, Image, Paper, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconArrowBack, IconEdit, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 
 function DetailPegawai() {
-  const statePegawai = useProxy(strukturorganisasiState.pegawai)
+  const statePegawai = useProxy(stateStrukturBumDes.pegawai);
-  const [modalHapus, setModalHapus] = useState(false)
+  const [modalHapus, setModalHapus] = useState(false);
-  const [selectedId, setSelectedId] = useState<string | null>(null)
+  const [modalNonActive, setModalNonActive] = useState(false);
-  const params = useParams()
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+  const params = useParams();
   const router = useRouter();
 
   useShallowEffect(() => {
-    statePegawai.findUnique.load(params?.id as string)
+    stateStrukturBumDes.posisiOrganisasi.findMany.load();
-  }, [])
+    statePegawai.findUnique.load(params?.id as string);
+  }, []);
 
   const handleHapus = () => {
     if (selectedId) {
-      statePegawai.delete.byId(selectedId)
+      statePegawai.delete.byId(selectedId);
-      setModalHapus(false)
+      setModalHapus(false);
-      setSelectedId(null)
+      setSelectedId(null);
-      router.push("/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai")
+      router.push("/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai");
     }
-  }
+  };
+
+  const handleNonActive = () => {
+    if (selectedId) {
+      statePegawai.nonActive.byId(selectedId);
+      setModalNonActive(false);
+      setSelectedId(null);
+      router.push("/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai");
+    }
+  };
 
   if (!statePegawai.findUnique.data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={500} radius="md" />
       </Stack>
-    )
+    );
   }
 
+  const data = statePegawai.findUnique.data;
+
   return (
     <Box>
       <Box mb={10}>
@@ -44,91 +58,125 @@ function DetailPegawai() {
           <IconArrowBack color={colors['blue-button']} size={25} />
         </Button>
       </Box>
-      <Paper w={{ base: "100%", md: "50%" }} bg={colors['white-1']} p={'md'}>
+      <Paper
-        <Stack>
+        withBorder
-          <Text fz={"xl"} fw={"bold"}>Detail Pegawai</Text>
+        w={{ base: "100%", md: "60%" }}
-          <Paper bg={colors['BG-trans']} p={'md'}>
+        bg={colors['white-1']}
-            <Stack gap={"xs"}>
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Pegawai PPID
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="md">
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Nama Lengkap</Text>
+                <Text fz="lg" fw="bold">Nama Lengkap</Text>
-                <Text fz={"lg"}>{statePegawai.findUnique.data?.namaLengkap}</Text>
+                <Text fz="md" c="dimmed" style={{ wordBreak: "break-word", whiteSpace: "normal" }}>
-              </Box>
+                  {data.namaLengkap || '-'} {data.gelarAkademik || ''}
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Gelar Akademik</Text>
-                <Text fz={"lg"}>{statePegawai.findUnique.data?.gelarAkademik}</Text>
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Image</Text>
-                {statePegawai.findUnique.data?.image?.link ? (
-                  <Image src={statePegawai.findUnique.data?.image?.link} alt='' loading="lazy" />
-                ) : (
-                  <Text fz={"md"} c="dimmed">Tidak ada gambar</Text>
-                )}
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Tanggal Masuk</Text>
-                <Text fz={"lg"}>
-                  {statePegawai.findUnique.data?.tanggalMasuk
-                    ? new Date(statePegawai.findUnique.data.tanggalMasuk).toLocaleDateString()
-                    : "-"}
                 </Text>
               </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Email</Text>
-                <Text fz={"lg"} style={{ wordBreak: "break-word", whiteSpace: "normal" }}>{statePegawai.findUnique.data?.email}</Text>
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Telepon</Text>
-                <Text fz={"lg"}>{statePegawai.findUnique.data?.telepon}</Text>
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Alamat</Text>
-                <Text fz={"lg"} style={{ wordBreak: "break-word", whiteSpace: "normal" }}>{statePegawai.findUnique.data?.alamat}</Text>
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Posisi</Text>
-                <Stack gap={4}>
-                  {statePegawai.findUnique.data?.posisi ? (
-                    <Text fz={"lg"}>
-                     {statePegawai.findUnique.data.posisi.nama}
-                    </Text>
-                  ) : (
-                    <Text fz={"lg"} c="dimmed">
-                      Tidak ada posisi
-                    </Text>
-                  )}
-                </Stack>
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Aktif</Text>
-                <Text fz={"lg"}>{statePegawai.findUnique.data?.isActive ? "Ya" : "Tidak"}</Text>
-              </Box>
 
               <Box>
-                <Flex gap={"xs"}>
+                <Text fz="lg" fw="bold">Posisi</Text>
-                  <Button
+                <Text fz="md" c="dimmed">{data.posisi?.nama || '-'}</Text>
-                    onClick={() => {
+              </Box>
-                      if (statePegawai.findUnique.data) {
+
-                        setSelectedId(statePegawai.findUnique.data.id);
+              <Box>
-                        setModalHapus(true);
+                <Text fz="lg" fw="bold">Email</Text>
-                      }
+                <Text fz="md" c="dimmed">{data.email || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Telepon</Text>
+                <Text fz="md" c="dimmed">{data.telepon || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Alamat</Text>
+                <Text fz="md" c="dimmed" style={{ wordBreak: "break-word", whiteSpace: "normal" }}>{data.alamat || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Tanggal Masuk</Text>
+                <Text fz="md" c="dimmed">
+                  {data.tanggalMasuk ? new Date(data.tanggalMasuk).toLocaleDateString() : '-'}
+                </Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Status</Text>
+                <Text fz="md" c={data.isActive ? 'green' : 'red'}>
+                  {data.isActive ? 'Aktif' : 'Tidak Aktif'}
+                </Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Foto Profil</Text>
+                {data.image?.link ? (
+                  <Image
+                    src={data.image.link}
+                    alt={data.namaLengkap || 'Foto Profil'}
+                    w={200}
+                    h={200}
+                    radius="md"
+                    fit="cover"
+                    mt="sm"
+                    style={{
+                      border: '1px solid #e0e0e0',
+                      borderRadius: '8px',
                     }}
-                    disabled={!statePegawai.findUnique.data}
+                    loading='lazy'
-                    color="red">
+                  />
-                    <IconX size={20} />
+                ) : (
+                  <Text fz="sm" c="dimmed" mt="sm">Tidak ada foto profil</Text>
+                )}
+              </Box>
+
+              <Button
+                color={data.isActive ? "green" : "gray"}
+                onClick={() => {
+                  setSelectedId(data.id || null);
+                  setModalNonActive(true);
+                }}
+                variant="light"
+                radius="md"
+                size="md"
+              >
+                {data.isActive ? "Aktif" : "Nonaktif"}
+              </Button>
+
+              <Group gap="sm" mt="md">
+                <Tooltip label="Hapus Pegawai" withArrow position="top">
+                  <Button
+                    color="red"
+                    onClick={() => {
+                      setSelectedId(data.id || null);
+                      setModalHapus(true);
+                    }}
+                    variant="light"
+                    radius="md"
+                    size="md"
+                  >
+                    <IconTrash size={20} />
                   </Button>
+                </Tooltip>
+
+                <Tooltip label="Edit Pegawai" withArrow position="top">
                   <Button
-                    onClick={() => {
+                    color="green"
-                      if (statePegawai.findUnique.data) {
+                    onClick={() => router.push(`/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/${data.id}/edit`)}
-                        router.push(`/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/${statePegawai.findUnique.data.id}/edit`);
+                    variant="light"
-                      }
+                    radius="md"
-                    }}
+                    size="md"
-                    disabled={!statePegawai.findUnique.data}
+                  >
-                    color="green">
                     <IconEdit size={20} />
                   </Button>
-                </Flex>
+                </Tooltip>
-              </Box>
+              </Group>
             </Stack>
           </Paper>
         </Stack>
@@ -139,7 +187,15 @@ function DetailPegawai() {
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleHapus}
-        text="Apakah anda yakin ingin menghapus produk ini?"
+        text="Apakah Anda yakin ingin menghapus data pegawai ini?"
+      />
+
+      {/* Modal NonActive */}
+      <ModalKonfirmasiHapus
+        opened={modalNonActive}
+        onClose={() => setModalNonActive(false)}
+        onConfirm={handleNonActive}
+        text="Apakah Anda yakin ingin menonaktifkan pegawai ini?"
       />
     </Box>
   );

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/create/page.tsx

@@ -1,9 +1,10 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
-import strukturorganisasiState from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
+
+import stateStrukturBumDes from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
-import { Box, Button, Group, Image, Paper, Select, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Image, Paper, Select, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
 import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -11,17 +12,17 @@ import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
-function CreatePegawai() {
+function CreatePegawaiBumDes() {
   const router = useRouter();
   const [previewImage, setPreviewImage] = useState<{ preview: string; file: File } | null>(null);
-  const stateOrganisasi = useProxy(strukturorganisasiState)
+  const stateOrganisasi = useProxy(stateStrukturBumDes.pegawai)
   useEffect(() => {
-    stateOrganisasi.posisiOrganisasi.findMany.load();
+    stateStrukturBumDes.posisiOrganisasi.findManyAll.load();
     resetForm();
   }, []);
 
   const resetForm = () => {
-    stateOrganisasi.pegawai.create.form = {
+    stateOrganisasi.create.form = {
       namaLengkap: "",
       gelarAkademik: "",
       imageId: "",
@@ -30,7 +31,7 @@ function CreatePegawai() {
       telepon: "",
       alamat: "",
       posisiId: "",
-      isActive: true,  
+      isActive: true,
     };
   };
 
@@ -52,15 +53,15 @@ function CreatePegawai() {
       }
 
       // Set status aktif secara otomatis
-      stateOrganisasi.pegawai.create.form.isActive = true;
+      stateOrganisasi.create.form.isActive = true;
-      
+
       // Simpan ID gambar ke form
-      stateOrganisasi.pegawai.create.form.imageId = uploaded.id;
+      stateOrganisasi.create.form.imageId = uploaded.id;
-      
+
       // Submit form
-      await stateOrganisasi.pegawai.create.submit();
+      await stateOrganisasi.create.submit();
-      
+
-      
+
       // Reset form dan redirect
       resetForm();
       toast.success("Data pegawai berhasil ditambahkan");
@@ -72,130 +73,194 @@ function CreatePegawai() {
   };
 
   return (
-    <Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
-      <Box mb={10}>
+      <Group mb="md">
-        <Button variant="subtle" onClick={() => router.back()}>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
-          <IconArrowBack color={colors['blue-button']} size={25} />
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
-        </Button>
+            <IconArrowBack color={colors['blue-button']} size={24} />
-      </Box>
+          </Button>
-      <Paper bg={colors["white-1"]} p={"md"} w={{ base: "100%", md: "50%" }}>
+        </Tooltip>
-        <Stack gap={"xs"}>
+        <Title order={4} ml="sm" c="dark">
-          <Title order={3}>Create Pegawai</Title>
+          Tambah Pegawai BUMDesa
-          <TextInput
+        </Title>
-            label="Nama Lengkap"
+      </Group>
-            placeholder="Masukkan nama lengkap"
-            defaultValue={stateOrganisasi.pegawai.create.form.namaLengkap}
-            onChange={(e) => (stateOrganisasi.pegawai.create.form.namaLengkap = e.currentTarget.value)}
-          />
-          <TextInput
-            label="Gelar Akademik"
-            placeholder="Contoh: S.Kom"
-            defaultValue={stateOrganisasi.pegawai.create.form.gelarAkademik}
-            onChange={(e) => (stateOrganisasi.pegawai.create.form.gelarAkademik = e.currentTarget.value)}
-          />
-          <Box>
-            <Text fz={"md"} fw={"bold"}>Gambar</Text>
-            <Box >
-              <Dropzone
-                onDrop={(files) => {
-                  const file = files[0]; // Hanya ambil file pertama
-                  if (file) {
-                    setPreviewImage({
-                      file,
-                      preview: URL.createObjectURL(file)
-                    });
-                  }
-                }}
-                maxSize={5 * 1024 ** 2} // 5MB
-                accept={{
-                  'image/*': ['.jpeg', '.jpg', '.png', '.webp']
-                }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
 
-                  <div>
+      <Paper
-                    <Text size="xl" inline>
+        w={{ base: '100%', md: '50%' }}
-                      Drag images here or click to select files
+        bg={colors['white-1']}
-                    </Text>
+        p="lg"
-                    <Text size="sm" c="dimmed" inline mt={7}>
+        radius="md"
-                      Attach as many files as you like, each file should not exceed 5mb
+        shadow="sm"
-                    </Text>
+        style={{ border: '1px solid #e0e0e0' }}
-                  </div>
+      >
-                </Group>
+        <Stack gap="md">
-              </Dropzone>
+          <Box>
-              {previewImage && (
+            <TextInput
+              label="Nama Lengkap"
+              placeholder="Masukkan nama lengkap"
+              defaultValue={stateOrganisasi.create.form.namaLengkap}
+              onChange={(e) => (stateOrganisasi.create.form.namaLengkap = e.currentTarget.value)}
+              required
+            />
+          </Box>
+          <Box>
+            <TextInput
+              label="Gelar Akademik"
+              placeholder="Contoh: S.Kom"
+              defaultValue={stateOrganisasi.create.form.gelarAkademik}
+              onChange={(e) => (stateOrganisasi.create.form.gelarAkademik = e.currentTarget.value)}
+            />
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Foto Profil
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const file = files[0];
+                if (file) {
+                  setPreviewImage({
+                    file,
+                    preview: URL.createObjectURL(file)
+                  });
+                }
+              }}
+              maxSize={5 * 1024 ** 2} // 5MB
+              accept={{
+                'image/*': ['.jpeg', '.jpg', '.png', '.webp']
+              }}
+              styles={{
+                root: {
+                  border: '2px dashed #ced4da',
+                  borderRadius: '8px',
+                  padding: '20px',
+                  textAlign: 'center',
+                  cursor: 'pointer',
+                  '&:hover': {
+                    borderColor: '#228be6',
+                  },
+                },
+              }}
+            >
+              <Group justify="center" gap="xl" mih={160} style={{ pointerEvents: 'none' }}>
+                <Dropzone.Accept>
+                  <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                </Dropzone.Idle>
+
+                <div>
+                  <Text size="md" inline>
+                    Seret gambar ke sini atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed" inline mt={7}>
+                    Format yang didukung: JPG, PNG, WebP. Maksimal 5MB
+                  </Text>
+                </div>
+              </Group>
+            </Dropzone>
+
+            {previewImage && (
+              <Box mt="md">
+                <Text fw="bold" fz="sm" mb={6}>
+                  Preview Gambar
+                </Text>
                 <Image
                   src={previewImage.preview}
                   alt="Preview"
-                  width={280}
+                  width={200}
-                  height={180}
+                  height={200}
                   fit="cover"
-                  radius="sm"
+                  radius="md"
-                  mt="md"
+                  style={{
-                  loading="lazy"
+                    border: '1px solid #e0e0e0',
+                    borderRadius: '8px',
+                  }}
+                  loading='lazy'
                 />
-              )}
+              </Box>
-            </Box>
+            )}
+          </Box>
+          <Box>
+            <TextInput
+              label="Tanggal Masuk"
+              type="date"
+              placeholder="Contoh: 2022-01-01"
+              defaultValue={stateOrganisasi.create.form.tanggalMasuk}
+              onChange={(e) => (stateOrganisasi.create.form.tanggalMasuk = e.currentTarget.value)}
+            />
+          </Box>
+
+          <Box>
+            <TextInput
+              label="Email"
+              type="email"
+              placeholder="Contoh: email@example.com"
+              defaultValue={stateOrganisasi.create.form.email}
+              onChange={(e) => (stateOrganisasi.create.form.email = e.currentTarget.value)}
+            />
+          </Box>
+
+          <Box>
+            <TextInput
+              label="Nomor Telepon"
+              placeholder="Contoh: 08123456789"
+              defaultValue={stateOrganisasi.create.form.telepon}
+              onChange={(e) => (stateOrganisasi.create.form.telepon = e.currentTarget.value)}
+            />
+          </Box>
+
+          <Box>
+            <TextInput
+              label="Alamat"
+              placeholder="Contoh: Jl. Contoh No. 1"
+              defaultValue={stateOrganisasi.create.form.alamat}
+              onChange={(e) => (stateOrganisasi.create.form.alamat = e.currentTarget.value)}
+            />
+          </Box>
+
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Posisi
+            </Text>
+            <Select
+              placeholder="Pilih posisi"
+              data={stateStrukturBumDes.posisiOrganisasi.findManyAll.data?.map(p => ({
+                value: p.id,
+                label: p.nama
+              })) || []}
+              value={stateOrganisasi.create.form.posisiId}
+              onChange={(value) => {
+                if (value) stateOrganisasi.create.form.posisiId = value;
+              }}
+              searchable
+              clearable
+            />
           </Box>
-          <TextInput
-            label="Tanggal Masuk"
-            type="date"
-            placeholder="Contoh: 2022-01-01"
-            defaultValue={stateOrganisasi.pegawai.create.form.tanggalMasuk}
-            onChange={(e) => (stateOrganisasi.pegawai.create.form.tanggalMasuk = e.currentTarget.value)}
-          />
-          <TextInput
-            label="Email"
-            placeholder="Contoh: email@example.com"
-            defaultValue={stateOrganisasi.pegawai.create.form.email}
-            onChange={(e) => (stateOrganisasi.pegawai.create.form.email = e.currentTarget.value)}
-          />
-          <TextInput
-            label="Telepon"
-            placeholder="Contoh: 08123456789"
-            defaultValue={stateOrganisasi.pegawai.create.form.telepon}
-            onChange={(e) => (stateOrganisasi.pegawai.create.form.telepon = e.currentTarget.value)}
-          />
-          <TextInput
-            label="Alamat"
-            placeholder="Contoh: Jl. Contoh No. 1"
-            defaultValue={stateOrganisasi.pegawai.create.form.alamat}
-            onChange={(e) => (stateOrganisasi.pegawai.create.form.alamat = e.currentTarget.value)}
-          />
-          <Select
-            label="Posisi"
-            placeholder="Pilih posisi"
-            data={stateOrganisasi.posisiOrganisasi.findMany.data?.map(p => ({
-              value: p.id,
-              label: p.nama
-            })) || []}
-            defaultValue={stateOrganisasi.pegawai.create.form.posisiId}
-            onChange={(value) => {
-              if (value) stateOrganisasi.pegawai.create.form.posisiId = value;
-            }}
-            searchable
-          />
 
 
-          <Button
+          <Group justify="flex-end" mt="md">
-            onClick={handleSubmit}
+            <Button
-            color="blue"
+              onClick={handleSubmit}
-          >
+              radius="md"
-            Simpan
+              size="md"
-          </Button>
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>
   );
 }
 
-export default CreatePegawai;
+export default CreatePegawaiBumDes;

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/page.tsx

@@ -1,33 +1,33 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Badge, Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, ThemeIcon } from '@mantine/core';
+import { Badge, Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, ThemeIcon, Title, Tooltip } from '@mantine/core';
-import { IconCheck, IconDeviceImacCog, IconSearch, IconX } from '@tabler/icons-react';
+import { IconCheck, IconDeviceImacCog, IconPlus, IconSearch, IconX } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
+import stateStrukturBumDes from '../../../_state/ekonomi/struktur-organisasi/struktur-organisasi';
-import strukturorganisasiState from '../../../_state/ekonomi/struktur-organisasi/struktur-organisasi';
 
-function Pegawai() {
+
+function PegawaiBumDes() {
   const [search, setSearch] = useState("");
   return (
     <Box>
       <HeaderSearch
-        title='Pegawai'
+        title='Pegawai BUMDesa'
         placeholder='pencarian'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
       />
-      <ListPegawai search={search} />
+      <ListPegawaiBumdes search={search} />
     </Box>
   );
 }
 
-function ListPegawai({ search }: { search: string }) {
+function ListPegawaiBumdes({ search }: { search: string }) {
-  const stateOrganisasi = useProxy(strukturorganisasiState.pegawai);
+  const stateOrganisasi = useProxy(stateStrukturBumDes.pegawai);
   const router = useRouter();
 
   const {
@@ -39,21 +39,10 @@ function ListPegawai({ search }: { search: string }) {
   } = stateOrganisasi.findMany;
 
   useEffect(() => {
-    load(page, 10);
+    load(page, 10, search);
-  }, [page]);
+  }, [page, search]);
 
-  const filteredData = useMemo(() => {
+  const filteredData = data || []
-    if (!data) return [];
-    return data.filter(item => {
-      const keyword = search.toLowerCase();
-      return (
-        item.namaLengkap?.toLowerCase().includes(keyword) ||
-        item.gelarAkademik?.toLowerCase().includes(keyword) ||
-        item.telepon?.toLowerCase().includes(keyword) ||
-        item.posisi?.nama?.toLowerCase().includes(keyword)
-      );
-    });
-  }, [data, search]); 
 
   // Handle loading state
   if (loading || !data) {
@@ -67,29 +56,51 @@ function ListPegawai({ search }: { search: string }) {
   if (data.length === 0) {
     return (
       <Box py={10}>
-        <Paper p="md" ta="center">
+        <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
-          <p>Tidak ada data pegawai yang tersedia</p>
+          <Group justify="space-between" mb="md">
+            <Title order={4}>Daftar Pegawai BUMDesa</Title>
+            <Tooltip label="Tambah Pegawai Baru" withArrow>
+              <Button
+                leftSection={<IconPlus size={18} />}
+                color="blue"
+                variant="light"
+                onClick={() => router.push('/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/create')}
+              >
+                Tambah Baru
+              </Button>
+            </Tooltip>
+          </Group>
+          <Center py="xl">
+            <Text c="dimmed">Tidak ada data pegawai yang ditemukan</Text>
+          </Center>
         </Paper>
       </Box>
     );
   }
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'} h={{base: 770, md: 650}}>
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
-        <JudulList
+        <Group justify="space-between" mb="md">
-          title='List Pegawai'
+          <Title order={4}>Daftar Pegawai BUMDesa</Title>
-          href='/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/create'
+          <Tooltip label="Tambah Pegawai Baru" withArrow>
-        />
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() => router.push('/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/create')}
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
         <Box style={{ overflowX: "auto" }}>
-          <Table striped withTableBorder withRowBorders>
+          <Table highlightOnHover>
             <TableThead>
               <TableTr>
-                <TableTh>Nama</TableTh>
+                <TableTh style={{ width: '25%' }}>Nama Lengkap</TableTh>
-                <TableTh>Gelar Akademik</TableTh>
+                <TableTh style={{ width: '20%' }}>Posisi</TableTh>
-                <TableTh>Telepon</TableTh>
+                <TableTh style={{ width: '10%' }}>Status</TableTh>
-                <TableTh>Posisi</TableTh>
+                <TableTh style={{ width: '10%' }}>Aksi</TableTh>
-                <TableTh>Aktif</TableTh>
-                <TableTh>Detail</TableTh>
               </TableTr>
             </TableThead>
             <TableTbody>
@@ -106,10 +117,20 @@ function ListPegawai({ search }: { search: string }) {
                 }) // Aktif di atas
               ).map((item) => (
                 <TableTr key={item.id}>
-                  <TableTd>{item.namaLengkap}</TableTd>
+                  <TableTd>
-                  <TableTd>{item.gelarAkademik}</TableTd>
+                    <Box w={150}>
-                  <TableTd>{item.telepon}</TableTd>
+                      <Text fw={500} truncate="end" lineClamp={1}>
-                  <TableTd>{item.posisi?.nama}</TableTd>
+                        {item.namaLengkap}
+                      </Text>
+                    </Box>
+                  </TableTd>
+                  <TableTd>
+                    <Box w={150}>
+                      <Badge variant="light" color="blue">
+                        {item.posisi?.nama || 'Belum diatur'}
+                      </Badge>
+                    </Box>
+                  </TableTd>
                   <TableTd>
                     <Group gap="xs" wrap="nowrap">
                       <Box visibleFrom="sm">
@@ -131,8 +152,15 @@ function ListPegawai({ search }: { search: string }) {
                     </Group>
                   </TableTd>
                   <TableTd>
-                    <Button bg={"green"} onClick={() => router.push(`/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/${item.id}`)}>
+                    <Button
-                      <IconDeviceImacCog size={25} />
+                      size="xs"
+                      radius="md"
+                      variant="light"
+                      color="blue"
+                      leftSection={<IconDeviceImacCog size={16} />}
+                      onClick={() => router.push(`/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/${item.id}`)}
+                    >
+                      Detail
                     </Button>
                   </TableTd>
                 </TableTr>
@@ -140,21 +168,22 @@ function ListPegawai({ search }: { search: string }) {
             </TableTbody>
           </Table>
         </Box>
+        <Center mt="lg">
+          <Pagination
+            value={page}
+            onChange={(newPage) => {
+              load(newPage, 10);
+              window.scrollTo(0, 0);
+            }}
+            total={totalPages}
+            withEdges
+            withControls
+            radius="md"
+          />
+        </Center>
       </Paper>
-     <Center>
-     <Pagination
-        value={page}
-        onChange={(newPage) => {
-          load(newPage, 10);
-          window.scrollTo(0, 0); 
-        }}
-        total={totalPages}
-        mt="md"
-        mb="md"
-      />
-     </Center>
     </Box>
   );
 }
 
-export default Pegawai;
+export default PegawaiBumDes;

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/[id]/page.tsx

@@ -1,30 +1,22 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
+'use client';
+
 import EditEditor from '@/app/admin/(dashboard)/_com/editEditor';
-import strukturorganisasiState from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
+import stateStrukturBumDes from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
 import colors from '@/con/colors';
-import {
+import { Box, Button, Group, Paper, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
-  Box,
-  Button,
-  Group,
-  Paper,
-  Stack,
-  Text,
-  TextInput,
-  Title,
-  Tooltip,
-} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
-function EditPosisiOrganisasi() {
+function EditPosisiOrganisasiBumDes() {
   const router = useRouter();
   const params = useParams();
   const id = params?.id as string;
-  const stateOrganisasi = useProxy(strukturorganisasiState.posisiOrganisasi);
+  const stateOrganisasi = useProxy(stateStrukturBumDes.posisiOrganisasi);
 
   const [formData, setFormData] = useState({
     nama: '',
@@ -32,24 +24,27 @@ function EditPosisiOrganisasi() {
     hierarki: 0,
   });
 
-  // Load data awal sekali saja
+  // Fungsi generik untuk update formData
-  useEffect(() => {
+  const handleChange = (field: keyof typeof formData, value: any) => {
-    const loadPosisiOrganisasi = async () => {
+    setFormData(prev => ({ ...prev, [field]: value }));
-      if (!id) return;
+  };
 
+  useEffect(() => {
+    if (!id) return;
+
+    const loadPosisiOrganisasi = async () => {
       try {
         const data = await stateOrganisasi.edit.load(id);
-
         if (data) {
           stateOrganisasi.edit.id = id;
           setFormData({
-            nama: data.nama ?? '',
+            nama: data.nama || '',
-            deskripsi: data.deskripsi ?? '',
+            deskripsi: data.deskripsi || '',
-            hierarki: data.hierarki ?? 0,
+            hierarki: data.hierarki || 0,
           });
         }
-      } catch (error) {
+      } catch (err) {
-        console.error('Error loading posisi organisasi:', error);
+        console.error('Error loading posisi organisasi:', err);
         toast.error('Gagal memuat data posisi organisasi');
       }
     };
@@ -57,18 +52,14 @@ function EditPosisiOrganisasi() {
     loadPosisiOrganisasi();
   }, [id]);
 
-  const handleChange = (field: string, value: string | number) => {
-    setFormData((prev) => ({ ...prev, [field]: value }));
-  };
-
   const handleSubmit = async () => {
-    try {
+    if (!formData.nama.trim()) {
-      if (!formData.nama.trim()) {
+      toast.error('Nama posisi organisasi tidak boleh kosong');
-        toast.error('Nama posisi organisasi tidak boleh kosong');
+      return;
-        return;
+    }
-      }
 
-      // update global state HANYA saat submit
+    try {
+      // Update global state hanya saat submit
       stateOrganisasi.edit.form = {
         nama: formData.nama.trim(),
         deskripsi: formData.deskripsi.trim(),
@@ -76,19 +67,17 @@ function EditPosisiOrganisasi() {
       };
 
       if (!stateOrganisasi.edit.id) {
-        stateOrganisasi.edit.id = id; // fallback
+        stateOrganisasi.edit.id = id;
       }
 
       const success = await stateOrganisasi.edit.update();
 
       if (success) {
-        toast.success('Posisi organisasi berhasil diperbarui!');
+        router.push('/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi');
-        router.push(
-          '/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi'
-        );
       }
-    } catch (error) {
+    } catch (err) {
-      console.error('Error updating posisi organisasi:', error);
+      console.error('Error updating posisi organisasi:', err);
+      // toast error biasanya sudah ada di update
     }
   };
 
@@ -96,17 +85,12 @@ function EditPosisiOrganisasi() {
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
         <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
-          <Button
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
-            variant="subtle"
-            onClick={() => router.back()}
-            p="xs"
-            radius="md"
-          >
             <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
         </Tooltip>
         <Title order={4} ml="sm" c="dark">
-          Edit Posisi Organisasi
+          Edit Posisi Organisasi BUMDes
         </Title>
       </Group>
 
@@ -120,39 +104,40 @@ function EditPosisiOrganisasi() {
       >
         <Stack gap="md">
           <TextInput
-            value={formData.nama}
-            onChange={(e) => handleChange('nama', e.target.value)}
             label="Nama Posisi Organisasi"
             placeholder="Masukkan nama posisi organisasi"
+            value={formData.nama}
+            onChange={(e) => handleChange('nama', e.target.value)}
             required
           />
 
           <Box>
-            <Text fz="sm" mb={6}>
+            <Text fw="bold" fz="sm" mb={6}>
               Deskripsi
             </Text>
             <EditEditor
               value={formData.deskripsi}
-              onChange={(htmlContent) =>
+              onChange={(html) => handleChange('deskripsi', html)}
-                handleChange('deskripsi', htmlContent)
-              }
             />
           </Box>
 
           <TextInput
-            type="number"
-            value={formData.hierarki}
-            onChange={(e) =>
-              handleChange('hierarki', parseInt(e.target.value) || 0)
-            }
             label="Hierarki"
-            placeholder="Masukkan hierarki"
+            type="number"
+            min={0}
+            placeholder="Contoh: 1 (Angka semakin kecil, posisi semakin tinggi)"
+            value={formData.hierarki}
+            onChange={(e) => {
+              const value = parseInt(e.target.value, 10);
+              handleChange('hierarki', isNaN(value) ? 0 : value);
+            }}
             required
           />
 
-          <Group justify="right">
+          <Group justify="flex-end" mt="md">
             <Button
               onClick={handleSubmit}
+              loading={stateOrganisasi.edit.loading}
               radius="md"
               size="md"
               style={{
@@ -170,4 +155,4 @@ function EditPosisiOrganisasi() {
   );
 }
 
-export default EditPosisiOrganisasi;
+export default EditPosisiOrganisasiBumDes;

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/create/page.tsx

@@ -1,128 +1,127 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client';
 import CreateEditor from '@/app/admin/(dashboard)/_com/createEditor';
-import strukturorganisasiState from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
+import stateStrukturBumDes from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
 import colors from '@/con/colors';
-import {
+import { Box, Button, Group, Paper, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
-    Box,
-    Button,
-    Group,
-    Paper,
-    Stack,
-    Text,
-    TextInput,
-    Title,
-    Tooltip,
-} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useEffect } from 'react';
+import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
-function CreatePosisiOrganisasi() {
+function CreatePosisiOrganisasiBumDes() {
-    const router = useRouter();
+  const router = useRouter();
-    const stateOrganisasi = useProxy(strukturorganisasiState.posisiOrganisasi);
+  const stateOrganisasi = useProxy(stateStrukturBumDes.posisiOrganisasi);
-
+  
-    useEffect(() => {
+  useEffect(() => {
-        stateOrganisasi.findMany.load();
+    stateOrganisasi.findMany.load();
-    }, []);
+    // Initialize form with default values
-
+    stateOrganisasi.create.form = {
-    const resetForm = () => {
+      nama: "",
-        stateOrganisasi.create.form = {
+      deskripsi: "",
-            nama: '',
+      hierarki: 0,
-            deskripsi: '',
-            hierarki: 0,
-        };
     };
-
+    
-    const handleSubmit = async () => {
+    return () => {
-        await stateOrganisasi.create.submit();
+      // Clean up form on unmount
-        resetForm();
+      stateOrganisasi.create.form = {
-        router.push(
+        nama: "",
-            '/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi'
+        deskripsi: "",
-        );
+        hierarki: 0,
+      };
     };
+  }, []);
 
-    return (
+  const handleSubmit = async () => {
-        <Box px={{ base: 'sm', md: 'lg' }} py="md">
+    try {
-            {/* Header Back + Title */}
+      if (!stateOrganisasi.create.form.nama.trim()) {
-            <Group mb="md">
+        return toast.error('Nama posisi tidak boleh kosong');
-                <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+      }
-                    <Button
+      
-                        variant="subtle"
+      await stateOrganisasi.create.submit();
-                        onClick={() => router.back()}
+      toast.success('Posisi organisasi berhasil ditambahkan');
-                        p="xs"
+      router.push('/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi');
-                        radius="md"
+    } catch (error) {
-                    >
+      toast.error('Gagal menambahkan posisi organisasi');
-                        <IconArrowBack color={colors['blue-button']} size={24} />
+      console.error('Error:', error);
-                    </Button>
+    }
-                </Tooltip>
+  };
-                <Title order={4} ml="sm" c="dark">
-                    Tambah Posisi Organisasi
-                </Title>
-            </Group>
 
-            {/* Form Card */}
+  return (
-            <Paper
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
-                w={{ base: '100%', md: '50%' }}
+      <Group mb="md">
-                bg={colors['white-1']}
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
-                p="lg"
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
-                radius="md"
+            <IconArrowBack color={colors['blue-button']} size={24} />
-                shadow="sm"
+          </Button>
-                style={{ border: '1px solid #e0e0e0' }}
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Posisi Organisasi BUMDes
+        </Title>
+      </Group>
+
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Nama Posisi"
+            placeholder="Contoh: Kepala Desa"
+            defaultValue={stateOrganisasi.create.form.nama}
+            onChange={(e) => (stateOrganisasi.create.form.nama = e.target.value)}
+            required
+          />
+          
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Deskripsi
+            </Text>
+            <CreateEditor
+              value={stateOrganisasi.create.form.deskripsi}
+              onChange={(htmlContent) => {
+                stateOrganisasi.create.form.deskripsi = htmlContent;
+              }}
+            />
+          </Box>
+          
+          <TextInput
+            label="Hierarki"
+            type="number"
+            min={0}
+            placeholder="Contoh: 1 (Angka semakin kecil, posisi semakin tinggi)"
+            defaultValue={stateOrganisasi.create.form.hierarki || ''}
+            onChange={(e) => {
+              const value = parseInt(e.target.value, 10);
+              stateOrganisasi.create.form.hierarki = isNaN(value) ? 0 : value;
+            }}
+            required
+          />
+
+          <Group justify="flex-end" mt="md">
+            <Button
+              onClick={handleSubmit}
+              loading={stateOrganisasi.create.loading}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
             >
-                <Stack gap="md">
+              Simpan
-                    <TextInput
+            </Button>
-                        label="Nama Posisi"
+          </Group>
-                        placeholder="Contoh: Kepala Desa"
+        </Stack>
-                        defaultValue={stateOrganisasi.create.form.nama}
+      </Paper>
-                        onChange={(e) => (stateOrganisasi.create.form.nama = e.currentTarget.value)}
+    </Box>
-                        required
+  );
-                    />
-
-                    <Box>
-                        <Text fz={"sm"} mb={6}>Deskripsi</Text>
-                        <CreateEditor
-                            value={stateOrganisasi.create.form.deskripsi}
-                            onChange={(htmlContent) => {
-                                stateOrganisasi.create.form.deskripsi = htmlContent;
-                            }}
-                        />
-                    </Box>
-
-                    <TextInput
-                        label="Hierarki"
-                        type="number"
-                        placeholder="Contoh: 1"
-                        defaultValue={stateOrganisasi.create.form.hierarki}
-                        onChange={(e) => {
-                            const value = parseInt(e.currentTarget.value, 10);
-                            if (!isNaN(value)) {
-                                stateOrganisasi.create.form.hierarki = value;
-                            }
-                        }}
-                        required
-                    />
-
-                    {/* Action Button */}
-                    <Group justify="right">
-                        <Button
-                            onClick={handleSubmit}
-                            radius="md"
-                            size="md"
-                            style={{
-                                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
-                                color: '#fff',
-                                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
-                            }}
-                        >
-                            Simpan
-                        </Button>
-                    </Group>
-                </Stack>
-            </Paper>
-        </Box>
-    );
 }
 
-export default CreatePosisiOrganisasi;
+export default CreatePosisiOrganisasiBumDes;

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/page.tsx

@@ -1,58 +1,37 @@
 'use client'
 import colors from '@/con/colors';
-import {
+import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title, Tooltip } from '@mantine/core';
-  Box,
+import { useShallowEffect } from '@mantine/hooks';
-  Button,
-  Center,
-  Group,
-  Paper,
-  Pagination,
-  Skeleton,
-  Stack,
-  Table,
-  TableTbody,
-  TableTd,
-  TableTh,
-  TableThead,
-  TableTr,
-  Text,
-  Title,
-  Tooltip,
-} from '@mantine/core';
 import { IconEdit, IconPlus, IconSearch, IconTrash } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
-import { useShallowEffect } from '@mantine/hooks';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
-import strukturorganisasiState from '../../../_state/ekonomi/struktur-organisasi/struktur-organisasi';
+import stateStrukturBumDes from '../../../_state/ekonomi/struktur-organisasi/struktur-organisasi';
 
-function PosisiOrganisasi() {
+
+function PosisiOrganisasiBumDes() {
   const [search, setSearch] = useState("");
   return (
     <Box>
-      {/* Search Bar */}
       <HeaderSearch
-        title="Posisi Organisasi"
+        title='Posisi Organisasi BUMDes'
-        placeholder="Cari nama, deskripsi, atau hierarki..."
+        placeholder='Cari posisi organisasi...'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
       />
-
+      <ListPosisiOrganisasiBumDes search={search} />
-      {/* List Table */}
-      <ListPosisiOrganisasi search={search} />
     </Box>
   );
 }
 
-function ListPosisiOrganisasi({ search }: { search: string }) {
+function ListPosisiOrganisasiBumDes({ search }: { search: string }) {
-  const stateOrganisasi = useProxy(strukturorganisasiState.posisiOrganisasi);
+  const stateOrganisasi = useProxy(stateStrukturBumDes.posisiOrganisasi)
   const router = useRouter();
-
+  const [modalHapus, setModalHapus] = useState(false)
-  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null)
-  const [selectedId, setSelectedId] = useState<string | null>(null);
 
   const {
     data,
@@ -66,21 +45,20 @@ function ListPosisiOrganisasi({ search }: { search: string }) {
     load(page, 10, search);
   }, [page, search]);
 
-  const filteredData = data || [];
-
   const handleHapus = async () => {
     if (selectedId) {
       await stateOrganisasi.delete.byId(selectedId);
-      setModalHapus(false);
+      setModalHapus(false)
-      setSelectedId(null);
+      setSelectedId(null)
-      load(page, 10, search); // refresh
     }
-  };
+  }
+
+  const filteredData = data || []
 
   if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton height={500} radius="md" />
+        <Skeleton height={600} radius="md" />
       </Stack>
     );
   }
@@ -89,71 +67,70 @@ function ListPosisiOrganisasi({ search }: { search: string }) {
     <Box py={10}>
       <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
         <Group justify="space-between" mb="md">
-          <Title order={4}>Daftar Posisi Organisasi</Title>
+          <Title order={4}>Daftar Posisi Organisasi BumDes</Title>
-          <Tooltip label="Tambah Posisi Baru" withArrow>
+          <Tooltip label="Tambah Posisi Organisasi" withArrow>
             <Button
               leftSection={<IconPlus size={18} />}
               color="blue"
               variant="light"
-              onClick={() =>
+              onClick={() => router.push('/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/create')}
-                router.push(
-                  '/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/create'
-                )
-              }
             >
               Tambah Baru
             </Button>
           </Tooltip>
         </Group>
-
         <Box style={{ overflowX: 'auto' }}>
           <Table highlightOnHover>
             <TableThead>
               <TableTr>
-                <TableTh style={{ width: '25%' }}>Nama Posisi</TableTh>
+                <TableTh style={{ width: '20%' }}>Nama Posisi</TableTh>
-                <TableTh style={{ width: '15%' }}>Hierarki</TableTh>
+                <TableTh style={{ width: '20%' }}>Deskripsi</TableTh>
-                <TableTh style={{ width: '25%' }}>Edit</TableTh>
+                <TableTh style={{ width: '20%' }}>Hierarki</TableTh>
-                <TableTh style={{ width: '25%' }}>Hapus</TableTh>
+                <TableTh style={{ width: '20%' }}>Edit</TableTh>
+                <TableTh style={{ width: '20%' }}>Hapus</TableTh>
               </TableTr>
             </TableThead>
             <TableTbody>
               {filteredData.length > 0 ? (
                 filteredData.map((item) => (
                   <TableTr key={item.id}>
-                    <TableTd style={{ width: '25%' }}>
+                    <TableTd style={{ width: '20%' }}>
                       <Text fw={500} truncate="end" lineClamp={1}>{item.nama}</Text>
                     </TableTd>
-                    <TableTd style={{ width: '15%' }}>
+                    <TableTd style={{ width: '20%' }}>
-                      <Text fz="sm">{item.hierarki ?? '-'}</Text>
+                      <Box w={200}>
+                        <Text lineClamp={1} fz="sm" c="dimmed" dangerouslySetInnerHTML={{ __html: item.deskripsi || '-' }} />
+                      </Box>
                     </TableTd>
-                    <TableTd style={{ width: '25%' }}>
+                    <TableTd style={{ width: '20%' }}>
-                      <Tooltip label="Ubah Posisi Organisasi" withArrow>
+                      <Text>{item.hierarki || '-'}</Text>
+                    </TableTd>
+                    <TableTd style={{ width: '20%' }}>
+                      <Tooltip label="Edit" withArrow>
                         <Button
                           variant="light"
                           color="green"
-                          onClick={() =>
+                          size="sm"
-                            router.push(
+                          onClick={() => router.push(`/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/${item.id}`)}
-                              `/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/${item.id}`
-                            )
-                          }
                         >
                           <IconEdit size={18} />
                         </Button>
                       </Tooltip>
                     </TableTd>
-                    <TableTd style={{ width: '25%' }}>
+                    <TableTd style={{ width: '20%' }}>
-                      <Tooltip label="Hapus Posisi Organisasi" withArrow>
+                    <Tooltip label="Hapus" withArrow>
-                        <Button
+                      <Button
-                          variant="light"
+                        variant="light"
-                          color="red"
+                        color="red"
-                          onClick={() => {
+                        size="sm"
-                            setSelectedId(item.id);
+                        onClick={() => {
-                            setModalHapus(true);
+                          setSelectedId(item.id);
-                          }}
+                          setModalHapus(true);
-                        >
+                        }}
-                          <IconTrash size={18} />
+                      >
-                        </Button>
+                        <IconTrash size={18} />
-                      </Tooltip>
+                      </Button>
+                    </Tooltip>
                     </TableTd>
                   </TableTr>
                 ))
@@ -170,8 +147,6 @@ function ListPosisiOrganisasi({ search }: { search: string }) {
           </Table>
         </Box>
       </Paper>
-
-      {/* Pagination */}
       <Center>
         <Pagination
           value={page}
@@ -186,16 +161,15 @@ function ListPosisiOrganisasi({ search }: { search: string }) {
           radius="md"
         />
       </Center>
-
       {/* Modal Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleHapus}
-        text="Apakah anda yakin ingin menghapus posisi organisasi ini?"
+        text="Apakah anda yakin ingin menghapus posisi organisasi BumDes ini?"
       />
     </Box>
   );
 }
 
-export default PosisiOrganisasi;
+export default PosisiOrganisasiBumDes;

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/struktur-organisasi/page.tsx

@@ -0,0 +1,133 @@
+/* eslint-disable prefer-const */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client'
+import { Box, Center, Image, Loader, Paper, Stack, Text, Tooltip } from '@mantine/core';
+import { IconUsers } from '@tabler/icons-react';
+import { OrganizationChart } from 'primereact/organizationchart';
+import { useEffect } from 'react';
+import { useProxy } from 'valtio/utils';
+import stateStrukturBumDes from '../../../_state/ekonomi/struktur-organisasi/struktur-organisasi';
+
+function StrukturOrganisasiBumDes() {
+  return (
+    <Box py="md">
+      <ListStrukturOrganisasiBumDes />
+    </Box>
+  );
+}
+
+function ListStrukturOrganisasiBumDes() {
+  const stateOrganisasi = useProxy(stateStrukturBumDes.pegawai);
+
+  useEffect(() => {
+    stateOrganisasi.findMany.load();
+  }, []);
+
+  if (stateOrganisasi.findMany.loading) {
+    return (
+      <Center py={40}>
+        <Loader size="lg" />
+      </Center>
+    );
+  }
+
+  if (!stateOrganisasi.findMany.data || stateOrganisasi.findMany.data.length === 0) {
+    return (
+      <Stack align="center" py={60} gap="sm">
+        <IconUsers size={60} stroke={1.5} color="var(--mantine-color-gray-6)" />
+        <Text fw={500} c="dimmed">Belum ada struktur organisasi yang ditambahkan</Text>
+      </Stack>
+    );
+  }
+
+  const posisiMap = new Map<string, any>();
+
+  const aktifPegawai = stateOrganisasi.findMany.data.filter(p => p.isActive);
+
+  for (const pegawai of aktifPegawai) {
+    const posisiId = pegawai.posisi.id;
+    if (!posisiMap.has(posisiId)) {
+      posisiMap.set(posisiId, {
+        ...pegawai.posisi,
+        pegawaiList: [],
+        children: [],
+      });
+    }
+    posisiMap.get(posisiId)!.pegawaiList.push(pegawai);
+  }
+
+  let root: any[] = [];
+  posisiMap.forEach((posisi) => {
+    if (posisi.parentId) {
+      const parent = posisiMap.get(posisi.parentId);
+      if (parent) {
+        parent.children.push(posisi);
+      }
+    } else {
+      root.push(posisi);
+    }
+  });
+
+  function toOrgChartFormat(node: any): any {
+    return {
+      expanded: true,
+      type: 'person',
+      styleClass: 'p-person',
+      data: {
+        name: node.pegawaiList?.[0]?.namaLengkap || 'Belum ada pegawai',
+        status: node.nama,
+        image: node.pegawaiList?.[0]?.image?.link || '/img/default.png',
+      },
+      children: node.children.map(toOrgChartFormat),
+    };
+  }
+
+  const chartData = root.map(toOrgChartFormat);
+
+  return (
+    <Box py={10}>
+      <Paper
+        p="md"
+        radius="lg"
+        shadow="md"
+        withBorder
+        style={{
+          overflowX: 'auto',
+          background: 'linear-gradient(135deg, #ffffff 0%, #f8f9fa 100%)',
+        }}
+      >
+        <OrganizationChart value={chartData} nodeTemplate={nodeTemplate} />
+      </Paper>
+    </Box>
+  );
+}
+
+function nodeTemplate(node: any) {
+  const imageSrc = node?.data?.image || '/img/default.png';
+  const name = node?.data?.name || 'Tanpa Nama';
+  const status = node?.data?.status || 'Tidak ada deskripsi';
+
+  return (
+    <Stack align="center" gap={6} p="sm" style={{ minWidth: 160 }}>
+      <Tooltip label={name} position="top" withArrow>
+        <Image
+          src={imageSrc}
+          alt={name}
+          radius="xl"
+          w={100}
+          h={100}
+          fit="cover"
+          style={{
+            border: '1px solid #D3D1D1FF',
+          }}
+          loading='lazy'
+        />
+      </Tooltip>
+      <Text fw={600} ta="center" size="sm">{name}</Text>
+      <Text size="xs" c="dimmed" ta="center">{status}</Text>
+    </Stack>
+  );
+}
+
+export default StrukturOrganisasiBumDes;

src/app/admin/_com/list_PageAdmin.tsx

@@ -225,7 +225,7 @@ export const navBar = [
       {
         id: "Ekonomi_3",
         name: "Struktur Organisasi Dan Sk Pengurus Bumdesa",
-        path: "/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi"
+        path: "/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai"
       },
       {
         id: "Ekonomi_4",

src/app/api/[[...slugs]]/_lib/ekonomi/index.ts

@@ -3,7 +3,6 @@ import PasarDesa from "./pasar-desa";
 import LowonganKerja from "./lowongan-kerja";
 import ProgramKemiskinan from "./program-kemiskinan";
 import KategoriProduk from "./pasar-desa/kategori-produk";
-import StrukturOrganisasi from "./struktur-organisasi";
 import GrafikUsiaKerjaYangMenganggur from "./usia-kerja-yang-menganggur";
 import GrafikMenganggurBerdasarkanPendidikan from "./usia-kerja-yang-menganggur/pengangguran-berdasrkan-pendidikan";
 import JumlahPendudukMiskin from "./jumlah-penduduk-miskin";
@@ -11,6 +10,7 @@ import SektorUnggulanDesa from "./sektor-unggulan-desa";
 import DemografiPekerjaan from "./demografi-pekerjaan";
 import JumlahPengangguran from "./jumlah-pengangguran";
 import PendapatanAsliDesa from "./pendapatan-asli-desa";
+import StrukturOrganisasi from "./struktur-bumdes";
 
 const Ekonomi = new Elysia({
   prefix: "/api/ekonomi",

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/find-by-id.ts

@@ -0,0 +1,51 @@
+import prisma from "@/lib/prisma";
+
+export default async function strukturBumDesFindById(request: Request) {
+    const url = new URL(request.url);
+    const pathSegments = url.pathname.split('/');
+    const id = pathSegments[pathSegments.length - 1];
+
+    if (!id) {
+        return Response.json({
+            success: false,
+            message: "ID tidak boleh kosong",
+        }, { status: 400 });
+    }
+
+    try {
+        if (typeof id !== 'string') {
+            return Response.json({
+                success: false,
+                message: "ID tidak valid",
+            }, { status: 400 });
+        }
+
+        const data = await prisma.strukturBumDes.findUnique({
+            where: { id },
+            include: {
+                image: true,
+            }
+        });
+
+        if (!data) {
+            return Response.json({
+                success: false,
+                message: "Data tidak ditemukan",
+            }, { status: 404 });
+        }
+
+        return Response.json({
+            success: true,
+            message: "Berhasil mengambil data berdasarkan ID",
+            data,
+        }, { status: 200 });
+    } catch (e) {
+        console.error("Find by ID error:", e);
+        return Response.json({
+            success: false,
+            message: "Gagal mengambil data: " + (e instanceof Error ? e.message : 'Unknown error'),
+        }, {
+            status: 500,
+        });
+    }
+}

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/index.ts

@@ -0,0 +1,29 @@
+import Elysia, { t } from "elysia";
+import PosisiOrganisasi from "./posisi-organisasi";
+import Pegawai from "./pegawai";
+import strukturBumDesFindById from "./find-by-id";
+import strukturBumDesUpdate from "./update";
+
+
+const StrukturOrganisasi = new Elysia({
+    prefix: "/struktur-organisasi",
+    tags: ["Ekonomi/Struktur Organisasi"],
+})
+.get("/:id", async (context) => {
+    const response = await strukturBumDesFindById(new Request(context.request))
+    return response
+})
+.use(PosisiOrganisasi)
+.use(Pegawai)
+.put("/:id", async (context) => {
+    const response = await strukturBumDesUpdate(context)
+    return response
+}, {
+    body: t.Object({
+        name: t.String(),
+        imageId: t.String(),
+    })
+})
+
+
+export default StrukturOrganisasi;

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/pegawai/create.ts

@@ -32,7 +32,7 @@ export default async function pegawaiCreate(context: Context) {
   }
 
   try {
-    const pegawai = await prisma.pegawai.create({
+    const pegawai = await prisma.pegawaiBumDes.create({
       data: {
         namaLengkap: body.namaLengkap,
         gelarAkademik: body.gelarAkademik,

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/pegawai/del.ts

@@ -13,17 +13,13 @@ export default async function pegawaiDelete(context: Context) {
   }
 
   try {
-    const deleted = await prisma.pegawai.update({
+    const deleted = await prisma.pegawaiBumDes.delete({
-      where: { id },
+      where: { id },  
-      data: {
-        isActive: false, // soft delete
-        updatedAt: new Date(),
-      },
     });
 
     return {
       success: true,
-      message: "Pegawai berhasil di-nonaktifkan",
+      message: "Pegawai berhasil dihapus",
       data: deleted,
     };
   } catch (error: any) {

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/pegawai/findMany.ts

@@ -9,7 +9,7 @@ export default async function pegawaiFindMany(context: Context) {
 
   try {
     const [data, total] = await Promise.all([
-      prisma.pegawai.findMany({
+      prisma.pegawaiBumDes.findMany({
         where: { isActive: true },
         include: {
           posisi: true,
@@ -19,7 +19,7 @@ export default async function pegawaiFindMany(context: Context) {
         take: limit,
         orderBy: { createdAt: 'desc' },
       }),
-      prisma.pegawai.count({
+      prisma.pegawaiBumDes.count({
         where: { isActive: true }
       })
     ]);

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/pegawai/findUnique.ts

@@ -13,7 +13,7 @@ export default async function pegawaiFindUnique(context: Context) {
   }
 
   try {
-    const pegawai = await prisma.pegawai.findUnique({
+    const pegawai = await prisma.pegawaiBumDes.findUnique({
       where: { id },
       include: {
         posisi: true,

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/pegawai/index.ts

@@ -7,7 +7,7 @@ import pegawaiUpdate from "./updt";
 
 const Pegawai = new Elysia({
   prefix: "/pegawai",
-  tags: ["Ekonomi/Struktur Organisasi/Pegawai"],
+  tags: ["Ekonomi/Struktur BUMDes/Pegawai"],
 })
 
   // ✅ Find all

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/pegawai/updt.ts

@@ -28,7 +28,7 @@ export default async function pegawaiUpdate(context: Context) {
   body.isActive = String(body.isActive).toLowerCase() === 'true';
 
   try {
-    const updated = await prisma.pegawai.update({
+    const updated = await prisma.pegawaiBumDes.update({
       where: { id: body.id },
       data: {
         namaLengkap: body.namaLengkap,

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/posisi-organisasi/create.ts

@@ -18,7 +18,7 @@ export default async function posisiOrganisasiCreate(context: Context) {
     }
 
     try {
-        const posisiOrganisasi = await prisma.posisiOrganisasi.create({
+        const posisiOrganisasi = await prisma.posisiOrganisasiBumDes.create({
             data: {
                 nama: body.nama,
                 deskripsi: body.deskripsi,

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/posisi-organisasi/del.ts

@@ -16,7 +16,7 @@ export default async function posisiOrganisasiDelete(context: Context) {
 
   try {
     // Check if the position exists first
-    const existing = await prisma.posisiOrganisasi.findUnique({
+    const existing = await prisma.posisiOrganisasiBumDes.findUnique({
       where: { id },
     });
 
@@ -31,7 +31,7 @@ export default async function posisiOrganisasiDelete(context: Context) {
     }
 
     // Check if there are any pegawai associated with this position
-    const pegawaiCount = await prisma.pegawai.count({
+    const pegawaiCount = await prisma.pegawaiBumDes.count({
       where: { posisiId: id },
     });
 
@@ -45,28 +45,8 @@ export default async function posisiOrganisasiDelete(context: Context) {
       );
     }
 
-    // Check if this position is used in any hubungan organisasi
-    const hubunganCount = await prisma.hubunganOrganisasi.count({
-      where: {
-        OR: [
-          { atasanId: id },
-          { bawahanId: id },
-        ],
-      },
-    });
-
-    if (hubunganCount > 0) {
-      return new Response(
-        JSON.stringify({
-          success: false,
-          message: "Tidak dapat menghapus posisi yang masih terdaftar dalam struktur organisasi",
-        }),
-        { status: 400, headers: { "Content-Type": "application/json" } }
-      );
-    }
-
     // If all checks pass, delete the position
-    const deleted = await prisma.posisiOrganisasi.delete({
+    const deleted = await prisma.posisiOrganisasiBumDes.delete({
       where: { id },
     });
 

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/posisi-organisasi/findMany.ts

@@ -23,13 +23,13 @@ export default async function posisiOrganisasiFindMany(context: Context) {
   try {
     // Ambil data dan total count secara paralel
     const [data, total] = await Promise.all([
-      prisma.posisiOrganisasi.findMany({
+      prisma.posisiOrganisasiBumDes.findMany({
         where,
         skip,
         take: limit,
         orderBy: { createdAt: "asc" },
       }),
-      prisma.posisiOrganisasi.count({ where }),
+      prisma.posisiOrganisasiBumDes.count({ where }),
     ]);
 
     return {

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/posisi-organisasi/findManyAll.ts

@@ -0,0 +1,45 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// /api/posisi-organisasi/findManyAll.ts
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+
+async function posisiOrganisasiFindManyAll(context: Context) {
+  const search = (context.query.search as string) || "";
+
+  // filter default
+  const where: any = { isActive: true };
+
+  if (search) {
+    where.OR = [
+      { nama: { contains: search, mode: "insensitive" } },
+      { deskripsi: { contains: search, mode: "insensitive" } },
+    ];
+  }
+
+  try {
+    const data = await prisma.posisiOrganisasiPPID.findMany({
+      where,
+      orderBy: { hierarki: "asc" },
+    });
+
+    return {
+      success: true,
+      message: "Berhasil mengambil semua data posisi organisasi",
+      data: data.map((item: any) => ({
+        id: item.id,
+        nama: item.nama,
+        deskripsi: item.deskripsi,
+        hierarki: item.hierarki,
+      })),
+      total: data.length,
+    };
+  } catch (e) {
+    console.error("Find many all error:", e);
+    return {
+      success: false,
+      message: "Gagal mengambil data posisi organisasi",
+    };
+  }
+}
+
+export default posisiOrganisasiFindManyAll;

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/posisi-organisasi/findUnique.ts

@@ -21,7 +21,7 @@ export default async function posisiOrganisasiFindUnique(context: Context) {
             }
         }
 
-        const data = await prisma.posisiOrganisasi.findUnique({
+        const data = await prisma.posisiOrganisasiBumDes.findUnique({
             where: { id },
         });
 

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/posisi-organisasi/index.ts

@@ -4,6 +4,7 @@ import posisiOrganisasiFindUnique from "./findUnique";
 import posisiOrganisasiCreate from "./create";
 import posisiOrganisasiUpdate from "./updt";
 import posisiOrganisasiDelete from "./del";
+import posisiOrganisasiFindManyAll from "./findManyAll";
 
 const PosisiOrganisasi = new Elysia({
     prefix: "/posisi-organisasi",
@@ -11,6 +12,7 @@ const PosisiOrganisasi = new Elysia({
 })
 
 .get("/find-many", posisiOrganisasiFindMany)
+.get("/find-many-all", posisiOrganisasiFindManyAll)
 .get("/:id", async (context) => {
     const response = await posisiOrganisasiFindUnique(context);
     return response;

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/posisi-organisasi/updt.ts

@@ -20,7 +20,7 @@ export default async function posisiOrganisasiUpdate(context: Context) {
   }
 
   try {
-    await prisma.posisiOrganisasi.update({
+    await prisma.posisiOrganisasiBumDes.update({
       where: { id },
       data: {
         nama: body.nama,
@@ -29,7 +29,7 @@ export default async function posisiOrganisasiUpdate(context: Context) {
       },
     });
 
-    const updated = await prisma.posisiOrganisasi.findUnique({
+    const updated = await prisma.posisiOrganisasiBumDes.findUnique({
       where: { id },
     });
 

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-bumdes/update.ts

@@ -0,0 +1,116 @@
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+import path from "path";
+import fs from "fs/promises";
+import { Prisma } from "@prisma/client";
+
+type FormUpdate = Prisma.StrukturBumDesGetPayload<{
+    select: {
+        id: true;
+        name: true;
+        imageId: true;
+    };
+}>;
+
+export default async function strukturBumDesUpdate(context: Context) {
+try {
+    const id = context.params?.id as string;
+    const body = (await context.body) as Omit<FormUpdate, "id">;
+
+    const { name, imageId } = body;
+
+    if (!id) {
+        return new Response(
+            JSON.stringify({
+                success: false,
+                message: "ID tidak boleh kosong",
+            }),
+            {
+                status: 400,
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            }
+        )
+    }
+
+    const existing = await prisma.strukturBumDes.findUnique({
+        where: {
+            id
+        },
+        include: {
+            image: true,
+        }
+    })
+
+    if (!existing) {
+        return new Response(
+            JSON.stringify({
+                success: false,
+                message: "Data tidak ditemukan",
+            }),
+            {
+                status: 404,
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            }
+        )
+    }
+
+    if (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 (error) {
+            console.error("Gagal hapus gambar lama:", error);
+        }
+       } 
+    }
+
+    const updated = await prisma.strukturBumDes.update({
+        where: {
+            id
+        },
+        data: {
+            name,
+            imageId,
+        }
+    })
+
+    return new Response(
+        JSON.stringify({
+            success: true,
+            message: "Struktur BumDes Berhasil Dibuat",
+            data: updated,
+        }),
+        {
+            status: 200,
+            headers: {
+                "Content-Type": "application/json",
+            },
+        }
+    )
+
+} catch (error) {
+    console.error("Error updating struktur BumDes:", error);
+    return new Response(
+        JSON.stringify({
+            success: false,
+            message: "Terjadi kesalahan saat mengupdate struktur BumDes",
+        }),
+        {
+            status: 500,
+            headers: {
+                "Content-Type": "application/json",
+            },
+        }
+    )
+}
+}
+    

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-organisasi/hubungan-organisasi/create.ts

@@ -1,51 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import prisma from "@/lib/prisma";
-import { Context } from "elysia";
-
-type FormCreateHubunganOrganisasi = {
-  atasanId: string;
-  bawahanId: string;
-  tipe?: string;
-};
-
-export default async function hubunganOrganisasiCreate(context: Context) {
-  const body = await context.body as FormCreateHubunganOrganisasi;
-
-  // Validasi minimal
-  if (!body || !body.atasanId || !body.bawahanId) {
-    return {
-      success: false,
-      message: "atasanId dan bawahanId wajib diisi",
-    };
-  }
-
-  try {
-    const data = await prisma.hubunganOrganisasi.create({
-      data: {
-        atasanId: body.atasanId,
-        bawahanId: body.bawahanId,
-        tipe: body.tipe,
-      },
-    });
-
-    return {
-      success: true,
-      message: "Berhasil membuat hubungan organisasi",
-      data,
-    };
-  } catch (error: any) {
-    if (error.code === "P2002") {
-      return {
-        success: false,
-        message: "Hubungan antara atasan dan bawahan sudah ada",
-      };
-    }
-
-    console.error("Error create hubungan organisasi:", error);
-    return {
-      success: false,
-      message: "Gagal membuat hubungan organisasi",
-      error: error.message,
-    };
-  }
-}

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-organisasi/hubungan-organisasi/del.ts

@@ -1,33 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import prisma from "@/lib/prisma";
-import { Context } from "elysia";
-
-export default async function hubunganOrganisasiDelete(context: Context) {
-  const { id } = context.params as { id: string };
-
-  if (!id) {
-    return {
-      success: false,
-      message: "ID wajib diisi",
-    };
-  }
-
-  try {
-    const deleted = await prisma.hubunganOrganisasi.delete({
-      where: { id },
-    });
-
-    return {
-      success: true,
-      message: "Hubungan organisasi berhasil dihapus",
-      data: deleted,
-    };
-  } catch (error: any) {
-    console.error("Error delete hubungan organisasi:", error);
-    return {
-      success: false,
-      message: "Gagal menghapus hubungan organisasi",
-      error: error.message,
-    };
-  }
-}

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-organisasi/hubungan-organisasi/findMany.ts

@@ -1,28 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import prisma from "@/lib/prisma";
-
-export default async function hubunganOrganisasiFindMany() {
-  try {
-    const data = await prisma.hubunganOrganisasi.findMany({
-      include: {
-        atasan: true,
-        bawahan: true,
-      },
-      orderBy: {
-        atasanId: "asc",
-      },
-    });
-
-    return {
-      success: true,
-      data,
-    };
-  } catch (error: any) {
-    console.error("Error findMany hubungan organisasi:", error);
-    return {
-      success: false,
-      message: "Gagal mengambil data hubungan organisasi",
-      error: error.message,
-    };
-  }
-}

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-organisasi/hubungan-organisasi/findUnique.ts

@@ -1,43 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import prisma from "@/lib/prisma";
-import { Context } from "elysia";
-
-export default async function hubunganOrganisasiFindUnique(context: Context) {
-  const { id } = context.params as { id: string };
-
-  if (!id) {
-    return {
-      success: false,
-      message: "ID hubungan organisasi wajib diisi",
-    };
-  }
-
-  try {
-    const data = await prisma.hubunganOrganisasi.findUnique({
-      where: { id },
-      include: {
-        atasan: true,
-        bawahan: true,
-      },
-    });
-
-    if (!data) {
-      return {
-        success: false,
-        message: "Data hubungan organisasi tidak ditemukan",
-      };
-    }
-
-    return {
-      success: true,
-      data,
-    };
-  } catch (error: any) {
-    console.error("Error findUnique hubungan organisasi:", error);
-    return {
-      success: false,
-      message: "Gagal mengambil data",
-      error: error.message,
-    };
-  }
-}

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-organisasi/hubungan-organisasi/index.ts

@@ -1,47 +0,0 @@
-import Elysia, { t } from "elysia";
-import hubunganOrganisasiFindMany from "./findMany";
-import hubunganOrganisasiFindUnique from "./findUnique";
-import hubunganOrganisasiCreate from "./create";
-import hubunganOrganisasiUpdate from "./updt";
-import hubunganOrganisasiDelete from "./del";
-
-
-const HubunganOrganisasi = new Elysia({
-  prefix: "/hubungan-organisasi",
-  tags: ["Ekonomi/Struktur Organisasi/Hubungan Organisasi"],
-})
-
-  // 🔍 GET /find-many
-  .get("/find-many", hubunganOrganisasiFindMany)
-
-  // 🔍 GET /:id
-  .get("/:id", async (context) => {
-    return await hubunganOrganisasiFindUnique(context);
-  })
-
-  // ➕ POST /create
-  .post("/create", hubunganOrganisasiCreate, {
-    body: t.Object({
-      atasanId: t.String(),
-      bawahanId: t.String(),
-      tipe: t.Optional(t.String()),
-    }),
-  })
-
-  // ✏️ PUT /:id
-  .put( "/:id",
-      async (context) => {
-        const response = await hubunganOrganisasiUpdate(context);
-        return response;
-      }, {
-    body: t.Object({
-      atasanId: t.Optional(t.String()),
-      bawahanId: t.Optional(t.String()),
-      tipe: t.Optional(t.String()),
-    }),
-  })
-
-  // ❌ DELETE /del/:id
-  .delete("/del/:id", hubunganOrganisasiDelete);
-
-export default HubunganOrganisasi;

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-organisasi/hubungan-organisasi/updt.ts

@@ -1,52 +0,0 @@
-import prisma from "@/lib/prisma";
-import { Context } from "elysia";
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-type FormUpdateHubungan = {
-  atasanId?: string;
-  bawahanId?: string;
-  tipe?: string;
-};
-
-export default async function hubunganOrganisasiUpdate(context: Context) {
-  const body = await context.body as Omit<FormUpdateHubungan, 'id'>;
-  const id = context.params?.id;
-
-  if (!id) {
-    return {
-      success: false,
-      message: "ID wajib ada di URL",
-    };
-  }
-
-  try {
-    const updated = await prisma.hubunganOrganisasi.update({
-      where: { id },
-      data: {
-        atasanId: body.atasanId,
-        bawahanId: body.bawahanId,
-        tipe: body.tipe,
-      },
-    });
-
-    return {
-      success: true,
-      message: "Hubungan organisasi berhasil diupdate",
-      data: updated,
-    };
-  } catch (error: any) {
-    if (error.code === "P2002") {
-      return {
-        success: false,
-        message: "Relasi atasan-bawahan sudah ada",
-      };
-    }
-
-    console.error("Error update hubungan organisasi:", error);
-    return {
-      success: false,
-      message: "Gagal update data hubungan organisasi",
-      error: error.message,
-    };
-  }
-}

src/app/api/[[...slugs]]/_lib/ekonomi/struktur-organisasi/index.ts

@@ -1,14 +0,0 @@
-import Elysia from "elysia";
-import PosisiOrganisasi from "./posisi-organisasi";
-import Pegawai from "./pegawai";
-import HubunganOrganisasi from "./hubungan-organisasi";
-
-const StrukturOrganisasi = new Elysia({
-    prefix: "/struktur-organisasi",
-    tags: ["Ekonomi/Struktur Organisasi"],
-})
-.use(PosisiOrganisasi)
-.use(Pegawai)
-.use(HubunganOrganisasi)
-
-export default StrukturOrganisasi;