Edit .gitlab-ci.yml

Main

See merge request hanifsalafi/mediahub_redesign!2

.drone.yml

@@ -1,46 +0,0 @@
-kind: pipeline
-type: ssh
-name: mediahub-fe-build-deploy
-
-server:
-  host:
-    from_secret: ssh_host
-  user:
-    from_secret: ssh_user
-  ssh_key:
-    from_secret: ssh_key
-
-steps:
-  - name: prepare repo
-    when:
-      branch:
-        - dev-sabda-v2
-        - main
-        - prod
-    commands:
-      - rm -rf /opt/build/mediahub-fe
-      - mkdir -p /opt/build
-      - cd /opt/build
-      - git clone http://38.47.180.165:3000/mediahub/mediahub-fe.git
-
-  - name: build image
-    when:
-      branch:
-        - dev-sabda-v2
-        - main
-        - prod
-    commands:
-      - docker login 38.47.180.165:3000 -u administrator -p HarborDockerImageRep0
-      - cd /opt/build/mediahub-fe
-      - docker build -t 38.47.180.165:3000/mediahub/mediahub-fe:$DRONE_BRANCH .
-      - docker push 38.47.180.165:3000/mediahub/mediahub-fe:$DRONE_BRANCH
-
-  - name: deploy
-    when:
-      branch:
-        - main
-    commands:
-      - docker pull 38.47.180.165:3000/mediahub/mediahub-fe:$DRONE_BRANCH
-      - docker stop new-mediahub-fe || true
-      - docker rm new-mediahub-fe || true
-      - docker run -dt -p 4200:3000 --restart always --name new-mediahub-fe 38.47.180.165:3000/mediahub/mediahub-fe:$DRONE_BRANCH

.env

@@ -1,3 +1,3 @@
-NEXT_PUBLIC_API=https://new.netidhub.com/api
+NEXT_PUBLIC_API=https://mediahub.polri.go.id/api/v2
-NEXT_PUBLIC=https://new.netidhub.com
+NEXT_PUBLIC=https://mediahub.polri.go.id
 NEXT_PUBLIC_TINYMCE_API_KEY=bhteuja26yz5p0aubxry9b95hs33amgn65kjv5km0fd5iuev

.gitlab-ci.yml

@@ -1,23 +1,26 @@
 stages:
   - build
   - deploy
- 
+
-build-dev:
+build-prod:
   stage: build
   when: on_success
   only:
     - main
     - dev-landing-v2
-  image:
+    - prod
+  image: 
     name: docker:25.0.3-cli
   services:
     - name: docker:25.0.3-dind
-      command: ["--insecure-registry=38.47.185.86:8900"]
+      command: ["--insecure-registry=103.82.242.92:8900"]
   script:
     - docker logout
-    - docker login -u $DEPLOY_USERNAME -p $DEPLOY_TOKEN 38.47.185.86:8900
+    - echo "Username:$DEPLOY_USERNAME"
-    - docker build -t 38.47.185.86:8900/mediahub/new-mediahub-fe:dev .
+    - echo "Token:$DEPLOY_TOKEN"
-    - docker push 38.47.185.86:8900/mediahub/new-mediahub-fe:dev
+    - echo "$DEPLOY_TOKEN" | docker login 103.82.242.92:8900 --username "$DEPLOY_USERNAME" --password-stdin
+    - docker build -t 103.82.242.92:8900/mediahub/new-mediahub-fe:prod .
+    - docker push 103.82.242.92:8900/mediahub/new-mediahub-fe:prod
 
 auto-deploy:
   stage: deploy
@@ -26,5 +29,7 @@ auto-deploy:
     - main
     - dev-landing-v2
   image: curlimages/curl:latest
+  services:
+    - docker:dind
   script:
-    - curl --user admin:$JENKINS_PWD http://38.47.185.86:8080/job/auto-deploy-new-mediahub-fe/build?token=autodeploynewmediahub
+    - curl --user admin:$JENKINS_PWD http://38.47.180.165:8080/job/auto-deploy-new-mediahub-fe/build?token=autodeploynewmediahub

app/[locale]/(protected)/admin/add-experts/component/column.tsx

@@ -18,7 +18,7 @@ import { useRouter } from "next/navigation";
 import { deleteUser } from "@/service/management-user/management-user";
 import { stringify } from "querystring";
 
-const getColumns = ({ onRefresh }: { onRefresh: () => void }): ColumnDef<any>[] => [
+const columns: ColumnDef<any>[] = [
   {
     accessorKey: "no",
     header: "No",
@@ -30,13 +30,11 @@ const getColumns = ({ onRefresh }: { onRefresh: () => void }): ColumnDef<any>[]
     header: "Nama",
     cell: ({ row }) => <span>{row.getValue("fullname")}</span>,
   },
-
   {
     accessorKey: "address",
     header: "Wilayah",
-    cell: () => <span>MABES</span>,
+    cell: ({ row }) => <span>MABES</span>,
   },
-
   {
     accessorKey: "userRolePlacements",
     header: "Posisi",
@@ -54,7 +52,6 @@ const getColumns = ({ onRefresh }: { onRefresh: () => void }): ColumnDef<any>[]
       return <span>{posisi}</span>;
     },
   },
-
   {
     accessorKey: "role.name",
     header: "Bidang Keahlian",
@@ -84,77 +81,72 @@ const getColumns = ({ onRefresh }: { onRefresh: () => void }): ColumnDef<any>[]
 
   {
     id: "actions",
+    accessorKey: "action",
     header: "Actions",
+    enableHiding: false,
     cell: ({ row }) => {
       const { toast } = useToast();
       const MySwal = withReactContent(Swal);
-
+      const router = useRouter();
       const doDelete = async (id: number) => {
-        Swal.fire({
-          title: "Menghapus user...",
-          text: "Mohon tunggu",
-          allowOutsideClick: false,
-          didOpen: () => Swal.showLoading(),
-        });
-
         const response = await deleteUser(id);
-
-        Swal.close();
-
         if (response?.error) {
           toast({
             title: stringify(response?.message),
             variant: "destructive",
           });
-          return;
         }
+        toast({
+          title: "Success delete",
+        });
 
-        toast({ title: "Berhasil menghapus user" });
+        router.push("?dataChange=true");
-
-        // ⬅️ INI YANG PENTING → REFRESH TABLE TANPA RELOAD
-        onRefresh();
       };
 
       const handleDelete = (id: number) => {
         MySwal.fire({
-          title: "Hapus user ini?",
+          title: "Apakah anda ingin menghapus data user?",
           showCancelButton: true,
           confirmButtonColor: "#dc3545",
           confirmButtonText: "Iya",
           cancelButtonText: "Tidak",
-        }).then((res) => {
+        }).then((result) => {
-          if (res.isConfirmed) doDelete(id);
+          if (result.isConfirmed) {
+            doDelete(id);
+          }
         });
       };
-
       return (
         <DropdownMenu>
           <DropdownMenuTrigger asChild>
-            <Button size="icon" variant="ghost">
+            <Button
-              <MoreVertical className="h-4 w-4" />
+              size="icon"
+              className="bg-transparent ring-offset-transparent hover:bg-transparent hover:ring-0 hover:ring-transparent"
+            >
+              <MoreVertical className="h-4 w-4 text-default-800" />
             </Button>
           </DropdownMenuTrigger>
-          <DropdownMenuContent align="end">
+          <DropdownMenuContent className="p-0" align="end">
-            
+            <Link href={`/admin/add-experts/detail/${row?.original?.id}`}>
-            <Link href={`/admin/add-experts/detail/${row.original.id}`}>
+              <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
-              <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none cursor-pointer">
+                <Eye className="w-4 h-4 me-1.5" />
-                <Eye className="w-4 h-4 me-1.5" /> View
+                View
               </DropdownMenuItem>
             </Link>
 
-            <Link href={`/admin/add-experts/update/${row.original.id}`}>
+            <Link href={`/admin/add-experts/update/${row?.original?.id}`}>
-              <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none cursor-pointer">
+              <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
-                <SquarePen className="w-4 h-4 me-1.5" /> Edit
+                <SquarePen className="w-4 h-4 me-1.5" />
+                Edit
               </DropdownMenuItem>
             </Link>
-
             <DropdownMenuItem
               onClick={() => handleDelete(row.original.userKeycloakId)}
-              className="text-red-600 cursor-pointer hover:bg-red-300"
+              className="p-2 border-b text-destructive bg-destructive/30  focus:bg-destructive focus:text-destructive-foreground rounded-none"
             >
-              <Trash2 className="w-4 h-4 me-1.5" /> Delete
+              <Trash2 className="w-4 h-4 me-1.5" />
+              Delete
             </DropdownMenuItem>
-
           </DropdownMenuContent>
         </DropdownMenu>
       );
@@ -162,4 +154,4 @@ const getColumns = ({ onRefresh }: { onRefresh: () => void }): ColumnDef<any>[]
   },
 ];
 
-export default getColumns;
+export default columns;

app/[locale]/(protected)/admin/add-experts/component/table.tsx

@@ -2,6 +2,7 @@
 
 import * as React from "react";
 import {
+  ColumnDef,
   ColumnFiltersState,
   PaginationState,
   SortingState,
@@ -14,6 +15,7 @@ import {
   useReactTable,
 } from "@tanstack/react-table";
 import { Button } from "@/components/ui/button";
+
 import {
   Table,
   TableBody,
@@ -23,6 +25,7 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import { UserIcon } from "lucide-react";
+import { cn } from "@/lib/utils";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -32,14 +35,43 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { Input } from "@/components/ui/input";
+import { InputGroup, InputGroupText } from "@/components/ui/input-group";
+import { paginationBlog } from "@/service/blog/blog";
+import { ticketingPagination } from "@/service/ticketing/ticketing";
+import { Badge } from "@/components/ui/badge";
 import { useRouter, useSearchParams } from "next/navigation";
 import TablePagination from "@/components/table/table-pagination";
-// import columns from "./column";
+import columns from "./column";
-import getColumns from "./column";
+import { getPlanningPagination } from "@/service/agenda-setting/agenda-setting";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { listDataMedia } from "@/service/broadcast/broadcast";
 import { listEnableCategory } from "@/service/content/content";
+import { Checkbox } from "@/components/ui/checkbox";
+import { close, loading } from "@/config/swal";
 import { Link } from "@/i18n/routing";
 import { listDataExperts } from "@/service/experts/experts";
 
+const dummyData = [
+  {
+    id: 1,
+    name: "Prof. Dr. Ravi",
+    region: "Nasional",
+    skills: "Komunikasi",
+    experience: "Akademisi",
+  },
+  {
+    id: 2,
+    name: "Prof. Dr. Novan",
+    region: "DKI Jakarta",
+    skills: "Hukum",
+    experience: "Akademisi + Praktisi",
+  },
+];
+
 const AddExpertTable = () => {
   const router = useRouter();
   const searchParams = useSearchParams();
@@ -65,8 +97,7 @@ const AddExpertTable = () => {
   const [limit, setLimit] = React.useState(10);
   const table = useReactTable({
     data: dataTable,
-    // columns,
+    columns,
-    columns: getColumns({ onRefresh: fetchData }),
     onSortingChange: setSorting,
     onColumnFiltersChange: setColumnFilters,
     getCoreRowModel: getCoreRowModel(),
@@ -252,11 +283,7 @@ const AddExpertTable = () => {
             ))
           ) : (
             <TableRow>
-              <TableCell
+              <TableCell colSpan={columns.length} className="h-24 text-center">
-                // colSpan={columns.length}
-                colSpan={table.getAllLeafColumns().length}
-                className="h-24 text-center"
-              >
                 No results.
               </TableCell>
             </TableRow>

app/[locale]/(protected)/admin/add-experts/create/page.tsx

@@ -35,61 +35,32 @@ import {
 import { error, loading } from "@/config/swal";
 import { Eye, EyeOff } from "lucide-react";
 
-// const FormSchema = z.object({
-//   name: z.string({
-//     required_error: "Required",
-//   }),
-//   username: z.string({
-//     required_error: "Required",
-//   }),
-//   password: z.string({
-//     required_error: "Required",
-//   }),
-//   phoneNumber: z.string({
-//     required_error: "Required",
-//   }),
-//   email: z.string({
-//     required_error: "Required",
-//   }),
-//   skills: z.string({
-//     required_error: "Required",
-//   }),
-//   experiences: z.string({
-//     required_error: "Required",
-//   }),
-//   company: z.string({
-//     required_error: "Required",
-//   }),
-// });
-
 const FormSchema = z.object({
-  name: z.string({ required_error: "Required" }),
+  name: z.string({
-  username: z
+    required_error: "Required",
-    .string({ required_error: "Required" })
+  }),
-    .refine((val) => !/\s/.test(val), {
+  username: z.string({
-      message: "Username tidak boleh mengandung spasi",
+    required_error: "Required",
-    }),
+  }),
-    // .transform((val) => val.toLowerCase()),
+  password: z.string({
-
+    required_error: "Required",
-  password: z
+  }),
-    .string({ required_error: "Required" })
+  phoneNumber: z.string({
-    .min(8, "Minimal 8 karakter")
+    required_error: "Required",
-    .regex(/[A-Z]/, "Harus mengandung huruf besar (A-Z)")
+  }),
-    .regex(/[0-9]/, "Harus mengandung angka (0-9)")
+  email: z.string({
-    .regex(/[^A-Za-z0-9]/, "Harus mengandung karakter spesial (!@#$%^&*)"),
+    required_error: "Required",
-
+  }),
-  // confirmPassword: z.string({ required_error: "Required" }),
+  skills: z.string({
-
+    required_error: "Required",
-  phoneNumber: z.string({ required_error: "Required" }),
+  }),
-  email: z.string({ required_error: "Required" }),
+  experiences: z.string({
-  skills: z.string({ required_error: "Required" }),
+    required_error: "Required",
-  experiences: z.string({ required_error: "Required" }),
+  }),
-  company: z.string({ required_error: "Required" }),
+  company: z.string({
+    required_error: "Required",
+  }),
 });
-// .refine((data) => data.password === data.confirmPassword, {
-//   path: ["confirmPassword"],
-//   message: "Konfirmasi password tidak sama",
-// });
 
 export type Placements = {
   index: number;
@@ -103,7 +74,6 @@ export default function AddExpertForm() {
   const form = useForm<z.infer<typeof FormSchema>>({
     resolver: zodResolver(FormSchema),
   });
-  const [passwordStrength, setPasswordStrength] = useState("");
   const [incrementId, setIncrementId] = useState(1);
   const [placementRows, setPlacementRows] = useState<Placements[]>([
     { index: 0, roleId: "", userLevelId: 0 },
@@ -148,7 +118,7 @@ export default function AddExpertForm() {
   };
 
   const save = async (data: z.infer<typeof FormSchema>) => {
-    console.log("data", data);
+    // console.log("data", data);
 
     const dataReq = {
       firstName: data.name,
@@ -165,7 +135,7 @@ export default function AddExpertForm() {
     };
 
     loading();
-
+    
     // check availability first
     var placementArr: any[] = [];
     placementRows.forEach((row: any) => {
@@ -274,10 +244,10 @@ export default function AddExpertForm() {
   };
 
   const handleRemoveRow = (index: number) => {
-    console.log(index);
+    // console.log(index);
-    console.log(placementRows);
+    // console.log(placementRows);
     const newPlacements = placementRows.filter((row) => row.index != index);
-    console.log(newPlacements);
+    // console.log(newPlacements);
     setPlacementRows(newPlacements);
   };
 
@@ -291,19 +261,6 @@ export default function AddExpertForm() {
     }
   };
 
-  const computeStrength = (password: string) => {
-    let score = 0;
-    if (password.length >= 8) score++;
-    if (/[A-Z]/.test(password)) score++;
-    if (/[0-9]/.test(password)) score++;
-    if (/[^A-Za-z0-9]/.test(password)) score++;
-
-    if (score <= 1) return "weak";
-    if (score === 2 || score === 3) return "medium";
-    if (score === 4) return "strong";
-    return "";
-  };
-
   return (
     <div>
       <SiteBreadcrumb />
@@ -331,39 +288,6 @@ export default function AddExpertForm() {
             )}
           />
           <FormField
-            control={form.control}
-            name="username"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Username (huruf kecil, tanpa spasi)</FormLabel>
-
-                <Input
-                  type="text"
-                  value={field.value}
-                  placeholder="masukkan username"
-                  onChange={(e) => {
-                    let value = e.target.value;
-
-                    // Hapus spasi otomatis
-                    value = value.replace(/\s+/g, "");
-
-                    // Jadikan lowercase otomatis
-                    value = value.toLowerCase();
-
-                    field.onChange(value);
-                  }}
-                />
-
-                {/* Info tambahan */}
-                <p className="text-xs text-gray-500 mt-1">
-                  Username otomatis menjadi huruf kecil tanpa spasi.
-                </p>
-
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-          {/* <FormField
             control={form.control}
             name="username"
             render={({ field }) => (
@@ -379,7 +303,7 @@ export default function AddExpertForm() {
                 <FormMessage />
               </FormItem>
             )}
-          /> */}
+          />
           <FormField
             control={form.control}
             name="phoneNumber"
@@ -425,69 +349,6 @@ export default function AddExpertForm() {
             )}
           />
           <FormField
-            control={form.control}
-            name="password"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Password</FormLabel>
-                <div className="relative">
-                  <Input
-                    type={showPassword ? "text" : "password"}
-                    value={field.value}
-                    placeholder="Masukkan Password"
-                    onChange={(e) => {
-                      field.onChange(e.target.value);
-                      setPasswordStrength(computeStrength(e.target.value));
-                    }}
-                  />
-
-                  <button
-                    type="button"
-                    onClick={() => setShowPassword(!showPassword)}
-                    className="absolute right-3 top-1/2 -translate-y-1/2 text-default-500"
-                  >
-                    {showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
-                  </button>
-                </div>
-                <FormLabel className="text-gray-400 text-[12px]">
-                  Password harus memiliki minimal 8 karakter, special karakter,
-                  angka dan huruf kapital
-                </FormLabel>
-
-                {/* Strength meter */}
-                {field.value && (
-                  <div className="mt-2">
-                    <div
-                      className={`h-2 rounded transition-all ${
-                        passwordStrength === "weak"
-                          ? "bg-red-500 w-1/4"
-                          : passwordStrength === "medium"
-                          ? "bg-yellow-500 w-2/4"
-                          : "bg-green-500 w-full"
-                      }`}
-                    />
-
-                    <p
-                      className={`text-xs mt-1 ${
-                        passwordStrength === "weak"
-                          ? "text-red-500"
-                          : passwordStrength === "medium"
-                          ? "text-yellow-600"
-                          : "text-green-600"
-                      }`}
-                    >
-                      {passwordStrength === "weak" && "Weak Password"}
-                      {passwordStrength === "medium" && "Medium Password"}
-                      {passwordStrength === "strong" && "Strong Password"}
-                    </p>
-                  </div>
-                )}
-
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-          {/* <FormField
             control={form.control}
             name="password"
             render={({ field }) => (
@@ -512,7 +373,7 @@ export default function AddExpertForm() {
                 <FormMessage />
               </FormItem>
             )}
-          /> */}
+          />
           <FormField
             control={form.control}
             name="skills"

app/[locale]/(protected)/admin/add-experts/update/[id]/page.tsx

@@ -37,43 +37,32 @@ import { Eye, EyeOff } from "lucide-react";
 import { useParams } from "next/navigation";
 
 const FormSchema = z.object({
-  name: z.string().optional(),
+  name: z.string({
-  username: z.string().optional(),
+    required_error: "Required",
-  password: z.string().optional(),
+  }),
-  phoneNumber: z.string().optional(),
+  username: z.string({
-  email: z.string().optional(),
+    required_error: "Required",
-  skills: z.string().optional(),
+  }),
-  experiences: z.string().optional(),
+  password: z.string({
-  company: z.string().optional(),
+    required_error: "Required",
+  }),
+  phoneNumber: z.string({
+    required_error: "Required",
+  }),
+  email: z.string({
+    required_error: "Required",
+  }),
+  skills: z.string({
+    required_error: "Required",
+  }),
+  experiences: z.string({
+    required_error: "Required",
+  }),
+  company: z.string({
+    required_error: "Required",
+  }),
 });
 
-// const FormSchema = z.object({
-//   name: z.string({
-//     required_error: "Required",
-//   }),
-//   username: z.string({
-//     required_error: "Required",
-//   }),
-//   password: z.string({
-//     required_error: "Required",
-//   }),
-//   phoneNumber: z.string({
-//     required_error: "Required",
-//   }),
-//   email: z.string({
-//     required_error: "Required",
-//   }),
-//   skills: z.string({
-//     required_error: "Required",
-//   }),
-//   experiences: z.string({
-//     required_error: "Required",
-//   }),
-//   company: z.string({
-//     required_error: "Required",
-//   }),
-// });
-
 export type Placements = {
   index: number;
   roleId?: string;
@@ -107,10 +96,6 @@ interface Detail {
       createdAt: string;
     };
   };
-  userRolePlacements?: {
-    roleId: number;
-    userLevelId: number;
-  }[];
 }
 
 export default function UpdateExpertForm() {
@@ -164,39 +149,6 @@ export default function UpdateExpertForm() {
     initState();
   }, [id]);
 
-  useEffect(() => {
-    if (!detail) return;
-
-    // Isi semua form field
-    form.reset({
-      name: detail.fullname || "",
-      username: detail.username || "",
-      phoneNumber: detail.phoneNumber || "",
-      email: detail.email || "",
-      password: "",
-      skills: detail?.userProfilesAdditional?.userCompetency?.id
-        ? String(detail.userProfilesAdditional.userCompetency.id)
-        : "",
-      experiences: detail?.userProfilesAdditional?.userExperienceId
-        ? String(detail.userProfilesAdditional.userExperienceId)
-        : "",
-      company: detail?.userProfilesAdditional?.companyName || "",
-    });
-
-    // 🔥 Masukkan posisi existing
-    if (detail.userRolePlacements && detail.userRolePlacements.length > 0) {
-      const mapped = detail.userRolePlacements.map(
-        (item: any, idx: number) => ({
-          index: idx,
-          roleId: String(item.roleId),
-          userLevelId: Number(item.userLevelId),
-        })
-      );
-
-      setPlacementRows(mapped);
-    }
-  }, [detail]);
-
   if (!detail) return <div>Loading...</div>;
 
   const togglePasswordType = () => {
@@ -233,39 +185,22 @@ export default function UpdateExpertForm() {
   };
 
   const save = async (data: z.infer<typeof FormSchema>) => {
-    console.log("data", data);
+    // console.log("data", data);
 
     const dataReq = {
       id: detail?.id,
-      firstName: data.name || detail.fullname,
+      firstName: data.name,
-      username: data.username || detail.username,
+      username: data.username,
-      email: data.email || detail.email,
+      email: data.email,
-      password: data.password || undefined,
+      password: data.password,
       address: "",
       roleId: "EXP-ID",
-      phoneNumber: data.phoneNumber || detail.phoneNumber,
+      phoneNumber: data.phoneNumber,
-      userCompetencyId:
+      userCompetencyId: data.skills,
-        data.skills || detail.userProfilesAdditional?.userCompetency?.id,
+      userExperienceId: data.experiences,
-      userExperienceId:
+      companyName: data.company,
-        data.experiences || detail.userProfilesAdditional?.userExperienceId,
-      companyName: data.company || detail.userProfilesAdditional?.companyName,
-      isAdmin: true,
     };
 
-    // const dataReq = {
-    //   id: detail?.id,
-    //   firstName: data.name,
-    //   username: data.username,
-    //   email: data.email,
-    //   password: data.password,
-    //   address: "",
-    //   roleId: "EXP-ID",
-    //   phoneNumber: data.phoneNumber,
-    //   userCompetencyId: data.skills,
-    //   userExperienceId: data.experiences,
-    //   companyName: data.company,
-    // };
-
     loading();
     const res = await saveUserInternal(dataReq);
     const resData = res?.data?.data;
@@ -310,7 +245,7 @@ export default function UpdateExpertForm() {
 
     const resExperiences = await getListExperiences();
     setUserExperiences(resExperiences?.data?.data);
-    console.log("experience", resExperiences?.data?.data);
+    // console.log("experience", resExperiences?.data?.data);
 
     const resUserLevels = await AdministrationLevelList();
     const data = resUserLevels?.data?.data;
@@ -353,10 +288,10 @@ export default function UpdateExpertForm() {
   };
 
   const handleRemoveRow = (index: number) => {
-    console.log(index);
+    // console.log(index);
-    console.log(placementRows);
+    // console.log(placementRows);
     const newPlacements = placementRows.filter((row) => row.index != index);
-    console.log(newPlacements);
+    // console.log(newPlacements);
     setPlacementRows(newPlacements);
   };
 
@@ -387,15 +322,10 @@ export default function UpdateExpertForm() {
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>Nama Lengkap</FormLabel>
-                  {/* <Input
+                  <Input
                     defaultValue={detail?.fullname}
                     placeholder="Masukkan Nama Lengkap"
                     onChange={field.onChange}
-                  /> */}
-                  <Input
-                    {...field}
-                    defaultValue={detail?.fullname}
-                    placeholder="Masukkan Nama Lengkap"
                   />
 
                   <FormMessage />
@@ -403,24 +333,18 @@ export default function UpdateExpertForm() {
               )}
             />
             <FormField
-              disabled
               control={form.control}
               name="username"
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>Username</FormLabel>
-                  {/* <Input
+                  <Input
                     type="text"
                     defaultValue={detail?.username}
                     placeholder="Masukkan"
                     onChange={field.onChange}
-                  /> */}
-                  <Input
-                    {...field}
-                    type="text"
-                    defaultValue={detail?.username}
-                    placeholder="Masukkan"
                   />
+
                   <FormMessage />
                 </FormItem>
               )}
@@ -431,17 +355,11 @@ export default function UpdateExpertForm() {
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>No. HP</FormLabel>
-                  {/* <Input
+                  <Input
                     type="number"
                     defaultValue={detail?.phoneNumber}
                     placeholder="Masukkan No.Hp"
                     onChange={field.onChange}
-                  /> */}
-                  <Input
-                    {...field}
-                    type="number"
-                    defaultValue={detail?.phoneNumber}
-                    placeholder="Masukkan"
                   />
                   <FormMessage />
                 </FormItem>
@@ -453,46 +371,17 @@ export default function UpdateExpertForm() {
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>Email</FormLabel>
-                  {/* <Input
+                  <Input
                     type="email"
                     defaultValue={detail?.email}
                     placeholder="Masukkan email"
                     onChange={field.onChange}
-                  /> */}
-                  <Input
-                    {...field}
-                    type="email"
-                    defaultValue={detail?.email}
-                    placeholder="Masukkan email"
                   />
                   <FormMessage />
                 </FormItem>
               )}
             />
-            {/* <FormField
+            <FormField
-              control={form.control}
-              name="password"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Password (Opsional)</FormLabel>
-                  <div className="relative">
-                    <Input
-                      {...field}
-                      type={showPassword ? "text" : "password"}
-                      placeholder="Kosongkan jika tidak ingin mengubah password"
-                    />
-                    <button
-                      type="button"
-                      onClick={() => setShowPassword(!showPassword)}
-                      className="absolute right-3 top-1/2 -translate-y-1/2"
-                    >
-                      {showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
-                    </button>
-                  </div>
-                </FormItem>
-              )}
-            /> */}
-            {/* <FormField
               control={form.control}
               name="password"
               render={({ field }) => (
@@ -517,7 +406,7 @@ export default function UpdateExpertForm() {
                   <FormMessage />
                 </FormItem>
               )}
-            /> */}
+            />
             <FormField
               control={form.control}
               name="skills"
@@ -592,21 +481,12 @@ export default function UpdateExpertForm() {
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>Nama Institusi/Perusahaan</FormLabel>
-                  {/* <Input
+                  <Input
                     type="text"
                     value={detail?.userProfilesAdditional?.companyName || ""}
                     placeholder="Nama Institusi/Perusahaan"
                     onChange={field.onChange}
-                  /> */}
-                  <Input
-                    {...field}
-                    type="text"
-                    defaultValue={
-                      detail?.userProfilesAdditional?.companyName || ""
-                    }
-                    placeholder="Nama Institusi/Perusahaan"
                   />
-
                   <FormMessage />
                 </FormItem>
               )}
@@ -617,7 +497,6 @@ export default function UpdateExpertForm() {
               {placementRows?.map((row: any) => (
                 <div key={row.index} className="flex items-center gap-2 my-2">
                   <Select
-                    value={row.roleId}
                     onValueChange={(e) =>
                       handleSelectionChange(row.index, "roleId", e)
                     }
@@ -654,7 +533,6 @@ export default function UpdateExpertForm() {
                   </SelectContent>
                 </Select> */}
                   <Select
-                    value={row.userLevelId}
                     onValueChange={(e) =>
                       handleSelectionChange(row.index, "userLevelId", e)
                     }
@@ -684,7 +562,7 @@ export default function UpdateExpertForm() {
                 type="button"
                 size="md"
                 onClick={handleAddRow}
-                disabled={placementRows.length >= 2}
+                disabled={placementRows.length >= 2} // optional: disable button if already 1 row added
               >
                 Tambah
               </Button>

app/[locale]/(protected)/admin/analysis/content-management/page.tsx

@@ -43,8 +43,8 @@ export default function ContentManagement() {
   const [ticket6, setTicket6] = useState("");
   const [isInternational, setIsInternational] = useState([false, false, false]);
 
-  const baseUrl = "https://analytic.sitani.info/";
+  const baseUrl = "https://db-mediahub.polri.go.id/";
-  const url = "https://analytic.sitani.info/trusted/";
+  const url = "https://db-mediahub.polri.go.id/trusted/";
 
   const view1 =
     levelName == "MABES POLRI"
@@ -87,7 +87,7 @@ export default function ContentManagement() {
         ? "views/2023_08_MediaHUB-KtnMgt_Rev100/db-ktn-intl?"
         : "views/2023_08_MediaHUB-KtnMgt_Rev100/db-ktn-intl?"
       : `views/2023_08_MediaHUB-KtnMgt_Rev100/db-ktn-intl?provinsi-polda=${poldaState}&`;
-  const param = ":embed=yes&:toolbar=no&:iframeSizedToWindow=true";
+  const param = ":embed=yes&:toolbar=yes&:iframeSizedToWindow=true";
 
   useEffect(() => {
     async function initState() {

app/[locale]/(protected)/admin/analysis/emergency-issue/page.tsx

@@ -43,8 +43,8 @@ export default function EmergencyIssue() {
   const [ticket6, setTicket6] = useState("");
   const [isInternational, setIsInternational] = useState([false, false, false]);
 
-  const baseUrl = "https://analytic.sitani.info/";
+  const baseUrl = "https://db-mediahub.polri.go.id/";
-  const url = "https://analytic.sitani.info/trusted/";
+  const url = "https://db-mediahub.polri.go.id/trusted/";
 
   const view1 =
     levelName == "MABES POLRI"
@@ -53,7 +53,7 @@ export default function EmergencyIssue() {
         : "views/2023_08_MediaHUB-KtnMgt_Rev100/db-emg-issue?"
       : `views/2023_08_MediaHUB-KtnMgt_Rev100/db-emg-issue?provinsi-polda=${provState}&`;
 
-  const param = ":embed=yes&:toolbar=no&:iframeSizedToWindow=true";
+  const param = ":embed=yes&:toolbar=yes&:iframeSizedToWindow=true";
 
   useEffect(() => {
     async function initState() {

app/[locale]/(protected)/admin/analysis/feedback-center/page.tsx

@@ -43,8 +43,8 @@ export default function FeedbackCenter() {
   const [ticket6, setTicket6] = useState("");
   const [isInternational, setIsInternational] = useState([false, false, false]);
 
-  const baseUrl = "https://analytic.sitani.info/";
+  const baseUrl = "https://db-mediahub.polri.go.id/";
-  const url = "https://analytic.sitani.info/trusted/";
+  const url = "https://db-mediahub.polri.go.id/trusted/";
 
   const view1 =
     levelName == "MABES POLRI"
@@ -53,7 +53,7 @@ export default function FeedbackCenter() {
         : "views/2023_08_MediaHUB-KtnMgt_Rev100/db-tickets?"
       : `views/2023_08_MediaHUB-KtnMgt_Rev100/db-tickets?provinsi-polda=${provState}&`;
 
-  const param = ":embed=yes&:toolbar=no&:iframeSizedToWindow=true";
+  const param = ":embed=yes&:toolbar=yes&:iframeSizedToWindow=true";
 
   useEffect(() => {
     async function initState() {

app/[locale]/(protected)/admin/analysis/schedule/page.tsx

@@ -38,8 +38,8 @@ export default function ContentManagement() {
   const [ticket6, setTicket6] = useState("");
   const [isInternational, setIsInternational] = useState([false, false, false]);
 
-  const baseUrl = "https://analytic.sitani.info/";
+  const baseUrl = "https://db-mediahub.polri.go.id/";
-  const url = "https://analytic.sitani.info/trusted/";
+  const url = "https://db-mediahub.polri.go.id/trusted/";
 
   const view1 =
     levelName == "MABES POLRI"
@@ -69,7 +69,7 @@ export default function ContentManagement() {
         : "views/2023_08_MediaHUB-KtnMgt_Rev100/db-ktn-act-jnl?"
       : `views/2023_08_MediaHUB-KtnMgt_Rev100/db-ktn-act-jnl?provinsi-polda=${poldaState}&`;
 
-  const param = ":embed=yes&:toolbar=no&:iframeSizedToWindow=true";
+  const param = ":embed=yes&:toolbar=yes&:iframeSizedToWindow=true";
 
   useEffect(() => {
     async function initState() {

app/[locale]/(protected)/admin/broadcast/campaign-list/account-list/component/table.tsx

@@ -59,12 +59,8 @@ import {
   deleteMediaBlastCampaignAccount,
   saveMediaBlastCampaignAccountBulk,
 } from "@/service/broadcast/broadcast";
-import {
+import { AdministrationUserList, getUserListAll } from "@/service/management-user/management-user";
-  AdministrationUserList,
-  getUserListAll,
-} from "@/service/management-user/management-user";
 import { close, loading, error, success, successCallback } from "@/config/swal";
-import { Link } from "@/i18n/routing";
 
 // Mock data for available accounts - replace with actual API call
 const availableAccounts = [
@@ -102,8 +98,7 @@ const AccountListTable = () => {
   const [accountCategory, setAccountCategory] = React.useState<string>("");
   const [selectedAccount, setSelectedAccount] = React.useState<any[]>([]);
   const [selectedCategory, setSelectedCategory] = React.useState<string>("");
-  const [availableAccountsList, setAvailableAccountsList] =
+  const [availableAccountsList, setAvailableAccountsList] = React.useState<any[]>(availableAccounts);
-    React.useState<any[]>(availableAccounts);
   const [usersList, setUsersList] = React.useState<any[]>([]);
 
   const table = useReactTable({
@@ -176,7 +171,7 @@ const AccountListTable = () => {
   async function saveCampaignAccount() {
     try {
       loading();
-
+      
       if (accountCategory === "all-account") {
         // Handle all accounts - send only campaignId and category "all"
         const request = {
@@ -207,7 +202,7 @@ const AccountListTable = () => {
           default:
             roleId = "5";
         }
-
+        
         const request = {
           mediaBlastCampaignId: campaignId,
           mediaBlastAccountCategory: `role-${roleId}`,
@@ -221,7 +216,7 @@ const AccountListTable = () => {
         // Handle custom selection - send campaignId and selected user IDs
         const request = {
           mediaBlastCampaignId: campaignId,
-          mediaBlastAccountIds: selectedAccount.map((acc) => acc.id),
+          mediaBlastAccountIds: selectedAccount.map(acc => acc.id),
         };
         const response = await saveMediaBlastCampaignAccountBulk(request);
         if (response?.error) {
@@ -229,7 +224,7 @@ const AccountListTable = () => {
           return;
         }
       }
-
+        
       close();
       successCallback("Akun berhasil ditambahkan ke campaign!");
       resetDialogState();
@@ -252,7 +247,7 @@ const AccountListTable = () => {
     try {
       loading();
       const response = await getUserListAll();
-
+      
       if (response?.data?.data?.content) {
         setUsersList(response.data.data.content);
       }
@@ -270,15 +265,15 @@ const AccountListTable = () => {
     setFiltered(temp);
   };
 
+
+
   const removeSelectedAccount = (accountId: string) => {
-    setSelectedAccount(selectedAccount.filter((acc) => acc.id !== accountId));
+    setSelectedAccount(selectedAccount.filter(acc => acc.id !== accountId));
   };
 
   const getFilteredAccounts = () => {
     if (accountCategory === "kategori" && selectedCategory) {
-      return availableAccountsList.filter(
+      return availableAccountsList.filter(acc => acc.category === selectedCategory);
-        (acc) => acc.category === selectedCategory
-      );
     }
     return availableAccountsList;
   };
@@ -296,10 +291,7 @@ const AccountListTable = () => {
                 Pilih Akun
               </Button>
             </DialogTrigger>
-            <DialogContent
+            <DialogContent size="md" className="max-w-xl max-h-[80vh] overflow-y-auto">
-              size="md"
-              className="max-w-xl max-h-[80vh] overflow-y-auto"
-            >
               <DialogHeader>
                 <DialogTitle>Pilih Akun Untuk Campaign Ini</DialogTitle>
               </DialogHeader>
@@ -358,17 +350,15 @@ const AccountListTable = () => {
                       options={usersList.map((user: any) => ({
                         value: user.id,
                         label: `${user.fullname} (${user.role?.name})`,
-                        user: user,
+                        user: user
                       }))}
                       value={selectedAccount.map((acc: any) => ({
                         value: acc.id,
                         label: `${acc.fullname} (${acc.role?.name})`,
-                        user: acc,
+                        user: acc
                       }))}
                       onChange={(selectedOptions: any) => {
-                        const selectedUsers = selectedOptions
+                        const selectedUsers = selectedOptions ? selectedOptions.map((option: any) => option.user) : [];
-                          ? selectedOptions.map((option: any) => option.user)
-                          : [];
                         setSelectedAccount(selectedUsers);
                       }}
                       placeholder="Cari dan pilih user..."
@@ -379,17 +369,14 @@ const AccountListTable = () => {
                       className="react-select"
                       classNamePrefix="select"
                     />
-
+                    
                     {/* Selected Accounts Display */}
                     {selectedAccount.length > 0 && (
                       <div className="space-y-2">
                         <Label>User Terpilih ({selectedAccount.length}):</Label>
                         <div className="flex flex-wrap gap-2">
                           {selectedAccount.map((acc) => (
-                            <Badge
+                            <Badge key={acc.id} className="flex items-center gap-1">
-                              key={acc.id}
-                              className="flex items-center gap-1"
-                            >
                               {acc.fullname}
                               <X
                                 className="h-3 w-3 cursor-pointer"
@@ -416,8 +403,7 @@ const AccountListTable = () => {
                 {accountCategory === "kategori" && selectedCategory && (
                   <div className="p-3 bg-green-50 rounded-md">
                     <p className="text-sm text-green-700">
-                      Semua akun dengan role "{selectedCategory.toUpperCase()}"
+                      Semua akun dengan role "{selectedCategory.toUpperCase()}" akan ditambahkan.
-                      akan ditambahkan.
                     </p>
                   </div>
                 )}
@@ -426,8 +412,7 @@ const AccountListTable = () => {
                 {accountCategory === "custom" && (
                   <div className="p-3 bg-purple-50 rounded-md">
                     <p className="text-sm text-purple-700">
-                      {selectedAccount.length} user terpilih akan ditambahkan ke
+                      {selectedAccount.length} user terpilih akan ditambahkan ke campaign ini.
-                      campaign ini.
                     </p>
                   </div>
                 )}
@@ -438,8 +423,7 @@ const AccountListTable = () => {
                   onClick={saveCampaignAccount}
                   disabled={
                     !accountCategory ||
-                    (accountCategory === "custom" &&
+                    (accountCategory === "custom" && selectedAccount.length < 1) ||
-                      selectedAccount.length < 1) ||
                     (accountCategory === "kategori" && !selectedCategory)
                   }
                 >
@@ -457,47 +441,7 @@ const AccountListTable = () => {
       </div>
 
       {/* === Filter Akun === */}
-      <div className="flex flex-row justify-end">
+      <div className="flex justify-end">
-        {/* <div className="flex flex-row gap-4">
-          <Link href="/admin/broadcast/campaign-list/account-list/create">
-            <Button variant="default" className="bg-[#3f37c9] gap-2">
-              <span>
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width="22"
-                  height="22"
-                  viewBox="0 0 24 24"
-                >
-                  <path
-                    fill="currentColor"
-                    d="M17 13h-4v4h-2v-4H7v-2h4V7h2v4h4m2-8H5c-1.11 0-2 .89-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2"
-                  />
-                </svg>
-              </span>
-              Tambahkan Akun
-            </Button>
-          </Link>
-          <Button variant="default" className="bg-[#3f37c9] gap-2">
-            <span>
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                width="24"
-                height="24"
-                viewBox="0 0 24 24"
-              >
-                <g fill="none">
-                  <path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z" />
-                  <path
-                    fill="currentColor"
-                    d="M12 2v6.5a1.5 1.5 0 0 0 1.5 1.5H20v10a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2v-1h3.414l-1.121 1.121a1 1 0 1 0 1.414 1.415l2.829-2.829a1 1 0 0 0 0-1.414l-2.829-2.828a1 1 0 1 0-1.414 1.414L7.414 17H4V4a2 2 0 0 1 2-2zM4 17v2H3a1 1 0 1 1 0-2zM14 2.043a2 2 0 0 1 1 .543L19.414 7a2 2 0 0 1 .543 1H14z"
-                  />
-                </g>
-              </svg>
-            </span>
-            Import Akun
-          </Button>
-        </div> */}
-
         <Popover>
           <PopoverTrigger asChild>
             <Button size="md" variant="outline">

app/[locale]/(protected)/admin/broadcast/campaign-list/account-list/create/page.tsx

@@ -6,6 +6,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import {
   Form,
   FormControl,
+  FormDescription,
   FormField,
   FormItem,
   FormLabel,
@@ -13,80 +14,55 @@ import {
 } from "@/components/ui/form";
 import withReactContent from "sweetalert2-react-content";
 import Swal from "sweetalert2";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
 import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
+import { format } from "date-fns";
+import { CalendarIcon } from "lucide-react";
+import { Calendar } from "@/components/ui/calendar";
+import { getOnlyDate } from "@/utils/globals";
 import {
-  getMediaBlastCampaignPage,
   saveMediaBlastAccount,
+  saveMediaBlastCampaign,
 } from "@/service/broadcast/broadcast";
 import { error } from "@/config/swal";
 import { useRouter } from "@/i18n/routing";
 import { Checkbox } from "@/components/ui/checkbox";
-import { useEffect, useState } from "react";
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
-
-// ----------------------------
-// ZOD SCHEMA (dinamis)
-// ----------------------------
 
 const FormSchema = z.object({
-  name: z.string({ required_error: "Required" }),
+  name: z.string({
-
+    required_error: "Required",
+  }),
   accountType: z
     .array(z.string())
-    .min(1, "Pilih minimal satu tipe akun"),
+    .refine((value) => value.some((item) => item), {
-
+      message: "Required",
-  email: z.string().optional(),
+    }),
-  whatsapp: z.string().optional(),
+  accountCategory: z.enum(["polri", "jurnalis", "umum", "ksp"], {
-
+    required_error: "Required",
-  campaignId: z.string({ required_error: "Required" }),
+  }),
-}).refine(
+  email: z.string({
-  (data) => {
+    required_error: "Required",
-    if (data.accountType.includes("email") && !data.email) return false;
+  }),
-    return true;
+  whatsapp: z.string({
-  },
+    required_error: "Required",
-  { message: "Email wajib diisi", path: ["email"] }
+  }),
-).refine(
+});
-  (data) => {
-    if (data.accountType.includes("wa") && !data.whatsapp) return false;
-    return true;
-  },
-  { message: "Whatsapp wajib diisi", path: ["whatsapp"] }
-);
-
-
-// ----------------------------
-// COMPONENT
-// ----------------------------
 
 export default function CreateAccountForBroadcast() {
   const MySwal = withReactContent(Swal);
   const router = useRouter();
-
   const form = useForm<z.infer<typeof FormSchema>>({
     resolver: zodResolver(FormSchema),
-    defaultValues: {
+    defaultValues: { accountType: [] },
-      accountType: [],
-      email: "",
-      whatsapp: "",
-    },
   });
 
-  const selectedTypes = form.watch("accountType");
-  const [campaigns, setCampaigns] = useState<any[]>([]);
-
-  useEffect(() => {
-    fetchCampaignList();
-  }, []);
-
-  async function fetchCampaignList() {
-    try {
-      const res = await getMediaBlastCampaignPage(0);
-      setCampaigns(res?.data?.data?.content ?? []);
-    } catch (e) {
-      console.log("Error fetch campaign:", e);
-    }
-  }
-
   const onSubmit = async (data: z.infer<typeof FormSchema>) => {
     MySwal.fire({
       title: "Simpan Data",
@@ -109,8 +85,10 @@ export default function CreateAccountForBroadcast() {
       icon: "success",
       confirmButtonColor: "#3085d6",
       confirmButtonText: "OK",
-    }).then(() => {
+    }).then((result) => {
-      router.push("/admin/broadcast/campaign-list/account-list");
+      if (result.isConfirmed) {
+        router.push("/admin/broadcast/campaign-list/account-list");
+      }
     });
   }
 
@@ -118,21 +96,20 @@ export default function CreateAccountForBroadcast() {
     const reqData = {
       accountName: data.name,
       accountType: data.accountType.join(","),
-      emailAddress: data.email ?? "",
+      accountCategory: data.accountCategory,
-      whatsappNumber: data.whatsapp ?? "",
+      emailAddress: data.email,
-      campaignId: data.campaignId,
+      whatsappNumber: data.whatsapp,
     };
-
+    // console.log("data", data);
-    console.log("REQ:", reqData);
 
     const response = await saveMediaBlastAccount(reqData);
     if (response?.error) {
       error(response.message);
-      return;
+      return false;
     }
+
     successSubmit();
   };
-
   return (
     <div>
       <SiteBreadcrumb />
@@ -141,9 +118,7 @@ export default function CreateAccountForBroadcast() {
           onSubmit={form.handleSubmit(onSubmit)}
           className="space-y-3 bg-white rounded-sm p-4"
         >
-          <p className="font-semibold">Account</p>
+          <p className="fonnt-semibold">Account</p>
-
-          {/* NAMA */}
           <FormField
             control={form.control}
             name="name"
@@ -155,125 +130,172 @@ export default function CreateAccountForBroadcast() {
                   placeholder="Masukkan nama"
                   onChange={field.onChange}
                 />
+
                 <FormMessage />
               </FormItem>
             )}
           />
-
-          {/* CHECKBOX TIPE AKUN */}
           <FormField
             control={form.control}
             name="accountType"
-            render={({ field }) => (
+            render={() => (
               <FormItem>
                 <FormLabel>Tipe Akun</FormLabel>
-                <div className="flex flex-row gap-4">
+                <div className="flex flex-row gap-2">
-                  {/* WA */}
+                  {" "}
-                  <div className="flex items-center gap-2">
+                  <FormField
-                    <Checkbox
+                    key="wa"
-                      checked={field.value.includes("wa")}
+                    control={form.control}
-                      onCheckedChange={(checked) =>
+                    name="accountType"
-                        checked
+                    render={({ field }) => {
-                          ? field.onChange([...field.value, "wa"])
+                      return (
-                          : field.onChange(field.value.filter((v) => v !== "wa"))
+                        <FormItem
-                      }
+                          key="wa"
-                    />
+                          className="flex flex-row items-start space-x-3 space-y-0"
-                    <label>Whatsapp</label>
+                        >
-                  </div>
+                          <FormControl>
-
+                            <Checkbox
-                  {/* EMAIL */}
+                              checked={field.value?.includes("wa")}
-                  <div className="flex items-center gap-2">
+                              onCheckedChange={(checked) => {
-                    <Checkbox
+                                return checked
-                      checked={field.value.includes("email")}
+                                  ? field.onChange([...field.value, "wa"])
-                      onCheckedChange={(checked) =>
+                                  : field.onChange(
-                        checked
+                                      field.value?.filter(
-                          ? field.onChange([...field.value, "email"])
+                                        (value) => value !== "wa"
-                          : field.onChange(
+                                      )
-                              field.value.filter((v) => v !== "email")
+                                    );
-                            )
+                              }}
-                      }
+                            />
-                    />
+                          </FormControl>
-                    <label>Email</label>
+                          <FormLabel className="font-normal">
-                  </div>
+                            Whatsapp
+                          </FormLabel>
+                        </FormItem>
+                      );
+                    }}
+                  />
+                  <FormField
+                    key="email"
+                    control={form.control}
+                    name="accountType"
+                    render={({ field }) => {
+                      return (
+                        <FormItem
+                          key="email"
+                          className="flex flex-row items-start space-x-3 space-y-0"
+                        >
+                          <FormControl>
+                            <Checkbox
+                              checked={field.value?.includes("email")}
+                              onCheckedChange={(checked) => {
+                                return checked
+                                  ? field.onChange([...field.value, "email"])
+                                  : field.onChange(
+                                      field.value?.filter(
+                                        (value) => value !== "email"
+                                      )
+                                    );
+                              }}
+                            />
+                          </FormControl>
+                          <FormLabel className="font-normal">Email</FormLabel>
+                        </FormItem>
+                      );
+                    }}
+                  />
                 </div>
+
                 <FormMessage />
               </FormItem>
             )}
           />
-
-          {/* FORM WHATSAPP */}
-          {selectedTypes.includes("wa") && (
-            <FormField
-              control={form.control}
-              name="whatsapp"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Whatsapp</FormLabel>
-                  <Input
-                    type="number"
-                    placeholder="Masukkan nomor Whatsapp"
-                    {...field}
-                  />
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          )}
-
-          {/* FORM EMAIL */}
-          {selectedTypes.includes("email") && (
-            <FormField
-              control={form.control}
-              name="email"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Email</FormLabel>
-                  <Input
-                    type="email"
-                    placeholder="Masukkan email"
-                    {...field}
-                  />
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          )}
-
-          {/* CAMPAIGN */}
           <FormField
             control={form.control}
-            name="campaignId"
+            name="accountCategory"
             render={({ field }) => (
-              <FormItem>
+              <FormItem className="space-y-3">
-                <FormLabel>Campaign</FormLabel>
+                <FormLabel>Kategori</FormLabel>
                 <FormControl>
-                  <select
+                  <RadioGroup
-                    className="w-full border rounded-md p-2 text-sm"
+                    onValueChange={field.onChange}
-                    value={field.value}
+                    defaultValue={field.value}
-                    onChange={field.onChange}
+                    className="flex flex-row gap-2"
                   >
-                    <option value="" className="text-slate-400">
+                    <FormItem className="flex items-center space-x-3 space-y-0">
-                      Pilih campaign
+                      <FormControl>
-                    </option>
+                        <RadioGroupItem value="polri" />
-
+                      </FormControl>
-                    {campaigns.map((c: any) => (
+                      <FormLabel className="font-normal">POLRI</FormLabel>
-                      <option key={c.id} value={c.id}>
+                    </FormItem>
-                        {c.title || `Campaign ${c.id}`}
+                    <FormItem className="flex items-center space-x-3 space-y-0">
-                      </option>
+                      <FormControl>
-                    ))}
+                        <RadioGroupItem value="jurnalis" />
-                  </select>
+                      </FormControl>
+                      <FormLabel className="font-normal">JURNALIS</FormLabel>
+                    </FormItem>
+                    <FormItem className="flex items-center space-x-3 space-y-0">
+                      <FormControl>
+                        <RadioGroupItem value="umum" />
+                      </FormControl>
+                      <FormLabel className="font-normal">UMUM</FormLabel>
+                    </FormItem>
+                    <FormItem className="flex items-center space-x-3 space-y-0">
+                      <FormControl>
+                        <RadioGroupItem value="ksp" />
+                      </FormControl>
+                      <FormLabel className="font-normal">KSP</FormLabel>
+                    </FormItem>
+                  </RadioGroup>
                 </FormControl>
                 <FormMessage />
               </FormItem>
             )}
           />
+          <FormField
+            control={form.control}
+            name="email"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>Nama</FormLabel>
+                <Input
+                  type="email"
+                  value={field.value}
+                  placeholder="Masukkan email"
+                  onChange={field.onChange}
+                />
 
-          {/* BUTTON */}
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name="whatsapp"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>Nama</FormLabel>
+                <Input
+                  type="number"
+                  value={field.value}
+                  placeholder="Masukkan whatsapp"
+                  onChange={field.onChange}
+                />
+
+                <FormMessage />
+              </FormItem>
+            )}
+          />
           <div className="flex flex-row gap-2 mt-4 pt-4">
-            <Button type="button" variant="outline" color="destructive">
+            <Button
+              size="md"
+              type="button"
+              variant="outline"
+              color="destructive"
+              className="text-xs"
+            >
               Cancel
             </Button>
-            <Button type="submit" color="primary">
+            <Button size="md" type="submit" color="primary" className="text-xs">
               Submit
             </Button>
           </div>
@@ -282,380 +304,3 @@ export default function CreateAccountForBroadcast() {
     </div>
   );
 }
-
-
-// "use client";
-// import SiteBreadcrumb from "@/components/site-breadcrumb";
-// import { z } from "zod";
-// import { useForm } from "react-hook-form";
-// import { zodResolver } from "@hookform/resolvers/zod";
-// import {
-//   Form,
-//   FormControl,
-//   FormField,
-//   FormItem,
-//   FormLabel,
-//   FormMessage,
-// } from "@/components/ui/form";
-// import withReactContent from "sweetalert2-react-content";
-// import Swal from "sweetalert2";
-// import { Input } from "@/components/ui/input";
-// import { Button } from "@/components/ui/button";
-// import {
-//   getMediaBlastCampaignPage,
-//   saveMediaBlastAccount,
-// } from "@/service/broadcast/broadcast";
-// import { error } from "@/config/swal";
-// import { useRouter } from "@/i18n/routing";
-// import { Checkbox } from "@/components/ui/checkbox";
-// import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
-// import { useEffect, useState } from "react";
-
-// // const FormSchema = z.object({
-// //   name: z.string({
-// //     required_error: "Required",
-// //   }),
-// //   accountType: z
-// //     .array(z.string())
-// //     .refine((value) => value.some((item) => item), {
-// //       message: "Required",
-// //     }),
-// //   accountCategory: z.enum(["polri", "jurnalis", "umum", "ksp"], {
-// //     required_error: "Required",
-// //   }),
-// //   email: z.string({
-// //     required_error: "Required",
-// //   }),
-// //   whatsapp: z.string({
-// //     required_error: "Required",
-// //   }),
-// //   campaignId: z.string({ required_error: "Required" }),
-// // });
-// const FormSchema = z
-//   .object({
-//     name: z.string().min(1, "Required"),
-
-//     accountType: z.array(z.string()).refine((value) => value.length > 0, {
-//       message: "Pilih minimal satu tipe akun",
-//     }),
-
-//     accountCategory: z.enum(["polri", "jurnalis", "umum", "ksp"], {
-//       required_error: "Required",
-//     }),
-
-//     email: z.string().optional(),
-//     whatsapp: z.string().optional(),
-
-//     campaignId: z.string().min(1, "Required"),
-//   })
-//   .refine(
-//     (data) => {
-//       if (data.accountType.includes("email")) {
-//         return !!data.email && data.email.trim() !== "";
-//       }
-//       return true;
-//     },
-//     { path: ["email"], message: "Email wajib diisi" }
-//   )
-//   .refine(
-//     (data) => {
-//       if (data.accountType.includes("wa")) {
-//         return !!data.whatsapp && data.whatsapp.trim() !== "";
-//       }
-//       return true;
-//     },
-//     { path: ["whatsapp"], message: "Whatsapp wajib diisi" }
-//   );
-
-// export default function CreateAccountForBroadcast() {
-//   const MySwal = withReactContent(Swal);
-//   const router = useRouter();
-//   const form = useForm<z.infer<typeof FormSchema>>({
-//     resolver: zodResolver(FormSchema),
-//     defaultValues: { accountType: [] },
-//   });
-//   const selectedTypes = form.watch("accountType");
-//   const [campaigns, setCampaigns] = useState<any[]>([]);
-
-//   useEffect(() => {
-//     fetchCampaignList();
-//   }, []);
-
-//   async function fetchCampaignList() {
-//     try {
-//       const res = await getMediaBlastCampaignPage(0);
-//       setCampaigns(res?.data?.data?.content ?? []);
-//     } catch (e) {
-//       console.log("Error fetch campaign:", e);
-//     }
-//   }
-
-//   const onSubmit = async (data: z.infer<typeof FormSchema>) => {
-//     MySwal.fire({
-//       title: "Simpan Data",
-//       text: "Apakah Anda yakin ingin menyimpan data ini?",
-//       icon: "warning",
-//       showCancelButton: true,
-//       cancelButtonColor: "#d33",
-//       confirmButtonColor: "#3085d6",
-//       confirmButtonText: "Simpan",
-//     }).then((result) => {
-//       if (result.isConfirmed) {
-//         save(data);
-//       }
-//     });
-//   };
-
-//   function successSubmit() {
-//     MySwal.fire({
-//       title: "Sukses",
-//       icon: "success",
-//       confirmButtonColor: "#3085d6",
-//       confirmButtonText: "OK",
-//     }).then((result) => {
-//       if (result.isConfirmed) {
-//         router.push("/admin/broadcast/campaign-list/account-list");
-//       }
-//     });
-//   }
-
-//   const save = async (data: z.infer<typeof FormSchema>) => {
-//     const reqData = {
-//       accountName: data.name,
-//       accountType: data.accountType.join(","),
-//       accountCategory: data.accountCategory,
-//       emailAddress: data.email ?? "",
-//       whatsappNumber: data.whatsapp ?? "",
-//       campaignId: data.campaignId,
-//     };
-//     console.log("data", data);
-
-//     const response = await saveMediaBlastAccount(reqData);
-//     if (response?.error) {
-//       error(response.message);
-//       return false;
-//     }
-
-//     successSubmit();
-//   };
-//   return (
-//     <div>
-//       <SiteBreadcrumb />
-//       <Form {...form}>
-//         <form
-//           onSubmit={form.handleSubmit(onSubmit)}
-//           className="space-y-3 bg-white rounded-sm p-4"
-//         >
-//           <p className="fonnt-semibold">Account</p>
-//           <FormField
-//             control={form.control}
-//             name="name"
-//             render={({ field }) => (
-//               <FormItem>
-//                 <FormLabel>Nama</FormLabel>
-//                 <Input
-//                   value={field.value}
-//                   placeholder="Masukkan nama"
-//                   onChange={field.onChange}
-//                 />
-
-//                 <FormMessage />
-//               </FormItem>
-//             )}
-//           />
-//           <FormField
-//             control={form.control}
-//             name="accountType"
-//             render={() => (
-//               <FormItem>
-//                 <FormLabel>Tipe Akun</FormLabel>
-//                 <div className="flex flex-row gap-2">
-//                   {" "}
-//                   <FormField
-//                     key="wa"
-//                     control={form.control}
-//                     name="accountType"
-//                     render={({ field }) => {
-//                       return (
-//                         <FormItem
-//                           key="wa"
-//                           className="flex flex-row items-start space-x-3 space-y-0"
-//                         >
-//                           <FormControl>
-//                             <Checkbox
-//                               checked={field.value?.includes("wa")}
-//                               onCheckedChange={(checked) => {
-//                                 return checked
-//                                   ? field.onChange([...field.value, "wa"])
-//                                   : field.onChange(
-//                                       field.value?.filter(
-//                                         (value) => value !== "wa"
-//                                       )
-//                                     );
-//                               }}
-//                             />
-//                           </FormControl>
-//                           <FormLabel className="font-normal">
-//                             Whatsapp
-//                           </FormLabel>
-//                         </FormItem>
-//                       );
-//                     }}
-//                   />
-//                   <FormField
-//                     key="email"
-//                     control={form.control}
-//                     name="accountType"
-//                     render={({ field }) => {
-//                       return (
-//                         <FormItem
-//                           key="email"
-//                           className="flex flex-row items-start space-x-3 space-y-0"
-//                         >
-//                           <FormControl>
-//                             <Checkbox
-//                               checked={field.value?.includes("email")}
-//                               onCheckedChange={(checked) => {
-//                                 return checked
-//                                   ? field.onChange([...field.value, "email"])
-//                                   : field.onChange(
-//                                       field.value?.filter(
-//                                         (value) => value !== "email"
-//                                       )
-//                                     );
-//                               }}
-//                             />
-//                           </FormControl>
-//                           <FormLabel className="font-normal">Email</FormLabel>
-//                         </FormItem>
-//                       );
-//                     }}
-//                   />
-//                 </div>
-
-//                 <FormMessage />
-//               </FormItem>
-//             )}
-//           />
-//           {/* <FormField
-//             control={form.control}
-//             name="accountCategory"
-//             render={({ field }) => (
-//               <FormItem className="space-y-3">
-//                 <FormLabel>Kategori</FormLabel>
-//                 <FormControl>
-//                   <RadioGroup
-//                     onValueChange={field.onChange}
-//                     defaultValue={field.value}
-//                     className="flex flex-row gap-2"
-//                   >
-//                     <FormItem className="flex items-center space-x-3 space-y-0">
-//                       <FormControl>
-//                         <RadioGroupItem value="polri" />
-//                       </FormControl>
-//                       <FormLabel className="font-normal">POLRI</FormLabel>
-//                     </FormItem>
-//                     <FormItem className="flex items-center space-x-3 space-y-0">
-//                       <FormControl>
-//                         <RadioGroupItem value="jurnalis" />
-//                       </FormControl>
-//                       <FormLabel className="font-normal">JURNALIS</FormLabel>
-//                     </FormItem>
-//                     <FormItem className="flex items-center space-x-3 space-y-0">
-//                       <FormControl>
-//                         <RadioGroupItem value="umum" />
-//                       </FormControl>
-//                       <FormLabel className="font-normal">UMUM</FormLabel>
-//                     </FormItem>
-//                     <FormItem className="flex items-center space-x-3 space-y-0">
-//                       <FormControl>
-//                         <RadioGroupItem value="ksp" />
-//                       </FormControl>
-//                       <FormLabel className="font-normal">KSP</FormLabel>
-//                     </FormItem>
-//                   </RadioGroup>
-//                 </FormControl>
-//                 <FormMessage />
-//               </FormItem>
-//             )}
-//           /> */}
-//           <FormField
-//             control={form.control}
-//             name="email"
-//             render={({ field }) => (
-//               <FormItem>
-//                 <FormLabel>Email</FormLabel>
-//                 <Input
-//                   type="email"
-//                   value={field.value}
-//                   placeholder="Masukkan email"
-//                   onChange={field.onChange}
-//                 />
-
-//                 <FormMessage />
-//               </FormItem>
-//             )}
-//           />
-//           <FormField
-//             control={form.control}
-//             name="whatsapp"
-//             render={({ field }) => (
-//               <FormItem>
-//                 <FormLabel>Nama</FormLabel>
-//                 <Input
-//                   type="number"
-//                   value={field.value}
-//                   placeholder="Masukkan whatsapp"
-//                   onChange={field.onChange}
-//                 />
-
-//                 <FormMessage />
-//               </FormItem>
-//             )}
-//           />
-//           <FormField
-//             control={form.control}
-//             name="campaignId"
-//             render={({ field }) => (
-//               <FormItem>
-//                 <FormLabel>Campaign</FormLabel>
-//                 <FormControl>
-//                   <select
-//                     className="w-full border rounded-md p-2"
-//                     value={field.value}
-//                     onChange={field.onChange}
-//                   >
-//                     <option value="" className="text-slate-400">
-//                       Pilih campaign
-//                     </option>
-
-//                     {campaigns.map((c: any) => (
-//                       <option key={c.id} value={c.id}>
-//                         {c.title || `Campaign ${c.id}`}
-//                       </option>
-//                     ))}
-//                   </select>
-//                 </FormControl>
-//                 <FormMessage />
-//               </FormItem>
-//             )}
-//           />
-//           <div className="flex flex-row gap-2 mt-4 pt-4">
-//             <Button
-//               size="md"
-//               type="button"
-//               variant="outline"
-//               color="destructive"
-//               className="text-xs"
-//             >
-//               Cancel
-//             </Button>
-//             <Button size="md" type="submit" color="primary" className="text-xs">
-//               Submit
-//             </Button>
-//           </div>
-//         </form>
-//       </Form>
-//     </div>
-//   );
-// }

app/[locale]/(protected)/admin/broadcast/campaign-list/account-list/edit/[id]/page.tsx

@@ -157,7 +157,7 @@ export default function EditAccountForBroadcast() {
       isDefault: false,
       isAdmin: true,
     };
-    console.log("data", data);
+    // console.log("data", data);
 
     const response = await saveUserInternal(reqData);
     if (response?.error) {

app/[locale]/(protected)/admin/broadcast/campaign-list/component/table.tsx

@@ -136,7 +136,7 @@ const CampaignListTable = () => {
         item.no = (page - 1) * 10 + index + 1;
       });
 
-      console.log("contentData : ", data);
+      // console.log("contentData : ", data);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);
@@ -152,12 +152,12 @@ const CampaignListTable = () => {
       <div className="flex justify-between mb-10 items-center">
         <p className="text-xl font-medium text-default-900">Daftar Campaign</p>
         <div className="flex flex-row gap-2">
-          {/* <Link href="/admin/broadcast/campaign-list/account-list">
+          <Link href="/admin/broadcast/campaign-list/account-list">
             <Button color="primary" size="md" className="text-sm">
               <UserIcon />
               Daftar Akun
             </Button>
-          </Link> */}
+          </Link>
           <Link href="/admin/broadcast/campaign-list/create">
             <Button color="primary" size="md" className="text-sm">
               <NewCampaignIcon size={23} />

app/[locale]/(protected)/admin/broadcast/campaign-list/detail/[id]/page.tsx

@@ -117,8 +117,8 @@ export default function BroadcastCampaignDetail({
 
   async function getListPaginationData() {
     loading();
-    console.log("Type : ", typeFilter);
+    // console.log("Type : ", typeFilter);
-    console.log("Date : ", startDateString, endDateString);
+    // console.log("Date : ", startDateString, endDateString);
 
     try {
       const res = await getMediaBlastBroadcastList(
@@ -152,7 +152,7 @@ export default function BroadcastCampaignDetail({
   ]);
 
   function setupData(rawData: PaginatedResponse) {
-    console.log("raw", rawData);
+    // console.log("raw", rawData);
     if (rawData !== undefined) {
       const dataContent = rawData?.content;
       const data: CampaignData[] = [];
@@ -251,7 +251,7 @@ export default function BroadcastCampaignDetail({
         setEndDateString(getOnlyDate(endDate));
       }
     }
-    console.log("date range", dateRange);
+    // console.log("date range", dateRange);
     initState();
   }, [calenderState, startDate, endDate]);
 

app/[locale]/(protected)/admin/broadcast/email/[id]/page.tsx

@@ -5,7 +5,7 @@ export default function CreateEmailBlast() {
   return (
     <div>
       <SiteBreadcrumb />
-      <ContentBlast />
+      <ContentBlast type="email" />
     </div>
   );
 }

app/[locale]/(protected)/admin/broadcast/email/component/column.tsx

@@ -90,16 +90,16 @@ const columns: ColumnDef<any>[] = [
                 Detail
               </DropdownMenuItem>
             </Link>
-            <Link href={`/admin/broadcast/create/${row.original.id}`}>
+            <Link href={`/admin/broadcast/email/${row.original.id}`}>
               <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none cursor-pointer">
-                Email & Whatsapp Blast
+                Email Blast
               </DropdownMenuItem>
             </Link>
-            {/* <Link href={`/admin/broadcast/whatsapp/${row.original.id}`}>
+            <Link href={`/admin/broadcast/whatsapp/${row.original.id}`}>
               <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none cursor-pointer">
                 Whatsapp Blast
               </DropdownMenuItem>
-            </Link> */}
+            </Link>
           </DropdownMenuContent>
         </DropdownMenu>
       );

app/[locale]/(protected)/admin/broadcast/email/component/table.tsx

@@ -160,7 +160,7 @@ const BroadcastEmailTable = () => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
 
-      console.log("contentData : ", data);
+      // console.log("contentData : ", data);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/admin/broadcast/page.tsx

@@ -1,6 +1,6 @@
 "use client";
 import SiteBreadcrumb from "@/components/site-breadcrumb";
-import BroadcastTable from "./create/component/table";
+import BroadcastTable from "./email/component/table";
 import { PlusIcon } from "lucide-react";
 
 import EscalationTable from "../../shared/communication/escalation/components/escalation-table";
@@ -8,7 +8,7 @@ import InternalTable from "../../shared/communication/internal/components/intern
 import { useState } from "react";
 import { Link } from "@/i18n/routing";
 import { Button } from "@/components/ui/button";
-import BroadcastEmailTable from "./create/component/table";
+import BroadcastEmailTable from "./email/component/table";
 import BroadcastWhatsAppTable from "./whatsapp/component/table";
 
 export default function AdminBroadcast() {

app/[locale]/(protected)/admin/broadcast/whatsapp/[id]/page.tsx

@@ -5,7 +5,7 @@ export default function CreateWABlast() {
   return (
     <div>
       <SiteBreadcrumb />
-      {/* <ContentBlast /> */}
+      <ContentBlast type="wa" />
     </div>
   );
 }

app/[locale]/(protected)/admin/broadcast/whatsapp/component/table.tsx

@@ -160,7 +160,7 @@ const BroadcastWhatsAppTable = () => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
 
-      console.log("contentData : ", data);
+      // console.log("contentData : ", data);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/admin/management-user/external/detail/[id]/page.tsx

@@ -85,7 +85,7 @@ export default function EditUserForm() {
     const response = await getUserById(String(id));
     const res = response?.data?.data;
     close();
-    console.log("res", res);
+    // console.log("res", res);
     form.setValue("fullname", res?.fullname);
     form.setValue("username", res?.username);
     form.setValue("phoneNumber", res?.phoneNumber);

app/[locale]/(protected)/admin/management-user/external/edit/[id]/page.tsx

@@ -126,7 +126,7 @@ export default function EditUserForm() {
     const response = await getUserById(String(id));
     const res = response?.data?.data;
     close();
-    console.log("res", res);
+    // console.log("res", res);
     form.setValue("fullname", res?.fullname);
     form.setValue("username", res?.username);
     form.setValue("phoneNumber", res?.phoneNumber);

app/[locale]/(protected)/admin/management-user/internal/detail/[id]/page.tsx

@@ -203,7 +203,7 @@ export default function DetailUserForm() {
     const response = await getUserById(String(id));
     const res = response?.data?.data;
     close();
-    console.log("res", res);
+    // console.log("res", res);
     if (Number(res.roleId) > 4) {
       form.setValue("fullname", res?.fullname);
       form.setValue("username", res?.username);
@@ -215,7 +215,7 @@ export default function DetailUserForm() {
       form.setValue("level", String(res?.userLevelId));
     } else {
       initFetch();
-      console.log("sadad", res?.role?.code);
+      // console.log("sadad", res?.role?.code);
       form.setValue("fullname", res?.fullname);
       form.setValue("username", res?.username);
       form.setValue("phoneNumber", res?.phoneNumber);

app/[locale]/(protected)/admin/management-user/internal/edit/[id]/page.tsx

@@ -209,7 +209,7 @@ export default function EditUserForm() {
     const response = await getUserById(String(id));
     const res = response?.data?.data;
     close();
-    console.log("res", res);
+    // console.log("res", res);
     if (Number(res.roleId) > 4) {
       form.setValue("fullname", res?.fullname);
       form.setValue("username", res?.username);

app/[locale]/(protected)/admin/media-tracking/component/modal.tsx

@@ -43,7 +43,7 @@ export default function TrackingMediaModal(props: { triggerFetch: () => void })
     }
 
     if (/\s/.test(value)) {
-      console.log("Terdapat spasi dalam input");
+      // console.log("Terdapat spasi dalam input");
       fecthAll();
     }
 

app/[locale]/(protected)/admin/media-tracking/component/table.tsx

@@ -161,11 +161,11 @@ const NewsTable = () => {
       setCategoryFilter(
         categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
       );
-      console.log(
+      // console.log(
-        "Kategori",
+      //   "Kategori",
-        categorie,
+      //   categorie,
-        categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
+      //   categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
-      );
+      // );
     }
   }, [categorie]);
 
@@ -177,7 +177,7 @@ const NewsTable = () => {
     } else {
       filter.splice(categoryFilter.indexOf(id), 1);
     }
-    console.log("checkbox filter", filter);
+    // console.log("checkbox filter", filter);
     setCategoryFilter(filter);
     router.push(`?category=${filter.join("&")}`);
   };

app/[locale]/(protected)/admin/media-tracking/detail/component/column.tsx

@@ -31,8 +31,6 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { Collapsible, CollapsibleContent } from "@/components/ui/collapsible";
-import { validateMediaLink } from "@/service/media-tracking/media-tracking";
-import toast from "react-hot-toast";
 
 const columns: ColumnDef<any>[] = [
   {
@@ -54,132 +52,12 @@ const columns: ColumnDef<any>[] = [
       <span className="normal-case">{row.getValue("title")}</span>
     ),
   },
-  // {
-  //   accessorKey: "link",
-  //   header: "Link Berita",
-  //   cell: ({ row }) => (
-  //     <span className="normal-case">{row.getValue("link")}</span>
-  //   ),
-  // },
   {
     accessorKey: "link",
     header: "Link Berita",
-    cell: ({ row }) => {
+    cell: ({ row }) => (
-      const link = row.getValue<string>("link");
+      <span className="normal-case">{row.getValue("link")}</span>
-
+    ),
-      if (!link) {
-        return <span className="text-muted-foreground">-</span>;
-      }
-
-      return (
-        <Link
-          href={link}
-          target="_blank"
-          rel="noopener noreferrer"
-          className="text-blue-600 underline hover:text-blue-800 break-all"
-        >
-          {link}
-        </Link>
-      );
-    },
-  },
-  {
-    id: "validation",
-    header: "Validasi",
-    cell: ({ row, table }) => {
-      const original = row.original;
-
-      // const isValid = original.isValid;
-      const isRelevant = original.isRelevant;
-      const link = original.link;
-
-      const updateRow = (data: Partial<any>) => {
-        table.options.meta?.updateData(row.index, data);
-      };
-
-      const handleValid = async () => {
-        try {
-          await validateMediaLink(original.id, true);
-          updateRow({
-            isRelevant: true,
-          });
-          table.options.meta?.refetchData?.();
-        } catch (err: any) {
-          toast.error(err.message);
-        }
-      };
-
-      const handleInvalid = async () => {
-        try {
-          await validateMediaLink(original.id, false);
-
-          updateRow({
-            isRelevant: false,
-          });
-          table.options.meta?.refetchData?.();
-        } catch (err: any) {
-          toast.error(err.message);
-        }
-      };
-
-      if (!link) {
-        return <span className="text-muted-foreground">-</span>;
-      }
-
-      if (isRelevant === true) {
-        return (
-          <Button
-            size="sm"
-            className="bg-green-600 hover:bg-green-700"
-            disabled
-          >
-            Relevan
-          </Button>
-        );
-      }
-
-      return (
-        <div className="flex gap-2">
-          <Button
-            size="sm"
-            variant="outline"
-            onClick={handleValid}
-            className="flex items-center"
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="20"
-              height="20"
-              viewBox="0 0 24 24"
-            >
-              <path
-                fill="currentColor"
-                d="M18.7 7.2c-.4-.4-1-.4-1.4 0l-7.5 7.5l-3.1-3.1c-.4-.4-1-.4-1.4 0s-.4 1 0 1.4l3.8 3.8c.2.2.4.3.7.3s.5-.1.7-.3l8.2-8.2c.4-.4.4-1 0-1.4"
-              />
-            </svg>
-            Relevan
-          </Button>
-          <Button size="sm" variant="outline" onClick={handleInvalid} className="flex text-center items-center justify-center">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="20"
-              height="20"
-              viewBox="0 0 24 24"
-            >
-              <path
-                fill="none"
-                stroke="currentColor"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                stroke-width="1.5"
-                d="M6.758 17.243L12.001 12m5.243-5.243L12 12m0 0L6.758 6.757M12.001 12l5.243 5.243"
-              />
-            </svg>
-            Tidak Relevan
-          </Button>
-        </div>
-      );
-    },
   },
 ];
 

app/[locale]/(protected)/admin/media-tracking/detail/component/table.tsx

@@ -116,18 +116,6 @@ const NewsDetailTable = () => {
     onColumnVisibilityChange: setColumnVisibility,
     onRowSelectionChange: setRowSelection,
     onPaginationChange: setPagination,
-    meta: {
-      updateData: (rowIndex: number, value: Partial<any>) => {
-        setDataTable((old) =>
-          old.map((row, index) =>
-            index === rowIndex ? { ...row, ...value } : row
-          )
-        );
-      },
-      refetchData: () => {
-        fetchData();
-      },
-    },
     state: {
       sorting,
       columnFilters,
@@ -166,7 +154,7 @@ const NewsDetailTable = () => {
       pageIndex: 0,
       pageSize: Number(showData),
     });
-  }, [page, showData, id]);
+  }, [page, showData]);
 
   async function fetchData() {
     try {

app/[locale]/(protected)/admin/media-tracking/results/component/column.tsx

@@ -1,15 +1,7 @@
 import * as React from "react";
 import { ColumnDef } from "@tanstack/react-table";
-import { exportMediaTrackingToExcel } from "@/utils/export-media-tracking";
+
-import { loading, close } from "@/config/swal";
+import { Eye, MoreVertical, SquarePen, Trash2 } from "lucide-react";
-import { error } from "@/lib/swal";
-import {
-  DownloadIcon,
-  Eye,
-  MoreVertical,
-  SquarePen,
-  Trash2,
-} from "lucide-react";
 import { cn } from "@/lib/utils";
 import {
   DropdownMenu,
@@ -53,101 +45,19 @@ const columns: ColumnDef<any>[] = [
     cell: ({ row }) => <span>{row.getValue("title")}</span>,
   },
   {
-    accessorKey: "resultTotal",
+    accessorKey: "link",
-    header: () => <div className="text-center w-full">Total Artikel</div>,
+    header: "Jumlah Amplifikasi",
-    cell: ({ row }) => {
+    cell: ({ row }) => <span>{row.getValue("link")}</span>,
-      const value = row.getValue("resultTotal") as number | string | null;
-
-      const finalValue =
-        value === null || value === undefined || value === ""
-          ? 0
-          : Number(value);
-
-      return <div className="text-center w-full">{finalValue}</div>;
-    },
   },
   {
-    accessorKey: "amplification",
+    accessorKey: "status",
-    header: () => <div className="text-center w-full">Jumlah Amplifikasi</div>,
+    header: "Status",
-    cell: ({ row }) => {
+    cell: ({ row }) => <span>{row.getValue("status")}</span>,
-      const raw = row.getValue("amplification") as string | null;
-
-      let total = 0;
-      let invalidTotal = 0;
-
-      if (raw && typeof raw === "string") {
-        const parts = raw.split("/").map((v) => v.trim());
-        total = Number(parts[0]) || 0;
-        invalidTotal = Number(parts[1]) || 0;
-      }
-
-      return (
-        <div className="text-center w-full font-medium">
-          {total}
-          <span className="text-muted-foreground">/{invalidTotal}</span>
-        </div>
-      );
-    },
   },
-
-  // {
-  //   accessorKey: "status",
-  //   header: "Status",
-  //   cell: ({ row }) => <span>{row.getValue("status")}</span>,
-  // },
-  // {
-  //   accessorKey: "isProcessing",
-  //   header: () => <div className="text-center">Status</div>,
-  //   cell: ({ row }) => {
-  //     const raw = row.getValue("isProcessing");
-  //     var status = "Sedang Diproses"
-  //     if (Boolean(raw) == true) {
-  //       status = "Selesai Diproses";
-  //     }
-  //     return <div className="text-center">{status}</div>;
-  //   },
-  // },
   {
-    accessorKey: "isProcessing",
+    accessorKey: "date",
-    header: () => <div className="text-center">Status</div>,
+    header: "Tanggal Penarikan",
-    cell: ({ row }) => {
+    cell: ({ row }) => <span>{row.getValue("date")}</span>,
-      const raw = Boolean(row.getValue("isProcessing"));
-      const statusText = raw ? "Sedang Diproses" : "Sudah Selesai";
-      const colorClass = raw
-        ? "bg-yellow-100 text-yellow-700 border border-yellow-300"
-        : "bg-green-100 text-green-700 border border-green-300";
-
-      return (
-        <div className="text-center">
-          <span
-            className={`px-2 py-1 rounded text-xs font-medium inline-block ${colorClass}`}
-          >
-            {statusText}
-          </span>
-        </div>
-      );
-    },
-  },
-
-  {
-    accessorKey: "createdAt",
-    header: () => <div className="text-center">Tanggal Penarikan</div>,
-    cell: ({ row }) => {
-      const raw = row.getValue("createdAt");
-      if (!raw || typeof raw !== "string")
-        return <div className="text-center">-</div>;
-
-      const date = new Date(raw);
-      if (isNaN(date.getTime())) return <div className="text-center">-</div>;
-
-      const formatted = date.toLocaleDateString("id-ID", {
-        day: "2-digit",
-        month: "short",
-        year: "numeric",
-      });
-
-      return <div className="text-center">{formatted}</div>;
-    },
   },
   {
     id: "actions",
@@ -168,31 +78,13 @@ const columns: ColumnDef<any>[] = [
           </DropdownMenuTrigger>
           <DropdownMenuContent className="p-0" align="end">
             <Link href={`/admin/media-tracking/detail/${row.original.id}`}>
-              <DropdownMenuItem className="p-2 border-b cursor-pointer text-default-700 group focus:bg-default focus:text-primary-foreground items-center rounded-none">
+              <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
                 <Eye className="w-4 h-4 me-1.5" />
-                View&nbsp;
+                View
                 {row.original.mediaUpload.fileType.secondaryName &&
                   row.original.mediaUpload.fileType.secondaryName.toLowerCase()}
               </DropdownMenuItem>
             </Link>
-            <DropdownMenuItem
-              className="p-2 border-b cursor-pointer text-default-700 group rounded-none focus:bg-default focus:text-primary-foreground "
-              onClick={async () => {
-                try {
-                  loading();
-                  await exportMediaTrackingToExcel({
-                    mediaTrackingId: row.original.id,
-                  });
-                  close();
-                } catch (e: any) {
-                  close();
-                  error(e.message || "Gagal export data");
-                }
-              }}
-            >
-              <DownloadIcon className="w-4 h-4 me-1.5" />
-              <p>Download</p>
-            </DropdownMenuItem>
           </DropdownMenuContent>
         </DropdownMenu>
       );

app/[locale]/(protected)/admin/media-tracking/results/component/table.tsx

@@ -179,11 +179,11 @@ const ResultTable = () => {
       setCategoryFilter(
         categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
       );
-      console.log(
+      // console.log(
-        "Kategori",
+      //   "Kategori",
-        categorie,
+      //   categorie,
-        categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
+      //   categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
-      );
+      // );
     }
   }, [categorie]);
 
@@ -195,7 +195,7 @@ const ResultTable = () => {
     } else {
       filter.splice(categoryFilter.indexOf(id), 1);
     }
-    console.log("checkbox filter", filter);
+    // console.log("checkbox filter", filter);
     setCategoryFilter(filter);
     router.push(`?category=${filter.join("&")}`);
   };

app/[locale]/(protected)/admin/media-tracking/tb-news/component/table.tsx

@@ -151,11 +151,11 @@ const NewsTable = () => {
       setCategoryFilter(
         categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
       );
-      console.log(
+      // console.log(
-        "Kategori",
+      //   "Kategori",
-        categorie,
+      //   categorie,
-        categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
+      //   categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
-      );
+      // );
     }
   }, [categorie]);
 
@@ -167,7 +167,7 @@ const NewsTable = () => {
     } else {
       filter.splice(categoryFilter.indexOf(id), 1);
     }
-    console.log("checkbox filter", filter);
+    // console.log("checkbox filter", filter);
     setCategoryFilter(filter);
     router.push(`?category=${filter.join("&")}`);
   };

app/[locale]/(protected)/admin/media-tracking/tracking-berita/component/table.tsx

@@ -32,7 +32,7 @@ export default function TrackingBeritaCard() {
   const [page, setPage] = useState(1);
   const [totalPage, setTotalPage] = useState(1);
   const [showData, setShowData] = useState("6");
-  const MySwal = withReactContent(Swal); 
+  const MySwal = withReactContent(Swal);
 
   useEffect(() => {
     initFecth();
@@ -40,7 +40,7 @@ export default function TrackingBeritaCard() {
 
   const initFecth = async () => {
     loading();
-    const response = await listDataTracking(Number(showData), page - 1, search);
+    const response = await listDataTracking(showData, page - 1);
     const data = response?.data?.data;
     const newData = data?.content;
     setTotalPage(data?.totalPages || 1);
@@ -56,85 +56,23 @@ export default function TrackingBeritaCard() {
     setContent(response?.data?.data?.content || []);
   };
 
-  const handleInputChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
+  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const value = e.target.value;
     setSearch(value);
 
-    const response = await listDataTracking(Number(showData), 0, value);
+    if (value.trim() === "") {
-    setContent(response?.data?.data?.content || []);
+      initFecth();
+    } else {
+      fecthAll(value);
+    }
   };
 
-  // const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-  //   const value = e.target.value;
-  //   setSearch(value);
-
-  //   if (value.trim() === "") {
-  //     initFecth();
-  //   } else {
-  //     fecthAll(value);
-  //   }
-  // };
-
   const handleSelect = (id: number) => {
     setSelectedItems((prev) =>
       prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id]
     );
   };
 
-  const doSave = async () => {
-    if (selectedItems.length === 0) {
-      MySwal.fire(
-        "Peringatan",
-        "Pilih minimal 1 berita untuk disimpan.",
-        "warning"
-      );
-      return;
-    }
-
-    try {
-      loading();
-
-      const promises = selectedItems.map(async (id) => {
-        const res = await mediaTrackingSave({
-          mediaUploadId: id,
-          duration: 24,
-          scrapingPeriod: 3,
-        });
-
-        // cek pesan API
-        if (!res?.data?.success) {
-          throw new Error(
-            res?.data?.message ||
-              "Limit media tracking per hari sudah tercapai. Maksimal 5 tracking per hari."
-          );
-        }
-
-        return res;
-      });
-
-      await Promise.all(promises);
-      close();
-
-      await MySwal.fire({
-        icon: "success",
-        title: "Berhasil!",
-        text: "Tracking berita berhasil ditambahkan.",
-        confirmButtonColor: "#2563eb",
-      });
-
-      setSelectedItems([]);
-      initFecth();
-    } catch (err: any) {
-      close();
-      MySwal.fire({
-        icon: "error",
-        title: "Gagal!",
-        text: err?.message || "Terjadi kesalahan saat menyimpan data.",
-        confirmButtonColor: "#dc2626",
-      });
-    }
-  };
-
   // const doSave = async () => {
   //   if (selectedItems.length === 0) {
   //     toast("Pilih minimal 1 berita untuk disimpan.");
@@ -161,63 +99,48 @@ export default function TrackingBeritaCard() {
   //   }
   // };
 
-  // const doSave = async () => {
+  const doSave = async () => {
-  //   if (selectedItems.length === 0) {
+    if (selectedItems.length === 0) {
-  //     MySwal.fire(
+      MySwal.fire(
-  //       "Peringatan",
+        "Peringatan",
-  //       "Pilih minimal 1 berita untuk disimpan.",
+        "Pilih minimal 1 berita untuk disimpan.",
-  //       "warning"
+        "warning"
-  //     );
+      );
-  //     return;
+      return;
-  //   }
+    }
 
-  //   try {
+    try {
-  //     loading();
+      loading(); 
 
-  //     const promises = selectedItems.map((id) =>
+      const promises = selectedItems.map((id) =>
-  //       mediaTrackingSave({
+        mediaTrackingSave({
-  //         mediaUploadId: id,
+          mediaUploadId: id,
-  //         duration: 24,
+          duration: 24,
-  //         scrapingPeriod: 3,
+          scrapingPeriod: 3,
-  //       })
+        })
-  //     );
+      );
-  //     await Promise.all(promises);
+      await Promise.all(promises);
 
-  //     close();
+      close(); 
 
-  //     await MySwal.fire({
+      await MySwal.fire({
-  //       icon: "success",
+        icon: "success",
-  //       title: "Berhasil!",
+        title: "Berhasil!",
-  //       text: "Tracking berita berhasil ditambahkan.",
+        text: "Tracking berita berhasil ditambahkan.",
-  //       confirmButtonColor: "#2563eb",
+        confirmButtonColor: "#2563eb",
-  //     });
+      });
 
-  //     setSelectedItems([]);
+      setSelectedItems([]);
-  //     initFecth();
+      initFecth();
-  //   } catch (err: any) {
+    } catch (err: any) {
-  //     close();
+      close(); 
-  //     MySwal.fire({
+      MySwal.fire({
-  //       icon: "error",
+        icon: "error",
-  //       title: "Gagal!",
+        title: "Gagal!",
-  //       text: err?.message || "Terjadi kesalahan saat menyimpan data.",
+        text: err?.message || "Terjadi kesalahan saat menyimpan data.",
-  //       confirmButtonColor: "#dc2626",
+        confirmButtonColor: "#dc2626", 
-  //     });
+      });
-  //   }
+    }
-  // };
-
-  const slugify = (text: string) => {
-    return text
-      .toLowerCase()
-      .replace(/[^a-z0-9]+/g, "-")
-      .replace(/(^-|-$)+/g, "");
-  };
-
-  const goToDetail = (item: any) => {
-    const type = item.type || "image";
-    const slug = slugify(item.title || "");
-    const url = `/in/${type}/detail/${item.id}-${slug}`;
-
-    window.location.href = url;
   };
 
   return (
@@ -265,7 +188,7 @@ export default function TrackingBeritaCard() {
             <div className="text-sm text-blue-600 font-medium">
               {selectedItems.length} Item Terpilih{" "}
               <span className="text-black">
-                / Tracking Berita tersisa {5 - selectedItems.length}
+                / Tracking Berita tersisa {29 - selectedItems.length}
               </span>
             </div>
             <Button className="bg-blue-600 text-white" onClick={doSave}>
@@ -275,48 +198,6 @@ export default function TrackingBeritaCard() {
         )}
 
         <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4">
-          {content?.length > 0 &&
-            content.map((item: any) => (
-              <Card
-                key={item.id}
-                className="relative overflow-hidden shadow-sm border rounded-lg"
-              >
-                {/* KLIK GAMBAR = CHECKLIST */}
-                <div
-                  className="cursor-pointer"
-                  onClick={() => handleSelect(item.id)}
-                >
-                  <img
-                    src={item.thumbnailLink}
-                    alt={item.title}
-                    className="w-full h-[300px] object-cover"
-                  />
-
-                  {/* CHECKBOX */}
-                  <div className="absolute top-2 left-2">
-                    <div className="w-5 h-5 border-2 border-white bg-white rounded-sm flex items-center justify-center">
-                      {selectedItems.includes(item.id) && (
-                        <div className="w-3 h-3 bg-blue-600 rounded-sm" />
-                      )}
-                    </div>
-                  </div>
-                </div>
-
-                {/* KLIK JUDUL = DETAIL */}
-                <p
-                  className="p-2 text-sm font-medium hover:underline cursor-pointer"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    goToDetail(item);
-                  }}
-                >
-                  {item.title}
-                </p>
-              </Card>
-            ))}
-        </div>
-
-        {/* <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4">
           {content?.length > 1 &&
             content.map((item: any) => (
               <Card
@@ -341,7 +222,7 @@ export default function TrackingBeritaCard() {
                 </p>
               </Card>
             ))}
-        </div> */}
+        </div>
         <div className="mt-3">
           {content && content?.length > 0 ? (
             <CustomPagination

app/[locale]/(protected)/admin/performance-polda/page.tsx

@@ -5,7 +5,7 @@ export default function PerformancePolda() {
   return (
     <div>
       <SiteBreadcrumb />
-      <p className="font-semibold">PERFORMANCE KUMULATIF PER POLDA</p>
+      {/* <p className="font-semibold">PERFORMANCE KUMULATIF PER POLDA</p> */}
       <PerformancePoldaViz />
     </div>
   );

app/[locale]/(protected)/admin/settings/banner/component/banner-table.tsx

@@ -97,7 +97,7 @@ const BannerListTable = () => {
 
     const response = await listBanner();
     const data = response?.data?.data?.content;
-    console.log("banner", data);
+    // console.log("banner", data);
     setGetData(data);
 
     close();

app/[locale]/(protected)/admin/settings/banner/component/table.tsx

@@ -176,7 +176,7 @@ const ContentListBanner = () => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
 
-      console.log("contentData : ", data);
+      // console.log("contentData : ", data);
 
       setData(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/admin/settings/category/component/column.tsx

@@ -88,7 +88,7 @@ const columns: ColumnDef<any>[] = [
 
       const categoryDelete = async (id: number) => {
         const response = await deleteCategory(id);
-        console.log(response);
+        // console.log(response);
         if (response?.error) {
           error(response.message);
           return false;

app/[locale]/(protected)/admin/settings/faq/component/column.tsx

@@ -68,7 +68,7 @@ const columns: ColumnDef<any>[] = [
 
       const faqDelete = async (id: string) => {
         const response = await deleteDataFAQ(id);
-        console.log(response);
+        // console.log(response);
         if (response?.error) {
           error(response.message);
           return false;

app/[locale]/(protected)/admin/settings/faq/component/table.tsx

@@ -110,7 +110,7 @@ const AdminFAQTable = () => {
       loading();
       const response = await getListFAQ();
       const data = response?.data?.data;
-      console.log("respone", response);
+      // console.log("respone", response);
       data.forEach((item: any, index: number) => {
         item.no = (page - 1) * 10 + index + 1;
       });

app/[locale]/(protected)/admin/settings/feedback/component/column.tsx

@@ -69,7 +69,7 @@ const columns: ColumnDef<any>[] = [
 
       const faqDelete = async (id: string) => {
         const response = await deleteDataFAQ(id);
-        console.log(response);
+        // console.log(response);
         if (response?.error) {
           error(response.message);
           return false;

app/[locale]/(protected)/admin/settings/feedback/component/table.tsx

@@ -109,7 +109,7 @@ const AdminFeedbackTable = () => {
       loading();
       const response = await getListFeedback();
       const data = response?.data?.data;
-      console.log("respone", response);
+      // console.log("respone", response);
       data.forEach((item: any, index: number) => {
         item.no = (page - 1) * 10 + index + 1;
       });

app/[locale]/(protected)/admin/settings/iklan/component/popup-table.tsx

@@ -97,7 +97,7 @@ const IklanListTable = () => {
 
     const response = await listBanner();
     const data = response?.data?.data?.content;
-    console.log("banner", data);
+    // console.log("banner", data);
     setGetData(data);
 
     close();

app/[locale]/(protected)/admin/settings/iklan/component/table.tsx

@@ -160,7 +160,7 @@ const AdvertisementsList = () => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
 
-      console.log("contentData : ", data);
+      // console.log("contentData : ", data);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/admin/settings/popup/component/popup-table.tsx

@@ -100,7 +100,7 @@ const PopUpListTable = () => {
 
     const response = await getListPopUp();
     const data = response?.data?.data?.content;
-    console.log("banner", data);
+    // console.log("banner", data);
     setGetData(data);
 
     close();

app/[locale]/(protected)/admin/settings/popup/component/table.tsx

@@ -178,7 +178,7 @@ const ContentListPopUp = () => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
 
-      console.log("contentData : ", data);
+      // console.log("contentData : ", data);
 
       setData(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/admin/settings/setting-tracking/component/detail.tsx

@@ -64,7 +64,7 @@ export default function DetailSettingTracking(props: {
   });
 
   const onSubmit = (values: any) => {
-    console.log("Submitted values:", values);
+    // console.log("Submitted values:", values);
     setIsOpen(false);
   };
 

app/[locale]/(protected)/admin/settings/setting-tracking/component/update.tsx

@@ -64,7 +64,7 @@ export default function UpdateSettingTracking(props: {
   });
 
   const onSubmit = (values: any) => {
-    console.log("Submitted values:", values);
+    // console.log("Submitted values:", values);
     setIsOpen(false);
   };
 

app/[locale]/(protected)/admin/settings/tag/component/create.tsx

@@ -72,7 +72,7 @@ export default function CreateTagModal() {
       categoryId: Number(data.category),
       isActive: true,
     };
-    console.log("reqqq", request);
+    // console.log("reqqq", request);
     // const response = await postDataFeedback(request);
     // close();
     // if (response?.error) {
@@ -93,7 +93,7 @@ export default function CreateTagModal() {
   async function getCategoryParent() {
     const response = await getCategoriesAll();
     const res = response?.data?.data.content;
-    console.log("res", res);
+    // console.log("res", res);
     var levelsArr: { id: number; label: string; value: string }[] = [];
     res.forEach((levels: { id: number; name: string }) => {
       levelsArr.push({

app/[locale]/(protected)/admin/settings/tag/component/edit.tsx

@@ -145,7 +145,7 @@ export default function EditTagModal(props: {
   async function getCategoryParent() {
     const response = await getCategoriesAll();
     const res = response?.data?.data.content;
-    console.log("res", res);
+    // console.log("res", res);
     var levelsArr: { id: number; label: string; value: string }[] = [];
     res.forEach((levels: { id: number; name: string }) => {
       levelsArr.push({

app/[locale]/(protected)/admin/survey/component/table.tsx

@@ -173,7 +173,7 @@ const SurveyListTable = () => {
         item.no = (page - 1) * 10 + index + 1;
       });
 
-      console.log("contentData : ", data);
+      // console.log("contentData : ", data);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/contributor/agenda-setting/calender-view.tsx

@@ -178,7 +178,7 @@ const CalendarView = ({ categories }: CalendarViewProps) => {
           },
         }));
 
-        console.log("Event Data : ", events);
+        // console.log("Event Data : ", events);
         setCalendarEvents(events);
       }
     } catch (err) {
@@ -217,7 +217,7 @@ const CalendarView = ({ categories }: CalendarViewProps) => {
 
   const filteredEvents = calendarEvents.filter((event) => {
     if (!selectedCategory.length) return false;
-    console.log("Event category : ", selectedCategory);
+    // console.log("Event category : ", selectedCategory);
 
     const eventCategories = event.extendedProps.calendar
       ?.split(",")

app/[locale]/(protected)/contributor/agenda-setting/event-modal.tsx

@@ -109,9 +109,7 @@ const EventModal = ({
   const pathname = usePathname();
   const [isLoading, setIsLoading] = useState(false);
   const [checkedLevels, setCheckedLevels] = useState<Set<number>>(new Set());
-  const [expandedPolda, setExpandedPolda] = useState<Record<number, boolean>>(
+  const [expandedPolda, setExpandedPolda] = useState<Record<number, boolean>>({});
-    {}
-  );
   const [audioFile, setAudioFile] = useState<File | null>(null);
   const [isRecording, setIsRecording] = useState(false);
   const [timer, setTimer] = useState<number>(120);
@@ -155,11 +153,9 @@ const EventModal = ({
   });
 
   // State untuk melacak apakah perubahan berasal dari checkbox Jenis Agenda
-  const [isUpdatingFromJenisAgenda, setIsUpdatingFromJenisAgenda] =
+  const [isUpdatingFromJenisAgenda, setIsUpdatingFromJenisAgenda] = useState(false);
-    useState(false);
   // State untuk melacak jenis perubahan spesifik
-  const [jenisAgendaChangeType, setJenisAgendaChangeType] =
+  const [jenisAgendaChangeType, setJenisAgendaChangeType] = useState<string>("");
-    useState<string>("");
 
   const levelNumber = Number(getCookiesDecrypt("ulne")) || 0;
   const userLevelId = getCookiesDecrypt("ulie");
@@ -265,11 +261,7 @@ const EventModal = ({
 
   // useEffect untuk sinkronisasi checkbox modal dengan Jenis Agenda
   useEffect(() => {
-    if (
+    if (listDest.length > 0 && isUpdatingFromJenisAgenda && jenisAgendaChangeType) {
-      listDest.length > 0 &&
-      isUpdatingFromJenisAgenda &&
-      jenisAgendaChangeType
-    ) {
       syncModalWithJenisAgenda();
     }
   }, [isUpdatingFromJenisAgenda, jenisAgendaChangeType]);
@@ -281,55 +273,44 @@ const EventModal = ({
     }
   }, [checkedLevels, isUpdatingFromJenisAgenda]);
 
-  // Fungsi untuk update wilayahPublish berdasarkan checkbox modal
+    // Fungsi untuk update wilayahPublish berdasarkan checkbox modal
   const updateWilayahPublishFromModal = () => {
     // Hanya update jika tidak sedang dalam proses update dari Jenis Agenda
     if (!isUpdatingFromJenisAgenda && listDest.length > 0) {
       // Hitung item yang dipilih berdasarkan checkedLevels
-      const checkedPoldaCount = listDest.filter(
+      const checkedPoldaCount = listDest.filter((item: any) => 
-        (item: any) =>
+        item.levelNumber === 2 && 
-          item.levelNumber === 2 &&
+        item.name !== "SATKER POLRI" && 
-          item.name !== "SATKER POLRI" &&
+        checkedLevels.has(Number(item.id))
-          checkedLevels.has(Number(item.id))
       ).length;
-
+      
       const checkedPolresCount = listDest.reduce((total: number, item: any) => {
         if (item.subDestination) {
-          return (
+          return total + item.subDestination.filter((sub: any) => checkedLevels.has(Number(sub.id))).length;
-            total +
-            item.subDestination.filter((sub: any) =>
-              checkedLevels.has(Number(sub.id))
-            ).length
-          );
         }
         return total;
       }, 0);
-
+      
-      const satkerItem: any = listDest.find(
+      const satkerItem: any = listDest.find((item: any) => item.name === "SATKER POLRI");
-        (item: any) => item.name === "SATKER POLRI"
+      const checkedSatkerCount = satkerItem ? (
-      );
+        (checkedLevels.has(Number(satkerItem.id)) ? 1 : 0) + 
-      const checkedSatkerCount = satkerItem
+        (satkerItem.subDestination?.filter((sub: any) => checkedLevels.has(Number(sub.id))).length || 0)
-        ? (checkedLevels.has(Number(satkerItem.id)) ? 1 : 0) +
+      ) : 0;
-          (satkerItem.subDestination?.filter((sub: any) =>
+      
-            checkedLevels.has(Number(sub.id))
-          ).length || 0)
-        : 0;
-
       // Checkbox aktif jika ADA item yang dipilih dalam kategori tersebut
       const hasSelectedPolda = checkedPoldaCount > 0;
       const hasSelectedPolres = checkedPolresCount > 0;
       const hasSelectedSatker = checkedSatkerCount > 0;
-
+      
       // Update arrays untuk backend
       const newSelectedPolda = listDest
-        .filter(
+        .filter((item: any) => 
-          (item: any) =>
+          item.levelNumber === 2 && 
-            item.levelNumber === 2 &&
+          item.name !== "SATKER POLRI" && 
-            item.name !== "SATKER POLRI" &&
+          checkedLevels.has(Number(item.id))
-            checkedLevels.has(Number(item.id))
         )
         .map((item: any) => String(item.id));
-
+        
       const newSelectedPolres: string[] = [];
       listDest.forEach((item: any) => {
         if (item.subDestination) {
@@ -340,7 +321,7 @@ const EventModal = ({
           });
         }
       });
-
+      
       const newSelectedSatker: string[] = [];
       if (satkerItem) {
         if (checkedLevels.has(Number(satkerItem.id))) {
@@ -354,56 +335,51 @@ const EventModal = ({
           });
         }
       }
-
+      
       // Update state arrays
       setSelectedPolda(newSelectedPolda);
       setSelectedPolres(newSelectedPolres);
       setSelectedSatker(newSelectedSatker);
-
+      
       // Update wilayahPublish berdasarkan yang dipilih di modal
-      setWilayahPublish((prev) => {
+      setWilayahPublish(prev => {
         const newState = { ...prev };
-
+        
         // Update individual checkboxes
         newState.polda = hasSelectedPolda;
         newState.polres = hasSelectedPolres;
         newState.satker = hasSelectedSatker;
-
+        
         // Update checkbox "semua" berdasarkan level user
         if (levelNumber === 1) {
           // Level 1: semua checkbox harus aktif (nasional, polda, polres, satker, international)
-          newState.semua =
+          newState.semua = newState.nasional && hasSelectedPolda && hasSelectedPolres && hasSelectedSatker && newState.international;
-            newState.nasional &&
-            hasSelectedPolda &&
-            hasSelectedPolres &&
-            hasSelectedSatker &&
-            newState.international;
         } else if (levelNumber === 2) {
           // Level 2: hanya polres yang perlu aktif
           newState.semua = hasSelectedPolres;
         } else {
           newState.semua = false;
         }
-
+        
         return newState;
       });
-
+      
       // Update agendaType berdasarkan checkbox yang aktif
       const selectedKeys = [];
       if (hasSelectedPolda) selectedKeys.push(wilayahValueMap.polda);
       if (hasSelectedPolres) selectedKeys.push(wilayahValueMap.polres);
       if (hasSelectedSatker) selectedKeys.push(wilayahValueMap.satker);
-
+      
       setAgendaType(selectedKeys.join(","));
     }
   };
 
-  // Fungsi untuk sinkronisasi checkbox modal dengan Jenis Agenda
+    // Fungsi untuk sinkronisasi checkbox modal dengan Jenis Agenda
   const syncModalWithJenisAgenda = () => {
     // Hanya jalankan sinkronisasi jika perubahan berasal dari checkbox Jenis Agenda
     if (isUpdatingFromJenisAgenda) {
       const newCheckedLevels = new Set(checkedLevels);
-
+      
       // Handle checklist actions - menambahkan semua item ke modal
       if (jenisAgendaChangeType === "polda_checked") {
         // Checklist semua polda
@@ -415,11 +391,7 @@ const EventModal = ({
       } else if (jenisAgendaChangeType === "polres_checked") {
         // Checklist semua polres, tapi hanya yang poldanya sudah di-checklist
         listDest.forEach((item: any) => {
-          if (
+          if (item.levelNumber === 2 && item.name !== "SATKER POLRI" && newCheckedLevels.has(Number(item.id))) {
-            item.levelNumber === 2 &&
-            item.name !== "SATKER POLRI" &&
-            newCheckedLevels.has(Number(item.id))
-          ) {
             if (item.subDestination) {
               item.subDestination.forEach((polres: any) => {
                 newCheckedLevels.add(Number(polres.id));
@@ -429,9 +401,7 @@ const EventModal = ({
         });
       } else if (jenisAgendaChangeType === "satker_checked") {
         // Checklist satker
-        const satkerItem: any = listDest.find(
+        const satkerItem: any = listDest.find((item: any) => item.name === "SATKER POLRI");
-          (item: any) => item.name === "SATKER POLRI"
-        );
         if (satkerItem) {
           newCheckedLevels.add(Number(satkerItem.id));
           if (satkerItem.subDestination) {
@@ -464,12 +434,10 @@ const EventModal = ({
             }
           }
         });
-        setWilayahPublish((prev) => ({ ...prev, polres: false }));
+        setWilayahPublish(prev => ({ ...prev, polres: false }));
       } else if (jenisAgendaChangeType === "satker_unchecked") {
         // Clear satker dari checkedLevels
-        const satkerItem: any = listDest.find(
+        const satkerItem: any = listDest.find((item: any) => item.name === "SATKER POLRI");
-          (item: any) => item.name === "SATKER POLRI"
-        );
         if (satkerItem) {
           newCheckedLevels.delete(Number(satkerItem.id));
           if (satkerItem.subDestination) {
@@ -479,9 +447,9 @@ const EventModal = ({
           }
         }
       }
-
+      
       setCheckedLevels(newCheckedLevels);
-
+      
       // Reset flag setelah sinkronisasi selesai
       setIsUpdatingFromJenisAgenda(false);
       setJenisAgendaChangeType("");
@@ -516,14 +484,12 @@ const EventModal = ({
     setCheckedLevels((prev) => {
       const updatedLevels = new Set(prev);
       const isCurrentlyChecked = updatedLevels.has(levelId);
-
+      
       if (isCurrentlyChecked) {
         updatedLevels.delete(levelId);
-
+        
         // Jika ini adalah POLDA yang di-unchecklist, unchecklist juga semua polres di bawahnya
-        const poldaItem = listDest.find(
+        const poldaItem = listDest.find((item: any) => Number(item.id) === levelId) as any;
-          (item: any) => Number(item.id) === levelId
-        ) as any;
         if (poldaItem && poldaItem.subDestination) {
           poldaItem.subDestination.forEach((polres: any) => {
             updatedLevels.delete(Number(polres.id));
@@ -548,12 +514,7 @@ const EventModal = ({
   const toggleWilayah = (key: string) => {
     // Set flag bahwa perubahan berasal dari checkbox Jenis Agenda
     setIsUpdatingFromJenisAgenda(true);
-    setJenisAgendaChangeType(
+    setJenisAgendaChangeType(key + (wilayahPublish[key as keyof typeof wilayahPublish] ? "_unchecked" : "_checked"));
-      key +
-        (wilayahPublish[key as keyof typeof wilayahPublish]
-          ? "_unchecked"
-          : "_checked")
-    );
 
     setWilayahPublish((prev: any) => {
       let newState = { ...prev };
@@ -590,21 +551,18 @@ const EventModal = ({
         return newState;
       }
 
-      // Validasi khusus untuk POLRES
+            // Validasi khusus untuk POLRES
       if (key === "polres" && !prev[key]) {
         // Cek apakah ada POLDA yang sudah dipilih di modal
-        const hasSelectedPolda = listDest.some(
+        const hasSelectedPolda = listDest.some((item: any) => 
-          (item: any) =>
+          item.levelNumber === 2 && 
-            item.levelNumber === 2 &&
+          item.name !== "SATKER POLRI" && 
-            item.name !== "SATKER POLRI" &&
+          checkedLevels.has(Number(item.id))
-            checkedLevels.has(Number(item.id))
         );
-
+        
         if (!hasSelectedPolda) {
           // Jika tidak ada POLDA yang dipilih, tampilkan peringatan dan batalkan
-          alert(
+          alert("Harap pilih POLDA di Modal terlebih dahulu sebelum mengaktifkan checkbox POLRES.");
-            "Harap pilih POLDA di Modal terlebih dahulu sebelum mengaktifkan checkbox POLRES."
-          );
           // Reset flag karena perubahan dibatalkan
           setIsUpdatingFromJenisAgenda(false);
           setJenisAgendaChangeType("");
@@ -640,9 +598,7 @@ const EventModal = ({
           });
         } else if (key === "satker") {
           // Clear satker
-          const satkerItem: any = listDest.find(
+          const satkerItem: any = listDest.find((item: any) => item.name === "SATKER POLRI");
-            (item: any) => item.name === "SATKER POLRI"
-          );
           if (satkerItem) {
             newCheckedLevels.delete(Number(satkerItem.id));
             if (satkerItem.subDestination) {
@@ -657,14 +613,9 @@ const EventModal = ({
 
       // Update checkbox "semua" berdasarkan status semua checkbox lainnya
       // Untuk level 1: semua, nasional, polda, polres, satker, international harus aktif
-      // Untuk level 2: semua, polres harus aktif
+      // Untuk level 2: semua, polres harus aktif  
       if (levelNumber === 1) {
-        newState.semua =
+        newState.semua = newState.nasional && newState.polda && newState.polres && newState.satker && newState.international;
-          newState.nasional &&
-          newState.polda &&
-          newState.polres &&
-          newState.satker &&
-          newState.international;
       } else if (levelNumber === 2) {
         newState.semua = newState.polres;
       } else {
@@ -726,7 +677,7 @@ const EventModal = ({
       endDate: date?.to ? format(date.to, "yyyy-MM-dd") : null,
     };
 
-    console.log("Submitted Data:", reqData);
+    // console.log("Submitted Data:", reqData);
 
     const response = await saveAgendaSettings(reqData);
     if (response?.error) {
@@ -794,9 +745,6 @@ const EventModal = ({
   };
 
   useEffect(() => {
-    console.log("Event data:", event);
-    console.log("Selected date:", selectedDate);
-
     if (selectedDate) {
       setDate({
         from: selectedDate.date,
@@ -819,7 +767,7 @@ const EventModal = ({
 
   const onDeleteEventAction = async () => {
     try {
-    } catch (error) {}
+    } catch (error) { }
   };
 
   const handleOpenDeleteModal = (eventId: string) => {
@@ -829,7 +777,7 @@ const EventModal = ({
   };
 
   const toggleExpand = (poldaId: any) => {
-    console.log("Toogle : ", expandedPolda);
+    // console.log("Toogle : ", expandedPolda);
     setExpandedPolda((prev: any) => ({
       ...prev,
       [poldaId]: !prev[poldaId],
@@ -890,10 +838,11 @@ const EventModal = ({
     fileTypeId: string,
     duration: string
   ) {
-    console.log(idx, id, file, fileTypeId, duration);
+    // console.log(idx, id, file, fileTypeId, duration);
 
     const resCsrf = await getCsrfToken();
     const csrfToken = resCsrf?.data?.token;
+    // console.log("CSRF TOKEN : ", csrfToken);
     const headers = {
       "X-XSRF-TOKEN": csrfToken,
     };
@@ -915,7 +864,7 @@ const EventModal = ({
         xhr.withCredentials = true;
       },
       onError: async (e: any) => {
-        console.log("Error upload :", e);
+        // console.log("Error upload :", e);
         error(e);
       },
       onChunkComplete: (
@@ -998,7 +947,7 @@ const EventModal = ({
     );
   };
 
-  const handleRemoveFile = (id: number) => {};
+  const handleRemoveFile = (id: number) => { };
 
   async function doDelete(id: any) {
     loading();
@@ -1037,7 +986,7 @@ const EventModal = ({
     }).then(() => {
       if (redirect === window.location.pathname) {
         fetch(redirect, { method: "GET", cache: "reload" }).then(() => {
-          console.log("Data diperbarui.");
+          // console.log("Data diperbarui.");
         });
       } else {
         window.location.href = redirect;
@@ -1139,7 +1088,7 @@ const EventModal = ({
                         defaultMonth={date?.from}
                         selected={date}
                         onSelect={(newDate) => {
-                          console.log("Date selected:", newDate);
+                          // console.log("Date selected:", newDate);
                           setDate(newDate);
                           if (newDate?.from && newDate?.to) {
                             setIsDatePickerOpen(false);
@@ -1154,42 +1103,40 @@ const EventModal = ({
                 <div className="space-y-1.5">
                   <Label htmlFor="wilayahPublish">Jenis Agenda</Label>
                   <div className="flex flex-wrap items-center gap-2">
-                    <div>
+                 
-                      <Checkbox
+                      <div>
-                        id="semua"
+                        <Checkbox
-                        checked={wilayahPublish.semua}
+                          id="semua"
-                        onCheckedChange={() => toggleWilayah("semua")}
+                          checked={wilayahPublish.semua}
-                      />
+                          onCheckedChange={() => toggleWilayah("semua")}
-                      <label htmlFor="semua" className="ml-2 text-sm">
+                        />
-                        Semua
+                        <label htmlFor="semua" className="ml-2 text-sm">
-                      </label>
+                          Semua
-                    </div>
+                        </label>
-
+                      </div>
+          
                     {levelNumber === 1 && (
                       <>
-                        <div>
+                      <div>
-                          <Checkbox
+                        <Checkbox
-                            id="nasional"
+                          id="nasional"
-                            checked={wilayahPublish.nasional}
+                          checked={wilayahPublish.nasional}
-                            onCheckedChange={() => toggleWilayah("nasional")}
+                          onCheckedChange={() => toggleWilayah("nasional")}
-                          />
+                        />
-                          <label
+                        <label htmlFor="nasional" className="ml-2 text-sm mr-2">
-                            htmlFor="nasional"
+                          Nasional
-                            className="ml-2 text-sm mr-2"
+                        </label>
-                          >
+                      </div>
-                            Nasional
+                    <div>
-                          </label>
+                      <Checkbox
-                        </div>
+                        id="polda"
-                        <div>
+                        checked={wilayahPublish.polda}
-                          <Checkbox
+                        onCheckedChange={() => toggleWilayah("polda")}
-                            id="polda"
+                      />
-                            checked={wilayahPublish.polda}
+                      <label htmlFor="polda" className="mx-2 text-sm mr-2">
-                            onCheckedChange={() => toggleWilayah("polda")}
+                        Polda
-                          />
+                      </label>
-                          <label htmlFor="polda" className="mx-2 text-sm mr-2">
+                    </div>
-                            Polda
-                          </label>
-                        </div>
                       </>
                     )}
 
@@ -1201,41 +1148,39 @@ const EventModal = ({
                           onCheckedChange={() => toggleWilayah("polres")}
                         />
                         <label htmlFor="polres" className="ml-2 text-sm mr-2">
-                          Polres
+                          Polres 
                         </label>
                       </div>
                     )}
 
                     {levelNumber === 1 && (
                       <>
-                        <div>
+                      <div>
-                          <Checkbox
+                        <Checkbox
-                            id="satker"
+                          id="satker"
-                            checked={wilayahPublish.satker}
+                          checked={wilayahPublish.satker}
-                            onCheckedChange={() => toggleWilayah("satker")}
+                          onCheckedChange={() => toggleWilayah("satker")}
-                          />
+                        />
-                          <label htmlFor="satker" className="mx-2 text-sm mr-2">
+                        <label htmlFor="satker" className="mx-2 text-sm mr-2">
-                            Satker
+                          Satker
-                          </label>
+                        </label>
-                        </div>
+                      </div>
-                        <div>
+                      <div>
-                          <Checkbox
+                        <Checkbox
-                            id="international"
+                          id="international"
-                            checked={wilayahPublish.international}
+                          checked={wilayahPublish.international}
-                            onCheckedChange={() =>
+                          onCheckedChange={() => toggleWilayah("international")}
-                              toggleWilayah("international")
+                        />
-                            }
+                        <label
-                          />
+                          htmlFor="international"
-                          <label
+                          className="ml-2 text-sm mr-2"
-                            htmlFor="international"
+                        >
-                            className="ml-2 text-sm mr-2"
+                          Internasional
-                          >
+                        </label>
-                            Internasional
+                      </div>
-                          </label>
-                        </div>
                       </>
                     )}
-
+                    
                     <div className="pl-1">
                       <Dialog>
                         <DialogTrigger asChild>
@@ -1254,9 +1199,7 @@ const EventModal = ({
                               <div key={polda.id} className="border p-2">
                                 <Label className="flex items-center">
                                   <Checkbox
-                                    checked={checkedLevels.has(
+                                    checked={checkedLevels.has(Number(polda.id))}
-                                      Number(polda.id)
-                                    )}
                                     onCheckedChange={() =>
                                       handleCheckboxChange(Number(polda.id))
                                     }
@@ -1294,13 +1237,9 @@ const EventModal = ({
                                           polda?.subDestination?.forEach(
                                             (polres: any) => {
                                               if (isChecked) {
-                                                updatedLevels.add(
+                                                updatedLevels.add(Number(polres.id));
-                                                  Number(polres.id)
-                                                );
                                               } else {
-                                                updatedLevels.delete(
+                                                updatedLevels.delete(Number(polres.id));
-                                                  Number(polres.id)
-                                                );
                                               }
                                             }
                                           );
@@ -1310,27 +1249,18 @@ const EventModal = ({
                                       />
                                       Pilih Semua
                                     </Label>
-                                    {polda?.subDestination?.map(
+                                    {polda?.subDestination?.map((polres: any) => (
-                                      (polres: any) => (
+                                      <Label key={polres.id} className="block mt-1">
-                                        <Label
+                                        <Checkbox
-                                          key={polres.id}
+                                          checked={checkedLevels.has(Number(polres.id))}
-                                          className="block mt-1"
+                                          onCheckedChange={() =>
-                                        >
+                                            handleCheckboxChange(Number(polres.id))
-                                          <Checkbox
+                                          }
-                                            checked={checkedLevels.has(
+                                          className="mr-2"
-                                              Number(polres.id)
+                                        />
-                                            )}
+                                        {polres.name}
-                                            onCheckedChange={() =>
+                                      </Label>
-                                              handleCheckboxChange(
+                                    ))}
-                                                Number(polres.id)
-                                              )
-                                            }
-                                            className="mr-2"
-                                          />
-                                          {polres.name}
-                                        </Label>
-                                      )
-                                    )}
                                   </div>
                                 )}
                               </div>
@@ -1371,7 +1301,8 @@ const EventModal = ({
                       <Label>Video</Label>
                       <FileUploader
                         accept={{
-                          "video/*": [],
+                          "mp4/*": [],
+                          "mov/*": [],
                         }}
                         maxSize={100}
                         label="Upload file dengan format .mp4 atau .mov."
@@ -1383,7 +1314,7 @@ const EventModal = ({
                             className="object-fill h-full w-full rounded-md"
                             src={file.url}
                             controls
-                            title={`Video ${file.id}`}
+                            title={`Video ${file.id}`} // Mengganti alt dengan title
                           />
                           <div
                             key={index}
@@ -1462,9 +1393,10 @@ const EventModal = ({
                     </div>
                     <div>
                       <Label>Teks</Label>
+
                       <FileUploader
                         accept={{
-                          "application/pdf": [],
+                          "pdf/*": [],
                         }}
                         maxSize={100}
                         label="Upload file dengan format .pdf."
@@ -1520,7 +1452,8 @@ const EventModal = ({
                       />
                       <FileUploader
                         accept={{
-                          "audio/*": [],
+                          "mp3/*": [],
+                          "wav/*": [],
                         }}
                         maxSize={100}
                         label="Upload file dengan format .mp3 atau .wav."
@@ -1546,8 +1479,7 @@ const EventModal = ({
                             type="button"
                             onClick={onPlayPause}
                             disabled={isPlaying}
-                            className={`flex items-center gap-2 ${
+                            className={`flex items-center gap-2 ${isPlaying
-                              isPlaying
                                 ? "bg-gray-300 cursor-not-allowed"
                                 : "bg-primary text-white"
                             } p-2 rounded`}

app/[locale]/(protected)/contributor/agenda-setting/page.tsx

@@ -22,14 +22,14 @@ const CalenderPage = () => {
       let valueShowed: string[] = [];
       if (userLevelNumber == 1) {
         valueShowed = ["0", "1", "2", "3", "4", "5"];
-      } else if (userLevelNumber == 2 && userLevelId != 761) {
+      } else if (userLevelNumber == 2 && userLevelId != 771) {
         valueShowed = ["2", "3"];
       } else if (
-        (userLevelNumber == 2 && userLevelId == 761) ||
+        (userLevelNumber == 2 && userLevelId == 771) ||
-        (userLevelNumber == 3 && userParentLevelId == 761)
+        (userLevelNumber == 3 && userParentLevelId == 771)
       ) {
         valueShowed = ["4"];
-      } else if (userLevelNumber == 3 && userParentLevelId != 761) {
+      } else if (userLevelNumber == 3 && userParentLevelId != 771) {
         valueShowed = ["3"];
       }
 
@@ -39,7 +39,7 @@ const CalenderPage = () => {
           ...category,
           activeClass: "",
         }));
-      console.log(formattedCategories);
+      // console.log(formattedCategories);
       setCategories(formattedCategories);
     }
   }, []);

app/[locale]/(protected)/contributor/blog/components/blog-table.tsx

@@ -127,7 +127,7 @@ const BlogTable = () => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
 
-      console.log("contentData : ", contentData);
+      // console.log("contentData : ", contentData);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/contributor/content/audio/components/columns.tsx

@@ -105,13 +105,13 @@ const useTableColumns = () => {
         if (isPublish && !isPublishOnPolda) {
           displayText = "Mabes";
         } else if (isPublish && isPublishOnPolda) {
-          if (Number(creatorGroupParentLevelId) == 761) {
+          if (Number(creatorGroupParentLevelId) == 771) {
             displayText = "Mabes & Satker";
           } else {
             displayText = "Mabes & Polda";
           }
         } else if (!isPublish && isPublishOnPolda) {
-          if (Number(creatorGroupParentLevelId) == 761) {
+          if (Number(creatorGroupParentLevelId) == 771) {
             displayText = "Satker";
           } else {
             displayText = "Polda";

app/[locale]/(protected)/contributor/content/image/components/columns.tsx

@@ -107,13 +107,13 @@ const useTableColumns = () => {
         if (isPublish && !isPublishOnPolda) {
           displayText = "Mabes";
         } else if (isPublish && isPublishOnPolda) {
-          if (Number(creatorGroupParentLevelId) == 761) {
+          if (Number(creatorGroupParentLevelId) == 771) {
             displayText = "Mabes & Satker";
           } else {
             displayText = "Mabes & Polda";
           }
         } else if (!isPublish && isPublishOnPolda) {
-          if (Number(creatorGroupParentLevelId) == 761) {
+          if (Number(creatorGroupParentLevelId) == 771) {
             displayText = "Satker";
           } else {
             displayText = "Polda";

app/[locale]/(protected)/contributor/content/nulis-ai/components/table-nulis.tsx

@@ -133,7 +133,7 @@ const TableTeks = () => {
         item.no = (page - 1) * limit + index + 1;
       });
 
-      console.log("contentData : ", contentData);
+      // console.log("contentData : ", contentData);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/contributor/content/spit/table-spit/columns.tsx

@@ -144,7 +144,7 @@ const useTableColumns = () => {
 
         const handleClick = (e: React.MouseEvent) => {
           if (e.ctrlKey) {
-            console.log("Ctrl + Click detected");
+            // console.log("Ctrl + Click detected");
           }
           // Paksa buka menu meskipun ctrl ditekan
           setOpen(true);

app/[locale]/(protected)/contributor/content/teks/components/columns.tsx

@@ -105,13 +105,13 @@ const useTableColumns = () => {
         if (isPublish && !isPublishOnPolda) {
           displayText = "Mabes";
         } else if (isPublish && isPublishOnPolda) {
-          if (Number(creatorGroupParentLevelId) == 761) {
+          if (Number(creatorGroupParentLevelId) == 771) {
             displayText = "Mabes & Satker";
           } else {
             displayText = "Mabes & Polda";
           }
         } else if (!isPublish && isPublishOnPolda) {
-          if (Number(creatorGroupParentLevelId) == 761) {
+          if (Number(creatorGroupParentLevelId) == 771) {
             displayText = "Satker";
           } else {
             displayText = "Polda";

app/[locale]/(protected)/contributor/content/video/components/columns.tsx

@@ -105,13 +105,13 @@ const useTableColumns = () => {
         if (isPublish && !isPublishOnPolda) {
           displayText = "Mabes";
         } else if (isPublish && isPublishOnPolda) {
-          if (Number(creatorGroupParentLevelId) == 761) {
+          if (Number(creatorGroupParentLevelId) == 771) {
             displayText = "Mabes & Satker";
           } else {
             displayText = "Mabes & Polda";
           }
         } else if (!isPublish && isPublishOnPolda) {
-          if (Number(creatorGroupParentLevelId) == 761) {
+          if (Number(creatorGroupParentLevelId) == 771) {
             displayText = "Satker";
           } else {
             displayText = "Polda";

app/[locale]/(protected)/contributor/planning/mediahub/components/columns.tsx

@@ -65,7 +65,6 @@ const useTableColumns = () => {
       header: "Status",
       cell: ({ row }) => {
         const isActive = row.getValue<boolean>("isActive");
-        console.log("isActive value:", isActive); // TypeScript type is inferred correctly
         return (
           <div>
             {isActive ? (

app/[locale]/(protected)/contributor/planning/mediahub/components/mediahub-table.tsx

@@ -121,9 +121,6 @@ const MediahubTable = () => {
       contentData.forEach((item: any, index: number) => {
         item.no = (page - 1) * limit + index + 1;
       });
-
-      console.log("contentData : ", contentData);
-
       setDataTable(contentData);
       setTotalData(data?.totalElements);
       setTotalPage(data?.totalPages);

app/[locale]/(protected)/contributor/planning/medsos-mediahub/components/columns.tsx

@@ -65,7 +65,6 @@ const useTableColumns = () => {
       header: "Status",
       cell: ({ row }) => {
         const isActive = row.getValue<boolean>("isActive");
-        console.log("isActive value:", isActive); // TypeScript type is inferred correctly
         return (
           <div>
             {isActive ? (

app/[locale]/(protected)/contributor/planning/medsos-mediahub/components/medsos-table.tsx

@@ -121,9 +121,6 @@ const MedsosTable = () => {
       contentData.forEach((item: any, index: number) => {
         item.no = (page - 1) * limit + index + 1;
       });
-
-      console.log("contentData : ", contentData);
-
       setDataTable(contentData);
       setTotalData(data?.totalElements);
       setTotalPage(data?.totalPages);

app/[locale]/(protected)/contributor/report/components/columns.tsx

@@ -153,7 +153,7 @@ const useTableColumns = ({
         //   try {
         //     loading();
         //     const response = await axios.get(
-        //       `https://new.netidhub.com/api/media/report/download?id=${id}`,
+        //       `https://netidhub.com/api/media/report/download?id=${id}`,
         //       {
         //         responseType: "blob",
         //       }

app/[locale]/(protected)/contributor/report/components/report-table.tsx

@@ -170,7 +170,7 @@ const ReportTable = () => {
   };
 
   const handlePreview = (id: string) => {
-    const url = `https://new.netidhub.com/api/media/report/view?id=${id}`;
+    const url = `https://mediahub.polri.go.id/api/v2/media/report/view?id=${id}`;
     setPreviewData({ url });
     setOpenPreview(true);
   };
@@ -223,9 +223,6 @@ const ReportTable = () => {
       contentData.forEach((item: any, index: number) => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
-
-      console.log("contentData : ", contentData);
-
       setDataTable(contentData);
       setTotalData(data?.totalElements);
       setTotalPage(data?.totalPages);

app/[locale]/(protected)/contributor/schedule/calendar-polri/component/calendar-polri-table.tsx

@@ -130,9 +130,6 @@ const CalendarPolriTable = () => {
       contentData.forEach((item: any, index: number) => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
-
-      console.log("contentData : ", contentData);
-
       setDataTable(contentData);
       setTotalData(data?.totalElements);
       setTotalPage(data?.totalPages);

app/[locale]/(protected)/contributor/schedule/event/components/columns.tsx

@@ -62,7 +62,6 @@ const useTableColumns = () => {
       accessorKey: "time",
       header: t("time", { defaultValue: "Time" }),
       cell: ({ row }: { row: { original: any } }) => {
-        console.log("Row Original Data:", row.original);
         const { startTime, endTime } = row.original;
         return (
           <span className="whitespace-nowrap">
@@ -113,7 +112,6 @@ const useTableColumns = () => {
       accessorKey: "speaker",
       header: t("speaker", { defaultValue: "Speaker" }),
       cell: ({ row }: { row: { original: any } }) => {
-        console.log("Row Original Data:", row.original);
         const { speakerTitle, speakerName } = row.original;
         return (
           <span className="whitespace-nowrap">

app/[locale]/(protected)/contributor/schedule/event/components/event-table.tsx

@@ -114,9 +114,6 @@ const EventTable = () => {
       contentData.forEach((item: any, index: number) => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
-
-      console.log("contentData : ", contentData);
-
       setDataTable(contentData);
       setTotalData(data?.totalElements);
       setTotalPage(data?.totalPages);

app/[locale]/(protected)/contributor/schedule/live-report/component/columns.tsx

@@ -66,7 +66,7 @@ const useTableColumns = (props: { selectedTypeSchedule: string }) => {
       accessorKey: "time",
       header: t("time", { defaultValue: "Time" }),
       cell: ({ row }: { row: { original: any } }) => {
-        console.log("Row Original Data:", row.original);
+        // console.log("Row Original Data:", row.original);
         const { startTime, endTime } = row.original;
         return (
           <span className="whitespace-nowrap">
@@ -117,7 +117,7 @@ const useTableColumns = (props: { selectedTypeSchedule: string }) => {
       accessorKey: "speaker",
       header: t("speaker", { defaultValue: "Speaker" }),
       cell: ({ row }: { row: { original: any } }) => {
-        console.log("Row Original Data:", row.original);
+        // console.log("Row Original Data:", row.original);
         const { speakerTitle, speakerName } = row.original;
         return (
           <span className="whitespace-nowrap">

app/[locale]/(protected)/contributor/schedule/live-report/component/live-report-table.tsx

@@ -139,7 +139,7 @@ const LiveReportTable = () => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
 
-      console.log("contentData : ", contentData);
+      // console.log("contentData : ", contentData);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/contributor/schedule/press-conference/components/columns.tsx

@@ -62,7 +62,7 @@ const useTableColumns = () => {
       accessorKey: "time",
       header: t("time", { defaultValue: "Time" }),
       cell: ({ row }: { row: { original: any } }) => {
-        console.log("Row Original Data:", row.original);
+        // console.log("Row Original Data:", row.original);
         const { startTime, endTime } = row.original;
         return (
           <span className="whitespace-nowrap">
@@ -113,7 +113,7 @@ const useTableColumns = () => {
       accessorKey: "speaker",
       header: t("speaker", { defaultValue: "Speaker" }),
       cell: ({ row }: { row: { original: any } }) => {
-        console.log("Row Original Data:", row.original);
+        // console.log("Row Original Data:", row.original);
         const { speakerTitle, speakerName } = row.original;
         return (
           <span className="whitespace-nowrap">

app/[locale]/(protected)/contributor/schedule/press-conference/components/presscon-table.tsx

@@ -129,7 +129,7 @@ const PressConferenceTable = () => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
 
-      console.log("contentData : ", contentData);
+      // console.log("contentData : ", contentData);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/contributor/schedule/press-release/components/columns.tsx

@@ -62,7 +62,7 @@ const useTableColumns = () => {
       accessorKey: "time",
       header: t("time", { defaultValue: "Time" }),
       cell: ({ row }: { row: { original: any } }) => {
-        console.log("Row Original Data:", row.original);
+        // console.log("Row Original Data:", row.original);
         const { startTime, endTime } = row.original;
         return (
           <span className="whitespace-nowrap">
@@ -113,7 +113,7 @@ const useTableColumns = () => {
       accessorKey: "speaker",
       header: t("speaker", { defaultValue: "Speaker" }),
       cell: ({ row }: { row: { original: any } }) => {
-        console.log("Row Original Data:", row.original);
+        // console.log("Row Original Data:", row.original);
         const { speakerTitle, speakerName } = row.original;
         return (
           <span className="whitespace-nowrap">

app/[locale]/(protected)/contributor/schedule/press-release/components/pressrilis-table.tsx

@@ -130,7 +130,7 @@ const PressReleaseTable = () => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
 
-      console.log("contentData : ", contentData);
+      // console.log("contentData : ", contentData);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/contributor/task-ta/components/columns.tsx

@@ -22,9 +22,7 @@ import withReactContent from "sweetalert2-react-content";
 import Swal from "sweetalert2";
 import { useTranslations } from "next-intl";
 
-const useTableColumns = (
+const useTableColumns = () => {
-  activeTab: "ta" | "daily" | "special" | "mabes-koor",
-) => {
   const t = useTranslations("Table");
   const columns: ColumnDef<any>[] = [
     {
@@ -115,31 +113,6 @@ const useTableColumns = (
         const MySwal = withReactContent(Swal);
         const roleId = Number(getCookiesDecrypt("urie")) || 0;
 
-        // ❗ jika tab = "special"
-        if (activeTab === "special") {
-          return (
-            <DropdownMenu>
-              <DropdownMenuTrigger asChild>
-                <Button
-                  size="icon"
-                  className="bg-transparent ring-offset-transparent hover:bg-transparent hover:ring-0 hover:ring-transparent"
-                >
-                  <MoreVertical className="h-4 w-4 text-default-800" />
-                </Button>
-              </DropdownMenuTrigger>
-
-              <DropdownMenuContent className="p-0" align="end">
-                <Link href={`/contributor/task/detail/${row.original.id}`}>
-                  <DropdownMenuItem className="p-2 text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
-                    <Eye className="w-4 h-4 me-1.5" />
-                    View
-                  </DropdownMenuItem>
-                </Link>
-              </DropdownMenuContent>
-            </DropdownMenu>
-          );
-        }
-
         async function deleteProcess(id: any) {
           loading();
           const resDelete = await deleteTaskTa(id);
@@ -192,11 +165,7 @@ const useTableColumns = (
               </Button>
             </DropdownMenuTrigger>
             <DropdownMenuContent className="p-0" align="end">
-              {/* {(roleId == 11 || roleId == 12 || roleId == 19) && ( */}
+              {(roleId == 11 || roleId == 12 || roleId == 19) && (
-              {(roleId == 11 ||
-                roleId == 12 ||
-                roleId == 19 ||
-                roleId == 3) && (
                 <Link href={`/contributor/task-ta/detail/${row.original.id}`}>
                   <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
                     <Eye className="w-4 h-4 me-1.5" />
@@ -204,16 +173,15 @@ const useTableColumns = (
                   </DropdownMenuItem>
                 </Link>
               )}
-              {roleId == 11 ||
+              {roleId == 11 && (
-                (roleId == 3 && (
+                <Link href={`/contributor/task-ta/update/${row.original.id}`}>
-                  <Link href={`/contributor/task-ta/update/${row.original.id}`}>
+                  <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
-                    <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
+                    <SquarePen className="w-4 h-4 me-1.5" />
-                      <SquarePen className="w-4 h-4 me-1.5" />
+                    Edit
-                      Edit
+                  </DropdownMenuItem>
-                    </DropdownMenuItem>
+                </Link>
-                  </Link>
+              )}
-                ))}
+              {(roleId == 11 || roleId == 12 || roleId == 19) && (
-              {(roleId == 12 || roleId == 19) && (
                 <Link
                   href={`/contributor/task-ta/upload-task/${row.original.id}`}
                 >
@@ -223,16 +191,15 @@ const useTableColumns = (
                   </DropdownMenuItem>
                 </Link>
               )}
-              {roleId == 11 ||
+              {roleId == 11 && (
-                (roleId == 3 && (
+                <DropdownMenuItem
-                  <DropdownMenuItem
+                  onClick={() => TaskDelete(row.original.id)}
-                    onClick={() => TaskDelete(row.original.id)}
+                  className="p-2 border-b text-destructive bg-destructive/30  focus:bg-destructive focus:text-destructive-foreground rounded-none"
-                    className="p-2 border-b text-destructive bg-destructive/30  focus:bg-destructive focus:text-destructive-foreground rounded-none"
+                >
-                  >
+                  <Trash2 className="w-4 h-4 me-1.5" />
-                    <Trash2 className="w-4 h-4 me-1.5" />
+                  Delete
-                    Delete
+                </DropdownMenuItem>
-                  </DropdownMenuItem>
+              )}
-                ))}
             </DropdownMenuContent>
           </DropdownMenu>
         );

app/[locale]/(protected)/contributor/task-ta/page.tsx

@@ -35,19 +35,10 @@ const TaskTaPage = () => {
             <CardTitle>
               <div className="flex flex-col sm:flex-row lg:flex-row lg:items-center">
                 <div className="flex-1 text-xl font-medium text-default-900">
-                  {t("tabel", { defaultValue: "Tabel" })}{" "}
+                  {t("tabel", { defaultValue: "Tabel" })} {t("task-ta", { defaultValue: "Task Ta" })}
-                  {t("task-ta", { defaultValue: "Task Ta" })}
                 </div>
                 <div className="flex-none">
-                  {/* {roleId !== 12 && (
+                  {roleId !== 12 && (
-                    <Link href={"/contributor/task-ta/create"}>
-                      <Button color="primary" className="text-white">
-                        <UploadIcon size={18} className="mr-2" />
-                        {t("create-task", { defaultValue: "Create Task" })}
-                      </Button>
-                    </Link>
-                  )} */}
-                  {roleId !== 12 && roleId !== 19 && (
                     <Link href={"/contributor/task-ta/create"}>
                       <Button color="primary" className="text-white">
                         <UploadIcon size={18} className="mr-2" />

app/[locale]/(protected)/contributor/task/components/task-table.tsx

@@ -160,7 +160,7 @@ const TaskTable = () => {
         item.no = (page - 1) * Number(showData) + index + 1;
       });
 
-      console.log("contentData : ", contentData);
+      // console.log("contentData : ", contentData);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/contributor/task/page.tsx

@@ -5,11 +5,7 @@ import { Button } from "@/components/ui/button";
 import { UploadIcon } from "lucide-react";
 import SiteBreadcrumb from "@/components/site-breadcrumb";
 import { Link } from "@/components/navigation";
-import {
+import { checkAuthorization, checkLoginSession } from "@/lib/utils";
-  checkAuthorization,
-  checkLoginSession,
-  getCookiesDecrypt,
-} from "@/lib/utils";
 import React, { useEffect } from "react";
 import { useTranslations } from "next-intl";
 
@@ -17,13 +13,12 @@ const TaskPage = () => {
   const t = useTranslations("AnalyticsDashboard");
   useEffect(() => {
     function initState() {
-      checkAuthorization("admin");
+      checkAuthorization("admin"); 
       checkLoginSession();
     }
 
     initState();
   }, []);
-  const levelNumber = getCookiesDecrypt("ulne");
 
   return (
     <div>
@@ -34,28 +29,16 @@ const TaskPage = () => {
             <CardTitle>
               <div className="flex flex-col sm:flex-row lg:flex-row lg:items-center">
                 <div className="flex-1 text-xl font-medium text-default-900">
-                  {t("tabel", { defaultValue: "Tabel" })}{" "}
+                  {t("tabel", { defaultValue: "Tabel" })} {t("task", { defaultValue: "Task" })}
-                  {t("task", { defaultValue: "Task" })}
                 </div>
-                {Number(levelNumber) !== 3 && (
+                <div className="flex-none">
-                  <div className="flex-none">
-                    <Link href="/contributor/task/create">
-                      <Button color="primary" className="text-white">
-                        <UploadIcon size={18} className="mr-2" />
-                        {t("create-task", { defaultValue: "Create Task" })}
-                      </Button>
-                    </Link>
-                  </div>
-                )}
-
-                {/* <div className="flex-none">
                   <Link href={"/contributor/task/create"}>
                     <Button color="primary" className="text-white">
                       <UploadIcon size={18} className="mr-2" />
                       {t("create-task", { defaultValue: "Create Task" })}
                     </Button>
                   </Link>
-                </div> */}
+                </div>
               </div>
             </CardTitle>
           </CardHeader>

app/[locale]/(protected)/curator/feedback/page.tsx

@@ -14,7 +14,7 @@ export default function UserFeedback() {
   }, []);
   async function initState() {
     const response = await getUserFeedbacks();
-    console.log("ssss", response?.data?.data);
+    // console.log("ssss", response?.data?.data);
     setListData(response?.data?.data);
   }
 

app/[locale]/(protected)/curator/media-tracking/component/table.tsx

@@ -115,7 +115,7 @@ const MediaTrackingTable = () => {
         item.no = (page - 1) * limit + index + 1;
       });
 
-      console.log("contentData : ", data);
+      // console.log("contentData : ", data);
 
       setDataTable(contentData);
       setTotalData(data?.totalElements);

app/[locale]/(protected)/curator/task-plan/mediahub/components/table.tsx

@@ -113,13 +113,12 @@ const TaskPlanMediahubTable = (props: {
     // try {
     // const res = await ticketingPagination("", limit, page - 1);
     // const data = res?.data?.data;
-    console.log("datgaa", data);
     const contentData = data;
     contentData.forEach((item: any, index: number) => {
       item.no = (page - 1) * limit + index + 1;
     });
 
-    console.log("contentData : ", contentData);
+    // console.log("contentData : ", contentData);
 
     setDataTable(contentData);
     // setTotalData(data?.totalElements);

app/[locale]/(protected)/curator/task-plan/mediahub/create-daily/detail/[id]/page.tsx

@@ -153,8 +153,6 @@ export default function DetailDaily() {
 
       if (res?.data?.data != undefined) {
         const data = res?.data?.data;
-        console.log("data");
-        console.log("Data :", data);
         form.setValue("title", data.title);
         form.setValue("detail", data.description);
         form.setValue("date", new Date(data.date));
@@ -205,7 +203,7 @@ export default function DetailDaily() {
   const editor = useRef(null);
 
   const onSubmit = async (data: z.infer<typeof FormSchema>) => {
-    console.log("data", data);
+    // console.log("data", data);
     if (form.getValues("detail") == "") {
       form.setError("detail", {
         type: "manual",
@@ -234,7 +232,7 @@ export default function DetailDaily() {
         .filter((key) => selected[key])
         .join(", ");
     };
-    console.log("data", data, selected);
+    // console.log("data", data, selected);
     loading();
 
     const reqData = {
@@ -258,7 +256,7 @@ export default function DetailDaily() {
       assignmentMainTypeId: 1,
     };
 
-    console.log("req =>", reqData);
+    // console.log("req =>", reqData);
     const response = await savePlanning(reqData);
 
     if (response?.error) {

app/[locale]/(protected)/curator/task-plan/mediahub/create-daily/edit/[id]/page.tsx

@@ -152,8 +152,6 @@ export default function EditDaily() {
 
       if (res?.data?.data != undefined) {
         const data = res?.data?.data;
-        console.log("data");
-        console.log("Data :", data);
         form.setValue("title", data.title);
         form.setValue("detail", data.description);
         form.setValue("date", new Date(data.date));
@@ -218,7 +216,7 @@ export default function EditDaily() {
   const editor = useRef(null);
 
   const onSubmit = async (data: z.infer<typeof FormSchema>) => {
-    console.log("data", data);
+    // console.log("data", data);
     if (form.getValues("detail") == "") {
       form.setError("detail", {
         type: "manual",
@@ -247,7 +245,7 @@ export default function EditDaily() {
         .filter((key) => selected[key])
         .join(", ");
     };
-    console.log("data", data, selected);
+    // console.log("data", data, selected);
     loading();
 
     const reqData = {

app/[locale]/(protected)/curator/task-plan/mediahub/create-daily/page.tsx

@@ -166,7 +166,7 @@ export default function CreateDaily() {
   const editor = useRef(null);
 
   const onSubmit = async (data: z.infer<typeof FormSchema>) => {
-    console.log("data", data);
+    // console.log("data", data);
     if (form.getValues("detail") == "") {
       form.setError("detail", {
         type: "manual",
@@ -195,7 +195,7 @@ export default function CreateDaily() {
         .filter((key) => selected[key])
         .join(", ");
     };
-    console.log("data", data, selected);
+    // console.log("data", data, selected);
     loading();
 
     const reqData = {
@@ -219,7 +219,7 @@ export default function CreateDaily() {
       assignmentMainTypeId: 1,
     };
 
-    console.log("req =>", reqData);
+    // console.log("req =>", reqData);
     const response = await savePlanning(reqData);
 
     if (response?.error) {

app/[locale]/(protected)/curator/task-plan/mediahub/create-monthly/detail/[id]/page.tsx

@@ -76,11 +76,9 @@ export default function DetailMonthly() {
         close();
         if (res?.data?.data != undefined) {
           const data = res?.data?.data;
-          console.log("Data :", data);
           form.setValue("title", data?.title);
           form.setValue("detail", data.description);
           const date = parseDate(data.date);
-          console.log("date", date);
           form.setValue(
             "month",
             new Date(date.getFullYear(), date.getMonth(), 1)
@@ -127,7 +125,7 @@ export default function DetailMonthly() {
       ).getFullYear()}`,
       status: "Open",
     };
-    console.log("req", reqData, data.month);
+    // console.log("req", reqData, data.month);
     const response = await savePlanning(reqData);
     close();
     if (response?.error) {
@@ -154,7 +152,7 @@ export default function DetailMonthly() {
       selectedDate.getMonth(),
       1
     );
-    console.log("newDate", newDate, selectedDate);
+    // console.log("newDate", newDate, selectedDate);
     form.setValue("month", newDate);
   };
   return (

app/[locale]/(protected)/curator/task-plan/mediahub/create-monthly/edit/[id]/page.tsx

@@ -77,11 +77,9 @@ export default function EditMonthly() {
         close();
         if (res?.data?.data != undefined) {
           const data = res?.data?.data;
-          console.log("Data :", data);
           form.setValue("title", data?.title);
           form.setValue("detail", data.description);
           const date = parseDate(data.date);
-          console.log("date", date);
           form.setValue(
             "month",
             new Date(date.getFullYear(), date.getMonth(), 1)
@@ -129,7 +127,7 @@ export default function EditMonthly() {
       date: `${month.toString().padStart(2, "0")}/${year}`,
       status: "Open",
     };
-    console.log("req", reqData, data.month);
+    // console.log("req", reqData, data.month);
     const response = await savePlanning(reqData);
     close();
     if (response?.error) {
@@ -156,7 +154,7 @@ export default function EditMonthly() {
       selectedDate.getMonth(),
       1
     );
-    console.log("newDate", newDate, selectedDate);
+    // console.log("newDate", newDate, selectedDate);
     form.setValue("month", newDate);
   };
   return (

app/[locale]/(protected)/curator/task-plan/mediahub/create-monthly/page.tsx

@@ -97,7 +97,7 @@ export default function CreateMonthly() {
       date: `${month.toString().padStart(2, "0")}/${year}`,
       status: "Open",
     };
-    console.log("req", reqData, data.month);
+    // console.log("req", reqData, data.month);
     const response = await savePlanning(reqData);
     close();
     if (response?.error) {

app/[locale]/(protected)/curator/task-plan/mediahub/create-weekly/detail/[id]/page.tsx

@@ -119,7 +119,7 @@ export default function DetailWeekly() {
       status: "Open",
       parentId: parentId,
     };
-    console.log("req", reqData);
+    // console.log("req", reqData);
     const response = await savePlanning(reqData);
     close();
     if (response?.error) {
@@ -147,7 +147,7 @@ export default function DetailWeekly() {
         close();
         if (res?.data?.data != undefined) {
           const data = res?.data?.data;
-          console.log("Data :", data);
+          // console.log("Data :", data);
           form.setValue("title", data?.title);
           form.setValue("week", {
             from: new Date(data?.startDate),

app/[locale]/(protected)/curator/task-plan/mediahub/create-weekly/edit/[id]/page.tsx

@@ -118,7 +118,7 @@ export default function EditWeekly() {
       status: "Open",
       parentId: parentId,
     };
-    console.log("req", reqData);
+    // console.log("req", reqData);
     const response = await savePlanning(reqData);
     close();
     if (response?.error) {
@@ -146,7 +146,7 @@ export default function EditWeekly() {
         close();
         if (res?.data?.data != undefined) {
           const data = res?.data?.data;
-          console.log("Data :", data);
+          // console.log("Data :", data);
           form.setValue("title", data?.title);
           form.setValue("week", {
             from: new Date(data?.startDate),

app/[locale]/(protected)/curator/task-plan/mediahub/create-weekly/page.tsx

@@ -117,7 +117,7 @@ export default function CreateMonthly() {
       status: "Open",
       parentId: Number(data.parentId),
     };
-    console.log("req", reqData);
+    // console.log("req", reqData);
     const response = await savePlanning(reqData);
     close();
     if (response?.error) {

app/[locale]/(protected)/curator/task-plan/mediahub/detail/[id]/page.tsx

@@ -48,7 +48,7 @@ export default function DetailTaskPlanMediahub() {
 
       if (res?.data?.data != undefined) {
         const data = res?.data?.data;
-        console.log("Data :", data);
+        // console.log("Data :", data);
         setPlanningData(data);
         setAssignedTopLevel(data?.assignedToTopLevel);
         setArrayDestination(data?.assignedToLevel);
@@ -112,7 +112,7 @@ export default function DetailTaskPlanMediahub() {
         label: option.title,
         value: option.id,
       }));
-      console.log("res", optionArr);
+      // console.log("res", optionArr);
 
       setWeeklyList(optionArr);
     }

app/[locale]/(protected)/curator/task-plan/medsos-mediahub/components/table.tsx

@@ -113,13 +113,13 @@ const TaskPlanMediahubTable = (props: {
     // try {
     // const res = await ticketingPagination("", limit, page - 1);
     // const data = res?.data?.data;
-    console.log("datgaa", data);
+    // console.log("datgaa", data);
     const contentData = data;
     contentData.forEach((item: any, index: number) => {
       item.no = (page - 1) * limit + index + 1;
     });
 
-    console.log("contentData : ", contentData);
+    // console.log("contentData : ", contentData);
 
     setDataTable(contentData);
     // setTotalData(data?.totalElements);

app/[locale]/(protected)/curator/task-plan/medsos-mediahub/create-daily/detail/[id]/page.tsx

@@ -153,8 +153,6 @@ export default function DetailDaily() {
 
       if (res?.data?.data != undefined) {
         const data = res?.data?.data;
-        console.log("data");
-        console.log("Data :", data);
         form.setValue("title", data.title);
         form.setValue("detail", data.description);
         form.setValue("date", new Date(data.date));
@@ -205,7 +203,7 @@ export default function DetailDaily() {
   const editor = useRef(null);
 
   const onSubmit = async (data: z.infer<typeof FormSchema>) => {
-    console.log("data", data);
+    // console.log("data", data);
     if (form.getValues("detail") == "") {
       form.setError("detail", {
         type: "manual",
@@ -234,7 +232,7 @@ export default function DetailDaily() {
         .filter((key) => selected[key])
         .join(", ");
     };
-    console.log("data", data, selected);
+    // console.log("data", data, selected);
     loading();
 
     const reqData = {
@@ -258,7 +256,7 @@ export default function DetailDaily() {
       assignmentMainTypeId: 1,
     };
 
-    console.log("req =>", reqData);
+    // console.log("req =>", reqData);
     const response = await savePlanning(reqData);
 
     if (response?.error) {

app/[locale]/(protected)/curator/task-plan/medsos-mediahub/create-daily/edit/[id]/page.tsx

@@ -152,8 +152,6 @@ export default function EditDaily() {
 
       if (res?.data?.data != undefined) {
         const data = res?.data?.data;
-        console.log("data");
-        console.log("Data :", data);
         form.setValue("title", data.title);
         form.setValue("detail", data.description);
         form.setValue("date", new Date(data.date));
@@ -218,7 +216,7 @@ export default function EditDaily() {
   const editor = useRef(null);
 
   const onSubmit = async (data: z.infer<typeof FormSchema>) => {
-    console.log("data", data);
+    // console.log("data", data);
     if (form.getValues("detail") == "") {
       form.setError("detail", {
         type: "manual",
@@ -247,7 +245,7 @@ export default function EditDaily() {
         .filter((key) => selected[key])
         .join(", ");
     };
-    console.log("data", data, selected);
+    // console.log("data", data, selected);
     loading();
 
     const reqData = {

app/[locale]/(protected)/curator/task-plan/medsos-mediahub/create-daily/page.tsx

@@ -239,7 +239,7 @@ export default function CreateDaily() {
       assignmentMainTypeId: 2,
     };
 
-    console.log("req =>", reqData);
+    // console.log("req =>", reqData);
     const response = await savePlanning(reqData);
 
     if (response?.error) {

app/[locale]/(protected)/curator/task-plan/medsos-mediahub/create-monthly/detail/[id]/page.tsx

@@ -76,11 +76,11 @@ export default function DetailMonthly() {
         close();
         if (res?.data?.data != undefined) {
           const data = res?.data?.data;
-          console.log("Data :", data);
+          // console.log("Data :", data);
           form.setValue("title", data?.title);
           form.setValue("detail", data.description);
           const date = parseDate(data.date);
-          console.log("date", date);
+          // console.log("date", date);
           form.setValue(
             "month",
             new Date(date.getFullYear(), date.getMonth(), 1)
@@ -127,7 +127,7 @@ export default function DetailMonthly() {
       date: `${month.toString().padStart(2, "0")}/${year}`,
       status: "Open",
     };
-    console.log("req", reqData, data.month);
+    // console.log("req", reqData, data.month);
     const response = await savePlanning(reqData);
     close();
     if (response?.error) {
@@ -154,7 +154,7 @@ export default function DetailMonthly() {
       selectedDate.getMonth(),
       1
     );
-    console.log("newDate", newDate, selectedDate);
+    // console.log("newDate", newDate, selectedDate);
     form.setValue("month", newDate);
   };
   return (

app/[locale]/(protected)/curator/task-plan/medsos-mediahub/create-monthly/edit/[id]/page.tsx

@@ -76,11 +76,11 @@ export default function EditMonthly() {
         close();
         if (res?.data?.data != undefined) {
           const data = res?.data?.data;
-          console.log("Data :", data);
+          // console.log("Data :", data);
           form.setValue("title", data?.title);
           form.setValue("detail", data.description);
           const date = parseDate(data.date);
-          console.log("date", date);
+          // console.log("date", date);
           form.setValue(
             "month",
             new Date(date.getFullYear(), date.getMonth(), 1)
@@ -128,7 +128,7 @@ export default function EditMonthly() {
       date: `${month.toString().padStart(2, "0")}/${year}`,
       status: "Open",
     };
-    console.log("req", reqData, data.month);
+    // console.log("req", reqData, data.month);
     const response = await savePlanning(reqData);
     close();
     if (response?.error) {
@@ -155,7 +155,7 @@ export default function EditMonthly() {
       selectedDate.getMonth(),
       1
     );
-    console.log("newDate", newDate, selectedDate);
+    // console.log("newDate", newDate, selectedDate);
     form.setValue("month", newDate);
   };
   return (