diff --git a/app/[locale]/(protected)/dashboard/routine-task/components/columns.tsx b/app/[locale]/(protected)/dashboard/routine-task/components/columns.tsx
index 4ccafa03..1089a6ba 100644
--- a/app/[locale]/(protected)/dashboard/routine-task/components/columns.tsx
+++ b/app/[locale]/(protected)/dashboard/routine-task/components/columns.tsx
@@ -168,39 +168,61 @@ const columns: ColumnDef<any>[] = [
       );
     },
   },
-  {
-    id: "actions",
-    accessorKey: "action",
-    header: "Actions",
-    enableHiding: false,
-    cell: ({ row }) => {
-      return (
-        <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <Button
-              size="icon"
-              className="bg-transparent ring-offset-transparent hover:bg-transparent hover:ring-0 hover:ring-transparent"
-            >
-              <span className="sr-only">Open menu</span>
-              <MoreVertical className="h-4 w-4 text-default-800" />
-            </Button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent className="p-0" align="end">
-            <Link href={`/contributor/content/image/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" />
-                View
-              </DropdownMenuItem>
-            </Link>
-            <DropdownMenuItem 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
+ {
+  id: "actions",
+  accessorKey: "action",
+  header: "Actions",
+  enableHiding: false,
+  cell: ({ row }) => {
+    // Menentukan segmen path berdasarkan fileTypeId
+    let fileTypeSegment;
+    switch (row.original.fileTypeId) {
+      case 1:
+        fileTypeSegment = "image";
+        break;
+      case 2:
+        fileTypeSegment = "video";
+        break;
+      case 3:
+        fileTypeSegment = "teks"; // Asumsi 'teks' untuk fileTypeId 3
+        break;
+      case 4:
+        fileTypeSegment = "audio"; // Asumsi 'audio' untuk fileTypeId 4
+        break;
+      default:
+        fileTypeSegment = row.original.fileTypeId; // Fallback jika tidak ada yang cocok
+    }
+
+    return (
+      <DropdownMenu>
+        <DropdownMenuTrigger asChild>
+          <Button
+            size="icon"
+            className="bg-transparent ring-offset-transparent hover:bg-transparent hover:ring-0 hover:ring-transparent"
+          >
+            <span className="sr-only">Buka menu</span>
+            <MoreVertical className="h-4 w-4 text-default-800" />
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent className="p-0" align="end">
+          {/* Link "View" yang diperbarui dengan logika kondisional untuk fileTypeSegment */}
+          <Link
+            href={`/contributor/content/${fileTypeSegment}/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" />
+              Lihat
             </DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
-      );
-    },
+          </Link>
+          <DropdownMenuItem 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" />
+            Hapus
+          </DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
   },
+},
 ];
 
 export default columns;
diff --git a/app/[locale]/(public)/(polda)/polda/[polda_name]/audio/filter/page.tsx b/app/[locale]/(public)/(polda)/polda/[polda_name]/audio/filter/page.tsx
index 54f2f868..5b3f5fb1 100644
--- a/app/[locale]/(public)/(polda)/polda/[polda_name]/audio/filter/page.tsx
+++ b/app/[locale]/(public)/(polda)/polda/[polda_name]/audio/filter/page.tsx
@@ -11,6 +11,7 @@ import {
 } from "@/utils/globals";
 import { useParams, usePathname, useSearchParams } from "next/navigation";
 import {
+  getPublicCategoryData,
   getUserLevelListByParent,
   listCategory,
   listData,
@@ -53,7 +54,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -105,6 +106,7 @@ const FilterPage = () => {
   const poldaName = params?.polda_name;
   let prefixPath = poldaName ? `/polda/${poldaName}` : "/";
   const t = useTranslations("FilterPage");
+  const satkerName = params?.satker_name;
 
   const [isLoading, setIsLoading] = useState<any>(true);
 
@@ -126,7 +128,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -177,11 +179,32 @@ const FilterPage = () => {
     formatFilter,
   ]);
 
-  async function getCategories() {
-    const category = await listCategory("4");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("4");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+  useEffect(() => {
+    initFetch();
+  }, []);
+  const initFetch = async () => {
+    const response = await getPublicCategoryData(
+      props.group == "mabes"
+        ? ""
+        : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+        ? poldaName
+        : props.group == "satker" &&
+          satkerName &&
+          String(satkerName)?.length > 1
+        ? "satker-" + satkerName
+        : "",
+      "",
+      locale == "en" ? true : false
+    );
+    console.log("category", response);
+    setCategories(response?.data?.data?.content);
+  };
 
   useEffect(() => {
     function initState() {
diff --git a/app/[locale]/(public)/(polda)/polda/[polda_name]/document/filter/page.tsx b/app/[locale]/(public)/(polda)/polda/[polda_name]/document/filter/page.tsx
index 20c37b97..46b6b609 100644
--- a/app/[locale]/(public)/(polda)/polda/[polda_name]/document/filter/page.tsx
+++ b/app/[locale]/(public)/(polda)/polda/[polda_name]/document/filter/page.tsx
@@ -11,6 +11,7 @@ import {
 import { useParams, usePathname, useSearchParams } from "next/navigation";
 import {
   getListContent,
+  getPublicCategoryData,
   getUserLevelListByParent,
   listCategory,
   listData,
@@ -46,7 +47,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -98,6 +99,7 @@ const FilterPage = () => {
   const poldaName = params?.polda_name;
   let prefixPath = poldaName ? `/polda/${poldaName}` : "/";
   const [isLoading, setIsLoading] = useState<any>(true);
+  const satkerName = params?.satker_name;
 
   // const [startDate, endDate] = dateRange;
 
@@ -117,7 +119,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -168,11 +170,32 @@ const FilterPage = () => {
     formatFilter,
   ]);
 
-  async function getCategories() {
-    const category = await listCategory("3");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("3");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+  useEffect(() => {
+    initFetch();
+  }, []);
+  const initFetch = async () => {
+    const response = await getPublicCategoryData(
+      props.group == "mabes"
+        ? ""
+        : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+        ? poldaName
+        : props.group == "satker" &&
+          satkerName &&
+          String(satkerName)?.length > 1
+        ? "satker-" + satkerName
+        : "",
+      "",
+      locale == "en" ? true : false
+    );
+    console.log("category", response);
+    setCategories(response?.data?.data?.content);
+  };
 
   useEffect(() => {
     function initState() {
@@ -357,9 +380,9 @@ const FilterPage = () => {
   });
 
   useEffect(() => {
-    initFetch();
+    fetchContent();
   }, [page]);
-  const initFetch = async () => {
+  const fetchContent = async () => {
     const response = await getListContent({
       page: page - 1,
       size: 6,
diff --git a/app/[locale]/(public)/(polda)/polda/[polda_name]/image/filter/page.tsx b/app/[locale]/(public)/(polda)/polda/[polda_name]/image/filter/page.tsx
index f702a5e1..0e373d3b 100644
--- a/app/[locale]/(public)/(polda)/polda/[polda_name]/image/filter/page.tsx
+++ b/app/[locale]/(public)/(polda)/polda/[polda_name]/image/filter/page.tsx
@@ -10,6 +10,7 @@ import {
 } from "@/utils/globals";
 import { useParams, usePathname, useSearchParams } from "next/navigation";
 import {
+  getPublicCategoryData,
   getUserLevelListByParent,
   listCategory,
   listData,
@@ -47,7 +48,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -99,6 +100,7 @@ const FilterPage = () => {
   const [categories, setCategories] = useState([]);
   const [userLevels, setUserLevels] = useState([]);
   const poldaName = params?.polda_name;
+  const satkerName = params?.satker_name;
   let prefixPath = poldaName ? `/polda/${poldaName}` : "/";
   const [isLoading, setIsLoading] = useState<any>(true);
 
@@ -123,7 +125,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -174,11 +176,32 @@ const FilterPage = () => {
     formatFilter,
   ]);
 
-  async function getCategories() {
-    const category = await listCategory("1");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("1");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+  useEffect(() => {
+    initFetch();
+  }, []);
+  const initFetch = async () => {
+    const response = await getPublicCategoryData(
+      props.group == "mabes"
+        ? ""
+        : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+        ? poldaName
+        : props.group == "satker" &&
+          satkerName &&
+          String(satkerName)?.length > 1
+        ? "satker-" + satkerName
+        : "",
+      "",
+      locale == "en" ? true : false
+    );
+    console.log("category", response);
+    setCategories(response?.data?.data?.content);
+  };
 
   useEffect(() => {
     function initState() {
diff --git a/app/[locale]/(public)/(polda)/polda/[polda_name]/video/filter/page.tsx b/app/[locale]/(public)/(polda)/polda/[polda_name]/video/filter/page.tsx
index 38871b81..1a6f1c8f 100644
--- a/app/[locale]/(public)/(polda)/polda/[polda_name]/video/filter/page.tsx
+++ b/app/[locale]/(public)/(polda)/polda/[polda_name]/video/filter/page.tsx
@@ -11,6 +11,7 @@ import {
 import { useParams, usePathname, useSearchParams } from "next/navigation";
 import {
   getListContent,
+  getPublicCategoryData,
   getUserLevelListByParent,
   listCategory,
   listData,
@@ -48,7 +49,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -98,6 +99,7 @@ const FilterPage = () => {
   let prefixPath = poldaName ? `/polda/${poldaName}` : "/";
   const t = useTranslations("FilterPage");
   const [isLoading, setIsLoading] = useState<any>(true);
+  const satkerName = params?.satker_name;
 
   // const [startDate, endDate] = dateRange;
 
@@ -117,7 +119,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -168,11 +170,32 @@ const FilterPage = () => {
     formatFilter,
   ]);
 
-  async function getCategories() {
-    const category = await listCategory("2");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("2");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+  useEffect(() => {
+    initFetch();
+  }, []);
+  const initFetch = async () => {
+    const response = await getPublicCategoryData(
+      props.group == "mabes"
+        ? ""
+        : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+        ? poldaName
+        : props.group == "satker" &&
+          satkerName &&
+          String(satkerName)?.length > 1
+        ? "satker-" + satkerName
+        : "",
+      "",
+      locale == "en" ? true : false
+    );
+    console.log("category", response);
+    setCategories(response?.data?.data?.content);
+  };
 
   useEffect(() => {
     function initState() {
@@ -351,9 +374,9 @@ const FilterPage = () => {
   });
 
   useEffect(() => {
-    initFetch();
+    fetchContent();
   }, [page]);
-  const initFetch = async () => {
+  const fetchContent = async () => {
     const response = await getListContent({
       page: page - 1,
       size: 6,
@@ -693,9 +716,13 @@ const FilterPage = () => {
                         >
                           <CardContent className="flex flex-col text-xs lg:text-sm w-full p-0">
                             <div
-                            //  href={`/video/detail/${video?.slug}`} 
-                             onClick={() => router.push(prefixPath + `/video/detail/${video?.slug}`)}
-                             >
+                              //  href={`/video/detail/${video?.slug}`}
+                              onClick={() =>
+                                router.push(
+                                  prefixPath + `/video/detail/${video?.slug}`
+                                )
+                              }
+                            >
                               {/* <img src={video?.thumbnailLink} className="h-60 object-cover items-center justify-center cursor-pointer rounded-lg place-self-center" /> */}
                               <div className="img-container h-60 bg-[#e9e9e9] cursor-pointer rounded-lg">
                                 <ImageBlurry
diff --git a/app/[locale]/(public)/(satker)/satker/[satker_name]/audio/filter/page.tsx b/app/[locale]/(public)/(satker)/satker/[satker_name]/audio/filter/page.tsx
index 4c483e42..172232a4 100644
--- a/app/[locale]/(public)/(satker)/satker/[satker_name]/audio/filter/page.tsx
+++ b/app/[locale]/(public)/(satker)/satker/[satker_name]/audio/filter/page.tsx
@@ -3,10 +3,31 @@ import React, { useEffect, useState } from "react";
 import { Card, CardContent } from "@/components/ui/card";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Icon } from "@iconify/react/dist/iconify.js";
-import { formatDateToIndonesian, getOnlyDate, getOnlyMonthAndYear } from "@/utils/globals";
+import {
+  formatDateToIndonesian,
+  getOnlyDate,
+  getOnlyMonthAndYear,
+} from "@/utils/globals";
 import { useParams, usePathname, useSearchParams } from "next/navigation";
-import { getUserLevelListByParent, listCategory, listData, listDataRegional } from "@/service/landing/landing";
-import { ColumnDef, ColumnFiltersState, PaginationState, SortingState, VisibilityState, getCoreRowModel, getFilteredRowModel, getPaginationRowModel, getSortedRowModel, useReactTable } from "@tanstack/react-table";
+import {
+  getPublicCategoryData,
+  getUserLevelListByParent,
+  listCategory,
+  listData,
+  listDataRegional,
+} from "@/service/landing/landing";
+import {
+  ColumnDef,
+  ColumnFiltersState,
+  PaginationState,
+  SortingState,
+  VisibilityState,
+  getCoreRowModel,
+  getFilteredRowModel,
+  getPaginationRowModel,
+  getSortedRowModel,
+  useReactTable,
+} from "@tanstack/react-table";
 import LandingPagination from "@/components/landing-page/pagination";
 import { Reveal } from "@/components/landing-page/Reveal";
 import { Link, useRouter } from "@/i18n/routing";
@@ -14,7 +35,13 @@ import { Input } from "@/components/ui/input";
 import ReactDatePicker from "react-datepicker";
 import "react-datepicker/dist/react-datepicker.css";
 import { close, loading } from "@/config/swal";
-import { Carousel, CarouselContent, CarouselItem, CarouselNext, CarouselPrevious } from "@/components/ui/carousel";
+import {
+  Carousel,
+  CarouselContent,
+  CarouselItem,
+  CarouselNext,
+  CarouselPrevious,
+} from "@/components/ui/carousel";
 import { useTranslations } from "next-intl";
 
 const columns: ColumnDef<any>[] = [
@@ -25,7 +52,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -35,8 +62,11 @@ const FilterPage = () => {
   const [totalData, setTotalData] = React.useState<number>(1);
   const [totalPage, setTotalPage] = React.useState<number>(1);
   const [sorting, setSorting] = React.useState<SortingState>([]);
-  const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([]);
-  const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({});
+  const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
+    []
+  );
+  const [columnVisibility, setColumnVisibility] =
+    React.useState<VisibilityState>({});
   const [rowSelection, setRowSelection] = React.useState({});
   const [pagination, setPagination] = React.useState<PaginationState>({
     pageIndex: 0,
@@ -57,7 +87,9 @@ const FilterPage = () => {
   const [categoryFilter, setCategoryFilter] = useState<any>([]);
   const [monthYearFilter, setMonthYearFilter] = useState<any>();
   const [searchTitle, setSearchTitle] = useState<string>("");
-  const [sortByOpt, setSortByOpt] = useState<any>(sortBy === "popular" ? "clickCount" : "createdAt");
+  const [sortByOpt, setSortByOpt] = useState<any>(
+    sortBy === "popular" ? "clickCount" : "createdAt"
+  );
   const isRegional = asPath?.includes("regional");
   const isSatker = asPath?.includes("satker");
   const [formatFilter, setFormatFilter] = useState<any>([]);
@@ -69,6 +101,7 @@ const FilterPage = () => {
   const [handleClose, setHandleClose] = useState(false);
   const [categories, setCategories] = useState([]);
   const [userLevels, setUserLevels] = useState([]);
+  const poldaName = params?.polda_name;
   const satkerName = params?.satker_name;
   let prefixPath = satkerName ? `/satker/${satkerName}` : "/";
   const t = useTranslations("FilterPage");
@@ -84,7 +117,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -96,8 +129,14 @@ const FilterPage = () => {
 
   useEffect(() => {
     if (categorie) {
-      setCategoryFilter(categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]);
-      console.log("Kategori", categorie, categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]);
+      setCategoryFilter(
+        categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
+      );
+      console.log(
+        "Kategori",
+        categorie,
+        categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
+      );
     }
   }, [categorie]);
 
@@ -115,13 +154,46 @@ const FilterPage = () => {
     }
     console.log(monthYearFilter, "monthFilter");
     initState();
-  }, [change, asPath, monthYearFilter, page, sortBy, sortByOpt, title, startDateString, endDateString, categorie, formatFilter]);
+  }, [
+    change,
+    asPath,
+    monthYearFilter,
+    page,
+    sortBy,
+    sortByOpt,
+    title,
+    startDateString,
+    endDateString,
+    categorie,
+    formatFilter,
+  ]);
 
-  async function getCategories() {
-    const category = await listCategory("4");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("4");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+  useEffect(() => {
+    initFetch();
+  }, []);
+  const initFetch = async () => {
+    const response = await getPublicCategoryData(
+      props.group == "mabes"
+        ? ""
+        : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+        ? poldaName
+        : props.group == "satker" &&
+          satkerName &&
+          String(satkerName)?.length > 1
+        ? "satker-" + satkerName
+        : "",
+      "",
+      locale == "en" ? true : false
+    );
+    console.log("category", response);
+    setCategories(response?.data?.data?.content);
+  };
 
   useEffect(() => {
     function initState() {
@@ -137,7 +209,10 @@ const FilterPage = () => {
 
   async function getDataAll() {
     if (satkerName && String(satkerName)?.length > 1) {
-      const filter = categoryFilter?.length > 0 ? categoryFilter?.sort().join(",") : categorie || "";
+      const filter =
+        categoryFilter?.length > 0
+          ? categoryFilter?.sort().join(",")
+          : categorie || "";
 
       const name = title == undefined ? "" : title;
       const format = formatFilter == undefined ? "" : formatFilter?.join(",");
@@ -155,8 +230,12 @@ const FilterPage = () => {
         filterGroup,
         startDateString,
         endDateString,
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "") : "",
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1] : ""
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "")
+          : "",
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1]
+          : ""
       );
       close();
       const data = response?.data?.data;
@@ -166,7 +245,10 @@ const FilterPage = () => {
       setTotalPage(data?.totalPages);
       setTotalContent(response?.data?.data?.totalElements);
     } else {
-      const filter = categoryFilter?.length > 0 ? categoryFilter?.sort().join(",") : categorie || "";
+      const filter =
+        categoryFilter?.length > 0
+          ? categoryFilter?.sort().join(",")
+          : categorie || "";
 
       const name = title == undefined ? "" : title;
       const format = formatFilter == undefined ? "" : formatFilter?.join(",");
@@ -183,8 +265,12 @@ const FilterPage = () => {
         "",
         startDateString,
         endDateString,
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "") : "",
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1] : ""
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "")
+          : "",
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1]
+          : ""
       );
       close();
       const data = response?.data?.data;
@@ -231,7 +317,10 @@ const FilterPage = () => {
   };
 
   async function getDataRegional() {
-    const filter = categoryFilter?.length > 0 ? categoryFilter?.sort().join(",") : categorie || "";
+    const filter =
+      categoryFilter?.length > 0
+        ? categoryFilter?.sort().join(",")
+        : categorie || "";
 
     const name = title == undefined ? "" : title;
     const format = formatFilter == undefined ? "" : formatFilter?.join(",");
@@ -244,8 +333,12 @@ const FilterPage = () => {
       "",
       startDateString,
       endDateString,
-      monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "") : "",
-      monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1] : "",
+      monthYearFilter
+        ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "")
+        : "",
+      monthYearFilter
+        ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1]
+        : "",
       12,
       pages,
       sortByOpt
@@ -371,7 +464,10 @@ const FilterPage = () => {
           <div className="border-t border-black my-4 dark:border-white"></div>
           <div className="space-y-6">
             <div>
-              <label htmlFor="search" className="block text-sm font-medium text-gray-700 dark:text-white">
+              <label
+                htmlFor="search"
+                className="block text-sm font-medium text-gray-700 dark:text-white"
+              >
                 {t("search")}
               </label>
               <Input
@@ -387,7 +483,9 @@ const FilterPage = () => {
             </div>
 
             <div>
-              <label className="block text-sm font-medium text-gray-700 dark:text-white">{t("monthYear")}</label>
+              <label className="block text-sm font-medium text-gray-700 dark:text-white">
+                {t("monthYear")}
+              </label>
               <ReactDatePicker
                 selected={monthYearFilter}
                 className="mt-1 w-full text-xs border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500"
@@ -399,7 +497,9 @@ const FilterPage = () => {
             </div>
 
             <div>
-              <label className="block text-sm font-medium text-gray-700 dark:text-white">{t("date")}</label>
+              <label className="block text-sm font-medium text-gray-700 dark:text-white">
+                {t("date")}
+              </label>
               <div className="flex flex-row justify justify-between gap-2">
                 <ReactDatePicker
                   selectsRange
@@ -412,18 +512,44 @@ const FilterPage = () => {
                   placeholderText={t("searchDate")}
                   onCalendarClose={() => setCalenderState(!calenderState)}
                 />
-                <div className="flex items-center">{handleClose ? <Icon icon="carbon:close-filled" onClick={handleDeleteDate} width="20" inline color="#216ba5" /> : ""}</div>
+                <div className="flex items-center">
+                  {handleClose ? (
+                    <Icon
+                      icon="carbon:close-filled"
+                      onClick={handleDeleteDate}
+                      width="20"
+                      inline
+                      color="#216ba5"
+                    />
+                  ) : (
+                    ""
+                  )}
+                </div>
               </div>
             </div>
 
             <div>
-              <h3 className="text-sm font-medium text-gray-700 dark:text-white">{t("categories")}</h3>
+              <h3 className="text-sm font-medium text-gray-700 dark:text-white">
+                {t("categories")}
+              </h3>
               <ul className="mt-2 space-y-2">
                 {categories.map((category: any) => (
                   <li key={category?.id}>
-                    <label className="inline-flex items-center" htmlFor={`${category.id}`}>
-                      <Checkbox id={`${category.id}`} value={category.id} checked={categoryFilter.includes(String(category.id))} onCheckedChange={(e) => handleCategoryFilter(Boolean(e), category.id)} />
-                      <span className="ml-2 text-gray-700 dark:text-white">{category?.name}</span>
+                    <label
+                      className="inline-flex items-center"
+                      htmlFor={`${category.id}`}
+                    >
+                      <Checkbox
+                        id={`${category.id}`}
+                        value={category.id}
+                        checked={categoryFilter.includes(String(category.id))}
+                        onCheckedChange={(e) =>
+                          handleCategoryFilter(Boolean(e), category.id)
+                        }
+                      />
+                      <span className="ml-2 text-gray-700 dark:text-white">
+                        {category?.name}
+                      </span>
                     </label>
                   </li>
                 ))}
@@ -433,25 +559,48 @@ const FilterPage = () => {
             <div className="border-t border-black my-4 dark:border-white"></div>
             {/* Garis */}
             <div>
-              <h3 className="text-sm font-medium text-gray-700 dark:text-white">Format</h3>
+              <h3 className="text-sm font-medium text-gray-700 dark:text-white">
+                Format
+              </h3>
               <ul className="mt-2 space-y-2">
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="png" value="png" checked={formatFilter.includes("wav")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "wav")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">WAV</span>
+                    <Checkbox
+                      id="png"
+                      value="png"
+                      checked={formatFilter.includes("wav")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "wav")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      WAV
+                    </span>
                   </label>
                 </li>
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="jpeg" value="jpeg" checked={formatFilter.includes("mp3")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "mp3")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">MP3</span>
+                    <Checkbox
+                      id="jpeg"
+                      value="jpeg"
+                      checked={formatFilter.includes("mp3")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "mp3")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      MP3
+                    </span>
                   </label>
                 </li>
               </ul>
             </div>
             <div className="border-t border-black dark:border-white my-4"></div>
             <div className="text-center">
-              <a onClick={cleanCheckbox} className="text-[#bb3523] cursor-pointer">
+              <a
+                onClick={cleanCheckbox}
+                className="text-[#bb3523] cursor-pointer"
+              >
                 <b>Reset Filter</b>
               </a>
             </div>
@@ -463,7 +612,11 @@ const FilterPage = () => {
           <div className="flex-1">
             <div className="flex flex-col items-end mb-4">
               <h2 className="text-lg font-semibold">{t("sortBy")} </h2>
-              <select defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"} onChange={(e) => handleSorting(e)} className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500">
+              <select
+                defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"}
+                onChange={(e) => handleSorting(e)}
+                className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500"
+              >
                 <option value="latest">{t("latest")}</option>
                 <option value="popular">{t("mostPopular")}</option>
               </select>
@@ -475,11 +628,23 @@ const FilterPage = () => {
                   <Carousel className="w-full max-w-7xl mx-auto">
                     <CarouselContent>
                       {audioData?.map((audio: any) => (
-                        <CarouselItem key={audio?.id} className="md:basis-1/2 lg:basis-1/3">
+                        <CarouselItem
+                          key={audio?.id}
+                          className="md:basis-1/2 lg:basis-1/3"
+                        >
                           <div className="flex flex-row gap-6">
-                            <Link href={`${prefixPath}/audio/detail/${audio?.slug}`} className="flex flex-col sm:flex-row items-center bg-white dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full">
+                            <Link
+                              href={`${prefixPath}/audio/detail/${audio?.slug}`}
+                              className="flex flex-col sm:flex-row items-center bg-white dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full"
+                            >
                               <div className="flex items-center justify-center bg-red-500 text-white rounded-lg w-16 h-8 lg:h-16">
-                                <svg width="32" height="34" viewBox="0 0 32 34" fill="null" xmlns="http://www.w3.org/2000/svg">
+                                <svg
+                                  width="32"
+                                  height="34"
+                                  viewBox="0 0 32 34"
+                                  fill="null"
+                                  xmlns="http://www.w3.org/2000/svg"
+                                >
                                   <path
                                     d="M23.404 0.452014C23.7033 0.35857 24.0204 0.336816 24.3297 0.388509C24.639 0.440203 24.9318 0.563895 25.1845 0.749599C25.4371 0.935304 25.6426 1.17782 25.7843 1.45756C25.9259 1.73731 25.9998 2.04644 26 2.36001V14.414C25.3462 14.2296 24.6766 14.1064 24 14.046V8.36001L10 12.736V27C10 28.1264 9.6197 29.2197 8.92071 30.1029C8.22172 30.9861 7.24499 31.6075 6.14877 31.8663C5.05255 32.125 3.90107 32.0061 2.88089 31.5287C1.86071 31.0514 1.03159 30.2435 0.52787 29.2361C0.024152 28.2286 -0.124656 27.0806 0.105556 25.9781C0.335768 24.8755 0.931513 23.883 1.79627 23.1613C2.66102 22.4396 3.74413 22.031 4.87009 22.0017C5.99606 21.9724 7.09893 22.3242 8.00001 23V6.73601C7.99982 6.30956 8.13596 5.8942 8.38854 5.55059C8.64112 5.20698 8.99692 4.9531 9.40401 4.82601L23.404 0.452014ZM10 10.64L24 6.26601V2.36001L10 6.73601V10.64ZM5.00001 24C4.20436 24 3.44129 24.3161 2.87869 24.8787C2.31608 25.4413 2.00001 26.2044 2.00001 27C2.00001 27.7957 2.31608 28.5587 2.87869 29.1213C3.44129 29.6839 4.20436 30 5.00001 30C5.79566 30 6.55872 29.6839 7.12133 29.1213C7.68394 28.5587 8.00001 27.7957 8.00001 27C8.00001 26.2044 7.68394 25.4413 7.12133 24.8787C6.55872 24.3161 5.79566 24 5.00001 24ZM32 25C32 27.387 31.0518 29.6761 29.364 31.364C27.6761 33.0518 25.387 34 23 34C20.6131 34 18.3239 33.0518 16.636 31.364C14.9482 29.6761 14 27.387 14 25C14 22.6131 14.9482 20.3239 16.636 18.6361C18.3239 16.9482 20.6131 16 23 16C25.387 16 27.6761 16.9482 29.364 18.6361C31.0518 20.3239 32 22.6131 32 25ZM27.47 24.128L21.482 20.828C21.3298 20.7443 21.1583 20.7016 20.9846 20.7043C20.8108 20.707 20.6408 20.7549 20.4912 20.8433C20.3416 20.9317 20.2176 21.0576 20.1315 21.2086C20.0453 21.3595 20 21.5302 20 21.704V28.304C20 28.4778 20.0453 28.6486 20.1315 28.7995C20.2176 28.9504 20.3416 29.0763 20.4912 29.1647C20.6408 29.2531 20.8108 29.301 20.9846 29.3037C21.1583 29.3064 21.3298 29.2638 21.482 29.18L27.47 25.88C27.6268 25.7937 27.7575 25.6669 27.8486 25.5128C27.9397 25.3587 27.9877 25.183 27.9877 25.004C27.9877 24.825 27.9397 24.6493 27.8486 24.4952C27.7575 24.3412 27.6268 24.2143 27.47 24.128Z"
                                     fill="white"
@@ -489,9 +654,20 @@ const FilterPage = () => {
 
                               <div className="flex flex-col  flex-1">
                                 <div className="text-gray-500 dark:text-gray-400 flex flex-row text-sm">
-                                  {formatDateToIndonesian(new Date(audio?.createdAt))} {audio?.timezone ? audio?.timezone : "WIB"} | <Icon icon="formkit:eye" width="15" height="15" /> {audio?.clickCount}{" "}
+                                  {formatDateToIndonesian(
+                                    new Date(audio?.createdAt)
+                                  )}{" "}
+                                  {audio?.timezone ? audio?.timezone : "WIB"} |{" "}
+                                  <Icon
+                                    icon="formkit:eye"
+                                    width="15"
+                                    height="15"
+                                  />{" "}
+                                  {audio?.clickCount}{" "}
+                                </div>
+                                <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm h-5 hover:h-auto truncate hover:whitespace-normal hover:overflow-visible">
+                                  {audio?.title}
                                 </div>
-                                <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm h-5 hover:h-auto truncate hover:whitespace-normal hover:overflow-visible">{audio?.title}</div>
                               </div>
                             </Link>
                           </div>
@@ -505,11 +681,19 @@ const FilterPage = () => {
               </div>
             ) : (
               <p className="flex items-center justify-center text-black">
-                <img src="/assets/empty-data.png" alt="empty" className="h-60 w-60 my-4" />
+                <img
+                  src="/assets/empty-data.png"
+                  alt="empty"
+                  className="h-60 w-60 my-4"
+                />
               </p>
             )}
 
-            <LandingPagination table={table} totalData={totalData} totalPage={totalPage} />
+            <LandingPagination
+              table={table}
+              totalData={totalData}
+              totalPage={totalPage}
+            />
           </div>
         </Reveal>
       </div>
diff --git a/app/[locale]/(public)/(satker)/satker/[satker_name]/document/filter/page.tsx b/app/[locale]/(public)/(satker)/satker/[satker_name]/document/filter/page.tsx
index 0c49f0c1..43c4df04 100644
--- a/app/[locale]/(public)/(satker)/satker/[satker_name]/document/filter/page.tsx
+++ b/app/[locale]/(public)/(satker)/satker/[satker_name]/document/filter/page.tsx
@@ -3,10 +3,32 @@ import React, { useEffect, useState } from "react";
 import { Card, CardContent } from "@/components/ui/card";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Icon } from "@iconify/react/dist/iconify.js";
-import { formatDateToIndonesian, getOnlyDate, getOnlyMonthAndYear } from "@/utils/globals";
+import {
+  formatDateToIndonesian,
+  getOnlyDate,
+  getOnlyMonthAndYear,
+} from "@/utils/globals";
 import { useParams, usePathname, useSearchParams } from "next/navigation";
-import { getListContent, getUserLevelListByParent, listCategory, listData, listDataRegional } from "@/service/landing/landing";
-import { ColumnDef, ColumnFiltersState, PaginationState, SortingState, VisibilityState, getCoreRowModel, getFilteredRowModel, getPaginationRowModel, getSortedRowModel, useReactTable } from "@tanstack/react-table";
+import {
+  getListContent,
+  getPublicCategoryData,
+  getUserLevelListByParent,
+  listCategory,
+  listData,
+  listDataRegional,
+} from "@/service/landing/landing";
+import {
+  ColumnDef,
+  ColumnFiltersState,
+  PaginationState,
+  SortingState,
+  VisibilityState,
+  getCoreRowModel,
+  getFilteredRowModel,
+  getPaginationRowModel,
+  getSortedRowModel,
+  useReactTable,
+} from "@tanstack/react-table";
 import LandingPagination from "@/components/landing-page/pagination";
 import { Reveal } from "@/components/landing-page/Reveal";
 import { Link, useRouter } from "@/i18n/routing";
@@ -24,7 +46,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -34,8 +56,11 @@ const FilterPage = () => {
   const [totalData, setTotalData] = React.useState<number>(1);
   const [totalPage, setTotalPage] = React.useState<number>(1);
   const [sorting, setSorting] = React.useState<SortingState>([]);
-  const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([]);
-  const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({});
+  const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
+    []
+  );
+  const [columnVisibility, setColumnVisibility] =
+    React.useState<VisibilityState>({});
   const [rowSelection, setRowSelection] = React.useState({});
   const [pagination, setPagination] = React.useState<PaginationState>({
     pageIndex: 0,
@@ -56,7 +81,9 @@ const FilterPage = () => {
   const [categoryFilter, setCategoryFilter] = useState<any>([]);
   const [monthYearFilter, setMonthYearFilter] = useState<any>();
   const [searchTitle, setSearchTitle] = useState<string>("");
-  const [sortByOpt, setSortByOpt] = useState<any>(sortBy === "popular" ? "clickCount" : "createdAt");
+  const [sortByOpt, setSortByOpt] = useState<any>(
+    sortBy === "popular" ? "clickCount" : "createdAt"
+  );
   const isRegional = asPath?.includes("regional");
   const isSatker = asPath?.includes("satker");
   const [formatFilter, setFormatFilter] = useState<any>([]);
@@ -68,6 +95,7 @@ const FilterPage = () => {
   const [handleClose, setHandleClose] = useState(false);
   const [categories, setCategories] = useState([]);
   const [userLevels, setUserLevels] = useState([]);
+  const poldaName = params?.polda_name;
   const satkerName = params?.satker_name;
   let prefixPath = satkerName ? `/satker/${satkerName}` : "/";
 
@@ -82,7 +110,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -94,8 +122,14 @@ const FilterPage = () => {
 
   useEffect(() => {
     if (categorie) {
-      setCategoryFilter(categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]);
-      console.log("Kategori", categorie, categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]);
+      setCategoryFilter(
+        categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
+      );
+      console.log(
+        "Kategori",
+        categorie,
+        categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
+      );
     }
   }, [categorie]);
 
@@ -113,13 +147,46 @@ const FilterPage = () => {
     }
     console.log(monthYearFilter, "monthFilter");
     initState();
-  }, [change, asPath, monthYearFilter, page, sortBy, sortByOpt, title, startDateString, endDateString, categorie, formatFilter]);
+  }, [
+    change,
+    asPath,
+    monthYearFilter,
+    page,
+    sortBy,
+    sortByOpt,
+    title,
+    startDateString,
+    endDateString,
+    categorie,
+    formatFilter,
+  ]);
 
-  async function getCategories() {
-    const category = await listCategory("3");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("3");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+  useEffect(() => {
+    fetchContent();
+  }, []);
+  const fetchContent = async () => {
+    const response = await getPublicCategoryData(
+      props.group == "mabes"
+        ? ""
+        : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+        ? poldaName
+        : props.group == "satker" &&
+          satkerName &&
+          String(satkerName)?.length > 1
+        ? "satker-" + satkerName
+        : "",
+      "",
+      locale == "en" ? true : false
+    );
+    console.log("category", response);
+    setCategories(response?.data?.data?.content);
+  };
 
   useEffect(() => {
     function initState() {
@@ -135,7 +202,10 @@ const FilterPage = () => {
 
   async function getDataAll() {
     if (satkerName && String(satkerName)?.length > 1) {
-      const filter = categoryFilter?.length > 0 ? categoryFilter?.sort().join(",") : categorie || "";
+      const filter =
+        categoryFilter?.length > 0
+          ? categoryFilter?.sort().join(",")
+          : categorie || "";
 
       const name = title == undefined ? "" : title;
       const format = formatFilter == undefined ? "" : formatFilter?.join(",");
@@ -153,8 +223,12 @@ const FilterPage = () => {
         filterGroup,
         startDateString,
         endDateString,
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "") : "",
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1] : ""
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "")
+          : "",
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1]
+          : ""
       );
       close();
       // setGetTotalPage(response?.data?.data?.totalPages);
@@ -167,7 +241,10 @@ const FilterPage = () => {
       setTotalPage(data?.totalPages);
       setTotalContent(response?.data?.data?.totalElements);
     } else {
-      const filter = categoryFilter?.length > 0 ? categoryFilter?.sort().join(",") : categorie || "";
+      const filter =
+        categoryFilter?.length > 0
+          ? categoryFilter?.sort().join(",")
+          : categorie || "";
 
       const name = title == undefined ? "" : title;
       const format = formatFilter == undefined ? "" : formatFilter?.join(",");
@@ -184,8 +261,12 @@ const FilterPage = () => {
         "",
         startDateString,
         endDateString,
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "") : "",
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1] : ""
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "")
+          : "",
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1]
+          : ""
       );
       close();
       // setGetTotalPage(response?.data?.data?.totalPages);
@@ -235,7 +316,10 @@ const FilterPage = () => {
   };
 
   async function getDataRegional() {
-    const filter = categoryFilter?.length > 0 ? categoryFilter?.sort().join(",") : categorie || "";
+    const filter =
+      categoryFilter?.length > 0
+        ? categoryFilter?.sort().join(",")
+        : categorie || "";
 
     const name = title == undefined ? "" : title;
     const format = formatFilter == undefined ? "" : formatFilter?.join(",");
@@ -248,8 +332,12 @@ const FilterPage = () => {
       "",
       startDateString,
       endDateString,
-      monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "") : "",
-      monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1] : "",
+      monthYearFilter
+        ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "")
+        : "",
+      monthYearFilter
+        ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1]
+        : "",
       12,
       pages,
       sortByOpt
@@ -286,7 +374,12 @@ const FilterPage = () => {
     initFetch();
   }, [page]);
   const initFetch = async () => {
-    const response = await getListContent({ page: page - 1, size: 6, sortBy: "createdAt", contentTypeId: "3" });
+    const response = await getListContent({
+      page: page - 1,
+      size: 6,
+      sortBy: "createdAt",
+      contentTypeId: "3",
+    });
     console.log(response);
     setDocumentData(response?.data?.data?.content);
     const data = response?.data?.data;
@@ -389,7 +482,10 @@ const FilterPage = () => {
           <div className="border-t border-black my-4 dark:border-white"></div>
           <div className="space-y-6">
             <div>
-              <label htmlFor="search" className="block text-sm font-medium text-gray-700 dark:text-white">
+              <label
+                htmlFor="search"
+                className="block text-sm font-medium text-gray-700 dark:text-white"
+              >
                 {t("search")}
               </label>
               <Input
@@ -405,7 +501,9 @@ const FilterPage = () => {
             </div>
 
             <div>
-              <label className="block text-sm font-medium text-gray-700 dark:text-white">{t("monthYear")}</label>
+              <label className="block text-sm font-medium text-gray-700 dark:text-white">
+                {t("monthYear")}
+              </label>
               <ReactDatePicker
                 selected={monthYearFilter}
                 className="mt-1 w-full text-xs border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500"
@@ -417,7 +515,9 @@ const FilterPage = () => {
             </div>
 
             <div>
-              <label className="block text-sm font-medium text-gray-700 dark:text-white">{t("date")}</label>
+              <label className="block text-sm font-medium text-gray-700 dark:text-white">
+                {t("date")}
+              </label>
               <div className="flex flex-row justify justify-between gap-2">
                 <ReactDatePicker
                   selectsRange
@@ -430,18 +530,44 @@ const FilterPage = () => {
                   placeholderText={t("selectDate")}
                   onCalendarClose={() => setCalenderState(!calenderState)}
                 />
-                <div className="flex items-center">{handleClose ? <Icon icon="carbon:close-filled" onClick={handleDeleteDate} width="20" inline color="#216ba5" /> : ""}</div>
+                <div className="flex items-center">
+                  {handleClose ? (
+                    <Icon
+                      icon="carbon:close-filled"
+                      onClick={handleDeleteDate}
+                      width="20"
+                      inline
+                      color="#216ba5"
+                    />
+                  ) : (
+                    ""
+                  )}
+                </div>
               </div>
             </div>
 
             <div>
-              <h3 className="text-sm font-medium text-gray-700 dark:text-white">{t("categories")}</h3>
+              <h3 className="text-sm font-medium text-gray-700 dark:text-white">
+                {t("categories")}
+              </h3>
               <ul className="mt-2 space-y-2">
                 {categories.map((category: any) => (
                   <li key={category?.id}>
-                    <label className="inline-flex items-center" htmlFor={`${category.id}`}>
-                      <Checkbox id={`${category.id}`} value={category.id} checked={categoryFilter.includes(String(category.id))} onCheckedChange={(e) => handleCategoryFilter(Boolean(e), category.id)} />
-                      <span className="ml-2 text-gray-700 dark:text-white">{category?.name}</span>
+                    <label
+                      className="inline-flex items-center"
+                      htmlFor={`${category.id}`}
+                    >
+                      <Checkbox
+                        id={`${category.id}`}
+                        value={category.id}
+                        checked={categoryFilter.includes(String(category.id))}
+                        onCheckedChange={(e) =>
+                          handleCategoryFilter(Boolean(e), category.id)
+                        }
+                      />
+                      <span className="ml-2 text-gray-700 dark:text-white">
+                        {category?.name}
+                      </span>
                     </label>
                   </li>
                 ))}
@@ -451,43 +577,93 @@ const FilterPage = () => {
             <div className="border-t border-black my-4 dark:border-white"></div>
             {/* Garis */}
             <div>
-              <h3 className="text-sm font-medium text-gray-700 dark:text-white">Format</h3>
+              <h3 className="text-sm font-medium text-gray-700 dark:text-white">
+                Format
+              </h3>
               <ul className="mt-2 space-y-2">
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="doc" value="doc" checked={formatFilter.includes("doc")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "doc")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">DOC</span>
+                    <Checkbox
+                      id="doc"
+                      value="doc"
+                      checked={formatFilter.includes("doc")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "doc")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      DOC
+                    </span>
                   </label>
                 </li>
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="docx" value="docx" checked={formatFilter.includes("docx")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "docx")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">DOCX</span>
+                    <Checkbox
+                      id="docx"
+                      value="docx"
+                      checked={formatFilter.includes("docx")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "docx")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      DOCX
+                    </span>
                   </label>
                 </li>
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="pdf" value="pdf" checked={formatFilter.includes("pdf")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "pdf")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">PDF</span>
+                    <Checkbox
+                      id="pdf"
+                      value="pdf"
+                      checked={formatFilter.includes("pdf")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "pdf")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      PDF
+                    </span>
                   </label>
                 </li>
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="ppt" value="ppt" checked={formatFilter.includes("ppt")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "ppt")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">PPT</span>
+                    <Checkbox
+                      id="ppt"
+                      value="ppt"
+                      checked={formatFilter.includes("ppt")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "ppt")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      PPT
+                    </span>
                   </label>
                 </li>
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="pptx" value="pptx" checked={formatFilter.includes("pptx")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "pptx")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">PPTX</span>
+                    <Checkbox
+                      id="pptx"
+                      value="pptx"
+                      checked={formatFilter.includes("pptx")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "pptx")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      PPTX
+                    </span>
                   </label>
                 </li>
               </ul>
             </div>
             <div className="border-t border-black dark:border-white my-4"></div>
             <div className="text-center">
-              <a onClick={cleanCheckbox} className="text-[#bb3523] cursor-pointer">
+              <a
+                onClick={cleanCheckbox}
+                className="text-[#bb3523] cursor-pointer"
+              >
                 <b>Reset Filter</b>
               </a>
             </div>
@@ -499,7 +675,11 @@ const FilterPage = () => {
           <div className="flex-1">
             <div className="flex flex-col items-end mb-4">
               <h2 className="text-lg font-semibold">{t("sortBy")}</h2>
-              <select defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"} onChange={(e) => handleSorting(e)} className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500">
+              <select
+                defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"}
+                onChange={(e) => handleSorting(e)}
+                className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500"
+              >
                 <option value="latest">{t("latest")}</option>
                 <option value="popular">{t("mostPopular")}</option>
               </select>
@@ -508,9 +688,19 @@ const FilterPage = () => {
             {documentData?.length > 0 ? (
               <div className=" grid grid-cols-1 md:grid-cols-2 gap-6">
                 {documentData?.map((document: any) => (
-                  <Link href={`${prefixPath}/document/detail/${document?.slug}`} key={document?.id} className="flex flex-col bg-yellow-500 sm:flex-row items-center dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full">
+                  <Link
+                    href={`${prefixPath}/document/detail/${document?.slug}`}
+                    key={document?.id}
+                    className="flex flex-col bg-yellow-500 sm:flex-row items-center dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full"
+                  >
                     <div className="flex items-center justify-center rounded-lg w-16 h-16">
-                      <svg width="28" height="34" viewBox="0 0 28 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+                      <svg
+                        width="28"
+                        height="34"
+                        viewBox="0 0 28 34"
+                        fill="none"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
                         <path
                           d="M5.6665 17.4167C5.6665 17.0851 5.7982 16.7672 6.03262 16.5328C6.26704 16.2984 6.58498 16.1667 6.9165 16.1667C7.24802 16.1667 7.56597 16.2984 7.80039 16.5328C8.03481 16.7672 8.1665 17.0851 8.1665 17.4167C8.1665 17.7482 8.03481 18.0661 7.80039 18.3005C7.56597 18.535 7.24802 18.6667 6.9165 18.6667C6.58498 18.6667 6.26704 18.535 6.03262 18.3005C5.7982 18.0661 5.6665 17.7482 5.6665 17.4167ZM6.9165 21.1667C6.58498 21.1667 6.26704 21.2984 6.03262 21.5328C5.7982 21.7672 5.6665 22.0851 5.6665 22.4167C5.6665 22.7482 5.7982 23.0661 6.03262 23.3005C6.26704 23.535 6.58498 23.6667 6.9165 23.6667C7.24802 23.6667 7.56597 23.535 7.80039 23.3005C8.03481 23.0661 8.1665 22.7482 8.1665 22.4167C8.1665 22.0851 8.03481 21.7672 7.80039 21.5328C7.56597 21.2984 7.24802 21.1667 6.9165 21.1667ZM5.6665 27.4167C5.6665 27.0851 5.7982 26.7672 6.03262 26.5328C6.26704 26.2984 6.58498 26.1667 6.9165 26.1667C7.24802 26.1667 7.56597 26.2984 7.80039 26.5328C8.03481 26.7672 8.1665 27.0851 8.1665 27.4167C8.1665 27.7482 8.03481 28.0661 7.80039 28.3005C7.56597 28.535 7.24802 28.6667 6.9165 28.6667C6.58498 28.6667 6.26704 28.535 6.03262 28.3005C5.7982 28.0661 5.6665 27.7482 5.6665 27.4167ZM11.9165 16.1667C11.585 16.1667 11.267 16.2984 11.0326 16.5328C10.7982 16.7672 10.6665 17.0851 10.6665 17.4167C10.6665 17.7482 10.7982 18.0661 11.0326 18.3005C11.267 18.535 11.585 18.6667 11.9165 18.6667H21.0832C21.4147 18.6667 21.7326 18.535 21.9671 18.3005C22.2015 18.0661 22.3332 17.7482 22.3332 17.4167C22.3332 17.0851 22.2015 16.7672 21.9671 16.5328C21.7326 16.2984 21.4147 16.1667 21.0832 16.1667H11.9165ZM10.6665 22.4167C10.6665 22.0851 10.7982 21.7672 11.0326 21.5328C11.267 21.2984 11.585 21.1667 11.9165 21.1667H21.0832C21.4147 21.1667 21.7326 21.2984 21.9671 21.5328C22.2015 21.7672 22.3332 22.0851 22.3332 22.4167C22.3332 22.7482 22.2015 23.0661 21.9671 23.3005C21.7326 23.535 21.4147 23.6667 21.0832 23.6667H11.9165C11.585 23.6667 11.267 23.535 11.0326 23.3005C10.7982 23.0661 10.6665 22.7482 10.6665 22.4167ZM11.9165 26.1667C11.585 26.1667 11.267 26.2984 11.0326 26.5328C10.7982 26.7672 10.6665 27.0851 10.6665 27.4167C10.6665 27.7482 10.7982 28.0661 11.0326 28.3005C11.267 28.535 11.585 28.6667 11.9165 28.6667H21.0832C21.4147 28.6667 21.7326 28.535 21.9671 28.3005C22.2015 28.0661 22.3332 27.7482 22.3332 27.4167C22.3332 27.0851 22.2015 26.7672 21.9671 26.5328C21.7326 26.2984 21.4147 26.1667 21.0832 26.1667H11.9165ZM26.3565 11.0233L16.6415 1.31C16.6157 1.28605 16.5885 1.26378 16.5598 1.24333C16.5392 1.22742 16.5192 1.21074 16.4998 1.19333C16.3852 1.08512 16.2632 0.984882 16.1348 0.893332C16.0922 0.865802 16.0476 0.841298 16.0015 0.819999L15.9215 0.779999L15.8382 0.731666C15.7482 0.679999 15.6565 0.626665 15.5615 0.586665C15.2296 0.454104 14.8783 0.376423 14.5215 0.356665C14.4885 0.354519 14.4557 0.350625 14.4232 0.344999C14.3779 0.338012 14.3323 0.334114 14.2865 0.333332H3.99984C3.11578 0.333332 2.26794 0.684521 1.64281 1.30964C1.01769 1.93476 0.666504 2.78261 0.666504 3.66667V30.3333C0.666504 31.2174 1.01769 32.0652 1.64281 32.6904C2.26794 33.3155 3.11578 33.6667 3.99984 33.6667H23.9998C24.8839 33.6667 25.7317 33.3155 26.3569 32.6904C26.982 32.0652 27.3332 31.2174 27.3332 30.3333V13.38C27.333 12.496 26.9817 11.6483 26.3565 11.0233ZM24.8332 30.3333C24.8332 30.5543 24.7454 30.7663 24.5891 30.9226C24.4328 31.0789 24.2208 31.1667 23.9998 31.1667H3.99984C3.77882 31.1667 3.56686 31.0789 3.41058 30.9226C3.2543 30.7663 3.1665 30.5543 3.1665 30.3333V3.66667C3.1665 3.44565 3.2543 3.23369 3.41058 3.07741C3.56686 2.92113 3.77882 2.83333 3.99984 2.83333H13.9998V10.3333C13.9998 11.2174 14.351 12.0652 14.9761 12.6904C15.6013 13.3155 16.4491 13.6667 17.3332 13.6667H24.8332V30.3333ZM16.4998 4.70166L22.9632 11.1667H17.3332C17.1122 11.1667 16.9002 11.0789 16.7439 10.9226C16.5876 10.7663 16.4998 10.5543 16.4998 10.3333V4.70166Z"
                           fill="black"
@@ -519,12 +709,24 @@ const FilterPage = () => {
                     </div>
                     <div className="flex flex-col flex-1 gap-2">
                       <div className="text-gray-500 dark:text-gray-400 flex flex-row items-center gap-2 text-xs">
-                        {formatDateToIndonesian(new Date(document?.createdAt))} {document?.timezone ? document?.timezone : "WIB"} | <Icon icon="formkit:eye" width="15" height="15" /> 518
+                        {formatDateToIndonesian(new Date(document?.createdAt))}{" "}
+                        {document?.timezone ? document?.timezone : "WIB"} |{" "}
+                        <Icon icon="formkit:eye" width="15" height="15" /> 518
+                      </div>
+                      <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm">
+                        {document?.title}
                       </div>
-                      <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm">{document?.title}</div>
                       <div className="flex gap-2 items-center text-xs text-red-500 dark:text-red-500">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 512 512">
-                          <path fill="#f00" d="M224 30v256h-64l96 128l96-128h-64V30zM32 434v48h448v-48z" />
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          width="1em"
+                          height="1em"
+                          viewBox="0 0 512 512"
+                        >
+                          <path
+                            fill="#f00"
+                            d="M224 30v256h-64l96 128l96-128h-64V30zM32 434v48h448v-48z"
+                          />
                         </svg>
                         Download Dokumen
                       </div>
@@ -534,11 +736,19 @@ const FilterPage = () => {
               </div>
             ) : (
               <p className="flex items-center justify-center">
-                <img src="/assets/empty-data.png" alt="empty" className="h-60 w-60 my-4" />
+                <img
+                  src="/assets/empty-data.png"
+                  alt="empty"
+                  className="h-60 w-60 my-4"
+                />
               </p>
             )}
 
-            <LandingPagination table={table} totalData={totalData} totalPage={totalPage} />
+            <LandingPagination
+              table={table}
+              totalData={totalData}
+              totalPage={totalPage}
+            />
           </div>
         </Reveal>
       </div>
diff --git a/app/[locale]/(public)/(satker)/satker/[satker_name]/image/filter/page.tsx b/app/[locale]/(public)/(satker)/satker/[satker_name]/image/filter/page.tsx
index 454fb32b..b7f0e3a4 100644
--- a/app/[locale]/(public)/(satker)/satker/[satker_name]/image/filter/page.tsx
+++ b/app/[locale]/(public)/(satker)/satker/[satker_name]/image/filter/page.tsx
@@ -10,6 +10,7 @@ import {
 } from "@/utils/globals";
 import { useParams, usePathname, useSearchParams } from "next/navigation";
 import {
+  getPublicCategoryData,
   getUserLevelListByParent,
   listCategory,
   listData,
@@ -44,7 +45,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -95,9 +96,9 @@ const FilterPage = () => {
   const [handleClose, setHandleClose] = useState(false);
   const [categories, setCategories] = useState([]);
   const [userLevels, setUserLevels] = useState([]);
+  const poldaName = params?.polda_name;
   const satkerName = params?.satker_name;
   let prefixPath = satkerName ? `/satker/${satkerName}` : "/";
-
   const t = useTranslations("FilterPage");
 
   // const [startDate, endDate] = dateRange;
@@ -111,7 +112,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -162,11 +163,32 @@ const FilterPage = () => {
     formatFilter,
   ]);
 
-  async function getCategories() {
-    const category = await listCategory("1");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("1");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+  useEffect(() => {
+    initFetch();
+  }, []);
+  const initFetch = async () => {
+    const response = await getPublicCategoryData(
+      props.group == "mabes"
+        ? ""
+        : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+        ? poldaName
+        : props.group == "satker" &&
+          satkerName &&
+          String(satkerName)?.length > 1
+        ? "satker-" + satkerName
+        : "",
+      "",
+      locale == "en" ? true : false
+    );
+    console.log("category", response);
+    setCategories(response?.data?.data?.content);
+  };
 
   useEffect(() => {
     function initState() {
diff --git a/app/[locale]/(public)/(satker)/satker/[satker_name]/video/filter/page.tsx b/app/[locale]/(public)/(satker)/satker/[satker_name]/video/filter/page.tsx
index 30fdbcd9..ce697cda 100644
--- a/app/[locale]/(public)/(satker)/satker/[satker_name]/video/filter/page.tsx
+++ b/app/[locale]/(public)/(satker)/satker/[satker_name]/video/filter/page.tsx
@@ -3,10 +3,32 @@ import React, { useEffect, useState } from "react";
 import { Card, CardContent } from "@/components/ui/card";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Icon } from "@iconify/react/dist/iconify.js";
-import { formatDateToIndonesian, getOnlyDate, getOnlyMonthAndYear } from "@/utils/globals";
+import {
+  formatDateToIndonesian,
+  getOnlyDate,
+  getOnlyMonthAndYear,
+} from "@/utils/globals";
 import { useParams, usePathname, useSearchParams } from "next/navigation";
-import { getListContent, getUserLevelListByParent, listCategory, listData, listDataRegional } from "@/service/landing/landing";
-import { ColumnDef, ColumnFiltersState, PaginationState, SortingState, VisibilityState, getCoreRowModel, getFilteredRowModel, getPaginationRowModel, getSortedRowModel, useReactTable } from "@tanstack/react-table";
+import {
+  getListContent,
+  getPublicCategoryData,
+  getUserLevelListByParent,
+  listCategory,
+  listData,
+  listDataRegional,
+} from "@/service/landing/landing";
+import {
+  ColumnDef,
+  ColumnFiltersState,
+  PaginationState,
+  SortingState,
+  VisibilityState,
+  getCoreRowModel,
+  getFilteredRowModel,
+  getPaginationRowModel,
+  getSortedRowModel,
+  useReactTable,
+} from "@tanstack/react-table";
 import LandingPagination from "@/components/landing-page/pagination";
 import { Reveal } from "@/components/landing-page/Reveal";
 import { Link, useRouter } from "@/i18n/routing";
@@ -24,7 +46,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -34,8 +56,11 @@ const FilterPage = () => {
   const [totalData, setTotalData] = React.useState<number>(1);
   const [totalPage, setTotalPage] = React.useState<number>(1);
   const [sorting, setSorting] = React.useState<SortingState>([]);
-  const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([]);
-  const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({});
+  const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
+    []
+  );
+  const [columnVisibility, setColumnVisibility] =
+    React.useState<VisibilityState>({});
   const [rowSelection, setRowSelection] = React.useState({});
   const [pagination, setPagination] = React.useState<PaginationState>({
     pageIndex: 0,
@@ -53,7 +78,9 @@ const FilterPage = () => {
   const [categoryFilter, setCategoryFilter] = useState<any>([]);
   const [monthYearFilter, setMonthYearFilter] = useState<any>();
   const [searchTitle, setSearchTitle] = useState<string>("");
-  const [sortByOpt, setSortByOpt] = useState<any>(sortBy === "popular" ? "clickCount" : "createdAt");
+  const [sortByOpt, setSortByOpt] = useState<any>(
+    sortBy === "popular" ? "clickCount" : "createdAt"
+  );
   const isRegional = asPath?.includes("regional");
   const isSatker = asPath?.includes("satker");
   const [formatFilter, setFormatFilter] = useState<any>([]);
@@ -65,6 +92,7 @@ const FilterPage = () => {
   const [handleClose, setHandleClose] = useState(false);
   const [categories, setCategories] = useState([]);
   const [userLevels, setUserLevels] = useState([]);
+  const poldaName = params?.polda_name;
   const satkerName = params?.satker_name;
   let prefixPath = satkerName ? `/satker/${satkerName}` : "/";
   const t = useTranslations("FilterPage");
@@ -80,7 +108,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -92,8 +120,14 @@ const FilterPage = () => {
 
   useEffect(() => {
     if (categorie) {
-      setCategoryFilter(categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]);
-      console.log("Kategori", categorie, categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]);
+      setCategoryFilter(
+        categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
+      );
+      console.log(
+        "Kategori",
+        categorie,
+        categorie?.split("&")?.length > 1 ? categorie?.split("&") : [categorie]
+      );
     }
   }, [categorie]);
 
@@ -111,13 +145,46 @@ const FilterPage = () => {
     }
     console.log(monthYearFilter, "monthFilter");
     initState();
-  }, [change, asPath, monthYearFilter, page, sortBy, sortByOpt, title, startDateString, endDateString, categorie, formatFilter]);
+  }, [
+    change,
+    asPath,
+    monthYearFilter,
+    page,
+    sortBy,
+    sortByOpt,
+    title,
+    startDateString,
+    endDateString,
+    categorie,
+    formatFilter,
+  ]);
 
-  async function getCategories() {
-    const category = await listCategory("2");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("2");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+  useEffect(() => {
+    fetchContent();
+  }, []);
+  const fetchContent = async () => {
+    const response = await getPublicCategoryData(
+      props.group == "mabes"
+        ? ""
+        : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+        ? poldaName
+        : props.group == "satker" &&
+          satkerName &&
+          String(satkerName)?.length > 1
+        ? "satker-" + satkerName
+        : "",
+      "",
+      locale == "en" ? true : false
+    );
+    console.log("category", response);
+    setCategories(response?.data?.data?.content);
+  };
 
   useEffect(() => {
     function initState() {
@@ -133,7 +200,10 @@ const FilterPage = () => {
 
   async function getDataAll() {
     if (satkerName && String(satkerName)?.length > 1) {
-      const filter = categoryFilter?.length > 0 ? categoryFilter?.sort().join(",") : categorie || "";
+      const filter =
+        categoryFilter?.length > 0
+          ? categoryFilter?.sort().join(",")
+          : categorie || "";
 
       const name = title == undefined ? "" : title;
       const format = formatFilter == undefined ? "" : formatFilter?.join(",");
@@ -151,8 +221,12 @@ const FilterPage = () => {
         filterGroup,
         startDateString,
         endDateString,
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "") : "",
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1] : ""
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "")
+          : "",
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1]
+          : ""
       );
       close();
       const data = response?.data?.data;
@@ -162,7 +236,10 @@ const FilterPage = () => {
       setTotalPage(data?.totalPages);
       setTotalContent(response?.data?.data?.totalElements);
     } else {
-      const filter = categoryFilter?.length > 0 ? categoryFilter?.sort().join(",") : categorie || "";
+      const filter =
+        categoryFilter?.length > 0
+          ? categoryFilter?.sort().join(",")
+          : categorie || "";
 
       const name = title == undefined ? "" : title;
       const format = formatFilter == undefined ? "" : formatFilter?.join(",");
@@ -179,8 +256,12 @@ const FilterPage = () => {
         "",
         startDateString,
         endDateString,
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "") : "",
-        monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1] : ""
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "")
+          : "",
+        monthYearFilter
+          ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1]
+          : ""
       );
       close();
       const data = response?.data?.data;
@@ -227,7 +308,10 @@ const FilterPage = () => {
   };
 
   async function getDataRegional() {
-    const filter = categoryFilter?.length > 0 ? categoryFilter?.sort().join(",") : categorie || "";
+    const filter =
+      categoryFilter?.length > 0
+        ? categoryFilter?.sort().join(",")
+        : categorie || "";
 
     const name = title == undefined ? "" : title;
     const format = formatFilter == undefined ? "" : formatFilter?.join(",");
@@ -240,8 +324,12 @@ const FilterPage = () => {
       "",
       startDateString,
       endDateString,
-      monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "") : "",
-      monthYearFilter ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1] : "",
+      monthYearFilter
+        ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[0]?.replace("", "")
+        : "",
+      monthYearFilter
+        ? getOnlyMonthAndYear(monthYearFilter)?.split("/")[1]
+        : "",
       12,
       pages,
       sortByOpt
@@ -389,7 +477,10 @@ const FilterPage = () => {
           <div className="border-t border-black my-4 dark:border-white"></div>
           <div className="space-y-6">
             <div>
-              <label htmlFor="search" className="block text-sm font-medium text-gray-700 dark:text-white">
+              <label
+                htmlFor="search"
+                className="block text-sm font-medium text-gray-700 dark:text-white"
+              >
                 {t("search")}
               </label>
               <Input
@@ -405,7 +496,9 @@ const FilterPage = () => {
             </div>
 
             <div>
-              <label className="block text-sm font-medium text-gray-700 dark:text-white">{t("monthYear")}</label>
+              <label className="block text-sm font-medium text-gray-700 dark:text-white">
+                {t("monthYear")}
+              </label>
               <ReactDatePicker
                 selected={monthYearFilter}
                 className="mt-1 w-full text-xs border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500"
@@ -417,7 +510,9 @@ const FilterPage = () => {
             </div>
 
             <div>
-              <label className="block text-sm font-medium text-gray-700 dark:text-white">{t("date")}</label>
+              <label className="block text-sm font-medium text-gray-700 dark:text-white">
+                {t("date")}
+              </label>
               <div className="flex flex-row justify justify-between gap-2">
                 <ReactDatePicker
                   selectsRange
@@ -430,18 +525,44 @@ const FilterPage = () => {
                   placeholderText={t("selectDate")}
                   onCalendarClose={() => setCalenderState(!calenderState)}
                 />
-                <div className="flex items-center">{handleClose ? <Icon icon="carbon:close-filled" onClick={handleDeleteDate} width="20" inline color="#216ba5" /> : ""}</div>
+                <div className="flex items-center">
+                  {handleClose ? (
+                    <Icon
+                      icon="carbon:close-filled"
+                      onClick={handleDeleteDate}
+                      width="20"
+                      inline
+                      color="#216ba5"
+                    />
+                  ) : (
+                    ""
+                  )}
+                </div>
               </div>
             </div>
 
             <div>
-              <h3 className="text-sm font-medium text-gray-700 dark:text-white">{t("categories")}</h3>
+              <h3 className="text-sm font-medium text-gray-700 dark:text-white">
+                {t("categories")}
+              </h3>
               <ul className="mt-2 space-y-2">
                 {categories.map((category: any) => (
                   <li key={category?.id}>
-                    <label className="inline-flex items-center" htmlFor={`${category.id}`}>
-                      <Checkbox id={`${category.id}`} value={category.id} checked={categoryFilter.includes(String(category.id))} onCheckedChange={(e) => handleCategoryFilter(Boolean(e), category.id)} />
-                      <span className="ml-2 text-gray-700 dark:text-white">{category?.name}</span>
+                    <label
+                      className="inline-flex items-center"
+                      htmlFor={`${category.id}`}
+                    >
+                      <Checkbox
+                        id={`${category.id}`}
+                        value={category.id}
+                        checked={categoryFilter.includes(String(category.id))}
+                        onCheckedChange={(e) =>
+                          handleCategoryFilter(Boolean(e), category.id)
+                        }
+                      />
+                      <span className="ml-2 text-gray-700 dark:text-white">
+                        {category?.name}
+                      </span>
                     </label>
                   </li>
                 ))}
@@ -451,43 +572,93 @@ const FilterPage = () => {
             <div className="border-t border-black my-4 dark:border-white"></div>
             {/* Garis */}
             <div>
-              <h3 className="text-sm font-medium text-gray-700 dark:text-white">Format</h3>
+              <h3 className="text-sm font-medium text-gray-700 dark:text-white">
+                Format
+              </h3>
               <ul className="mt-2 space-y-2">
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="mk4" value="mk4" checked={formatFilter.includes("mk4")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "mk4")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">MK4</span>
+                    <Checkbox
+                      id="mk4"
+                      value="mk4"
+                      checked={formatFilter.includes("mk4")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "mk4")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      MK4
+                    </span>
                   </label>
                 </li>
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="mov" value="mov" checked={formatFilter.includes("mov")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "mov")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">MOV</span>
+                    <Checkbox
+                      id="mov"
+                      value="mov"
+                      checked={formatFilter.includes("mov")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "mov")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      MOV
+                    </span>
                   </label>
                 </li>
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="mp4" value="mp4" checked={formatFilter.includes("mp4")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "mp4")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">MP4</span>
+                    <Checkbox
+                      id="mp4"
+                      value="mp4"
+                      checked={formatFilter.includes("mp4")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "mp4")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      MP4
+                    </span>
                   </label>
                 </li>
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="avi" value="avi" checked={formatFilter.includes("avi")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "avi")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">AVI</span>
+                    <Checkbox
+                      id="avi"
+                      value="avi"
+                      checked={formatFilter.includes("avi")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "avi")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      AVI
+                    </span>
                   </label>
                 </li>
                 <li>
                   <label className="inline-flex items-center">
-                    <Checkbox id="wmv" value="wmv" checked={formatFilter.includes("wmv")} onCheckedChange={(e) => handleFormatFilter(Boolean(e), "wmv")} />
-                    <span className="ml-2 text-gray-700 dark:text-white">WMV</span>
+                    <Checkbox
+                      id="wmv"
+                      value="wmv"
+                      checked={formatFilter.includes("wmv")}
+                      onCheckedChange={(e) =>
+                        handleFormatFilter(Boolean(e), "wmv")
+                      }
+                    />
+                    <span className="ml-2 text-gray-700 dark:text-white">
+                      WMV
+                    </span>
                   </label>
                 </li>
               </ul>
             </div>
             <div className="border-t border-black dark:border-white my-4"></div>
             <div className="text-center">
-              <a onClick={cleanCheckbox} className="text-[#bb3523] cursor-pointer">
+              <a
+                onClick={cleanCheckbox}
+                className="text-[#bb3523] cursor-pointer"
+              >
                 <b>Reset Filter</b>
               </a>
             </div>
@@ -499,7 +670,11 @@ const FilterPage = () => {
           <div className="flex-1">
             <div className="flex flex-col items-end mb-4">
               <h2 className="text-lg font-semibold">{t("sortBy")}</h2>
-              <select defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"} onChange={(e) => handleSorting(e)} className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500">
+              <select
+                defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"}
+                onChange={(e) => handleSorting(e)}
+                className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500"
+              >
                 <option value="latest">{t("latest")}</option>
                 <option value="popular">{t("mostPopular")}</option>
               </select>
@@ -508,21 +683,36 @@ const FilterPage = () => {
             {videoData?.length > 0 ? (
               <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
                 {videoData?.map((video: any) => (
-                  <Card key={video?.id} className="hover:scale-110 transition-transform duration-300">
+                  <Card
+                    key={video?.id}
+                    className="hover:scale-110 transition-transform duration-300"
+                  >
                     <CardContent className="flex flex-col text-xs lg:text-sm w-full p-0">
                       <Link href={`${prefixPath}/video/detail/${video?.slug}`}>
-                        <img src={video?.thumbnailLink} className="h-60 object-cover items-center justify-center cursor-pointer rounded-lg place-self-center" />
+                        <img
+                          src={video?.thumbnailLink}
+                          className="h-60 object-cover items-center justify-center cursor-pointer rounded-lg place-self-center"
+                        />
                         <div className="flex flex-row items-center gap-2 text-[10px] mx-2">
-                          {formatDateToIndonesian(new Date(video?.createdAt))} {video?.timezone ? video?.timezone : "WIB"}| <Icon icon="formkit:eye" width="15" height="15" />
+                          {formatDateToIndonesian(new Date(video?.createdAt))}{" "}
+                          {video?.timezone ? video?.timezone : "WIB"}|{" "}
+                          <Icon icon="formkit:eye" width="15" height="15" />
                           {video?.clickCount}{" "}
-                          <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 20 20">
+                          <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            width="1em"
+                            height="1em"
+                            viewBox="0 0 20 20"
+                          >
                             <path
                               fill="#f00"
                               d="M7.707 10.293a1 1 0 1 0-1.414 1.414l3 3a1 1 0 0 0 1.414 0l3-3a1 1 0 0 0-1.414-1.414L11 11.586V6h5a2 2 0 0 1 2 2v7a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h5v5.586zM9 4a1 1 0 0 1 2 0v2H9z"
                             />
                           </svg>{" "}
                         </div>
-                        <div className="font-semibold pr-3 pb-3 mx-2 hover:h-auto truncate hover:whitespace-normal hover:overflow-visible w-full">{video?.title}</div>
+                        <div className="font-semibold pr-3 pb-3 mx-2 hover:h-auto truncate hover:whitespace-normal hover:overflow-visible w-full">
+                          {video?.title}
+                        </div>
                       </Link>
                     </CardContent>
                   </Card>
@@ -530,11 +720,19 @@ const FilterPage = () => {
               </div>
             ) : (
               <p className="flex items-center justify-center">
-                <img src="/assets/empty-data.png" alt="empty" className="h-60 w-60 my-4" />
+                <img
+                  src="/assets/empty-data.png"
+                  alt="empty"
+                  className="h-60 w-60 my-4"
+                />
               </p>
             )}
 
-            <LandingPagination table={table} totalData={totalData} totalPage={totalPage} />
+            <LandingPagination
+              table={table}
+              totalData={totalData}
+              totalPage={totalPage}
+            />
           </div>
         </Reveal>
       </div>
diff --git a/app/[locale]/(public)/audio/filter/page.tsx b/app/[locale]/(public)/audio/filter/page.tsx
index 6d637afc..8b1f1388 100644
--- a/app/[locale]/(public)/audio/filter/page.tsx
+++ b/app/[locale]/(public)/audio/filter/page.tsx
@@ -10,6 +10,7 @@ import {
 } from "@/utils/globals";
 import { useParams, usePathname, useSearchParams } from "next/navigation";
 import {
+  getPublicCategoryData,
   getUserLevelListByParent,
   listCategory,
   listData,
@@ -45,7 +46,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -96,6 +97,8 @@ const FilterPage = () => {
   const [userLevels, setUserLevels] = useState([]);
   const t = useTranslations("FilterPage");
   const [isLoading, setIsLoading] = useState<any>(true);
+  const poldaName = params?.polda_name;
+  const satkerName = params?.satker_name;
 
   // const [startDate, endDate] = dateRange;
 
@@ -116,7 +119,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -167,11 +170,32 @@ const FilterPage = () => {
     formatFilter,
   ]);
 
-  async function getCategories() {
-    const category = await listCategory("4");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("4");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+  useEffect(() => {
+    initFetch();
+  }, []);
+  const initFetch = async () => {
+    const response = await getPublicCategoryData(
+      props.group == "mabes"
+        ? ""
+        : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+        ? poldaName
+        : props.group == "satker" &&
+          satkerName &&
+          String(satkerName)?.length > 1
+        ? "satker-" + satkerName
+        : "",
+      "",
+      locale == "en" ? true : false
+    );
+    console.log("category", response);
+    setCategories(response?.data?.data?.content);
+  };
 
   useEffect(() => {
     function initState() {
diff --git a/app/[locale]/(public)/document/filter/page.tsx b/app/[locale]/(public)/document/filter/page.tsx
index 50dcc25c..4a0d71e3 100644
--- a/app/[locale]/(public)/document/filter/page.tsx
+++ b/app/[locale]/(public)/document/filter/page.tsx
@@ -11,6 +11,7 @@ import {
 import { useParams, usePathname, useSearchParams } from "next/navigation";
 import {
   getListContent,
+  getPublicCategoryData,
   getUserLevelListByParent,
   listCategory,
   listData,
@@ -46,7 +47,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -96,6 +97,8 @@ const FilterPage = () => {
   const [categories, setCategories] = useState([]);
   const [userLevels, setUserLevels] = useState([]);
   const [isLoading, setIsLoading] = useState<any>(true);
+  const poldaName = params?.polda_name;
+  const satkerName = params?.satker_name;
 
   // const [startDate, endDate] = dateRange;
 
@@ -116,7 +119,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -167,11 +170,32 @@ const FilterPage = () => {
     formatFilter,
   ]);
 
-  async function getCategories() {
-    const category = await listCategory("3");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("3");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+  useEffect(() => {
+    initFetch();
+  }, []);
+  const initFetch = async () => {
+    const response = await getPublicCategoryData(
+      props.group == "mabes"
+        ? ""
+        : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+        ? poldaName
+        : props.group == "satker" &&
+          satkerName &&
+          String(satkerName)?.length > 1
+        ? "satker-" + satkerName
+        : "",
+      "",
+      locale == "en" ? true : false
+    );
+    console.log("category", response);
+    setCategories(response?.data?.data?.content);
+  };
 
   useEffect(() => {
     function initState() {
diff --git a/app/[locale]/(public)/image/filter/page.tsx b/app/[locale]/(public)/image/filter/page.tsx
index 5624c1bb..803e2a31 100644
--- a/app/[locale]/(public)/image/filter/page.tsx
+++ b/app/[locale]/(public)/image/filter/page.tsx
@@ -10,6 +10,7 @@ import {
 } from "@/utils/globals";
 import { useParams, usePathname, useSearchParams } from "next/navigation";
 import {
+  getPublicCategoryData,
   getUserLevelListByParent,
   listCategory,
   listData,
@@ -47,7 +48,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -99,6 +100,8 @@ const FilterPage = () => {
   const [userLevels, setUserLevels] = useState([]);
   const t = useTranslations("FilterPage");
   const [isFilterOpen, setIsFilterOpen] = useState(true);
+  const poldaName = params?.polda_name;
+  const satkerName = params?.satker_name;
 
   // const [startDate, endDate] = dateRange;
 
@@ -119,7 +122,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -170,11 +173,25 @@ const FilterPage = () => {
     formatFilter,
   ]);
 
-  async function getCategories() {
-    const category = await listCategory("1");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("1");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+   useEffect(() => {
+      initFetch();
+    }, []);
+    const initFetch = async () => {
+      const response = await getPublicCategoryData(
+        props.group == "mabes" ? "" : props.group == "polda" && poldaName && String(poldaName)?.length > 1 ? poldaName : props.group == "satker" && satkerName && String(satkerName)?.length > 1 ? "satker-" + satkerName : "",
+        "",
+        locale == "en" ? true : false
+      );
+      console.log("category", response);
+      setCategories(response?.data?.data?.content);
+    };
+  
 
   useEffect(() => {
     function initState() {
diff --git a/app/[locale]/(public)/video/filter/page.tsx b/app/[locale]/(public)/video/filter/page.tsx
index 752885ca..6197aedd 100644
--- a/app/[locale]/(public)/video/filter/page.tsx
+++ b/app/[locale]/(public)/video/filter/page.tsx
@@ -11,6 +11,7 @@ import {
 import { useParams, usePathname, useSearchParams } from "next/navigation";
 import {
   getListContent,
+  getPublicCategoryData,
   getUserLevelListByParent,
   listCategory,
   listData,
@@ -48,7 +49,7 @@ const columns: ColumnDef<any>[] = [
   },
 ];
 
-const FilterPage = () => {
+const FilterPage = (props: { group?: string; type: string }) => {
   const router = useRouter();
   const asPath = usePathname();
   const params = useParams();
@@ -83,6 +84,8 @@ const FilterPage = () => {
   const [sortByOpt, setSortByOpt] = useState<any>(
     sortBy === "popular" ? "clickCount" : "createdAt"
   );
+  const poldaName = params?.polda_name;
+  const satkerName = params?.satker_name;
   const isRegional = asPath?.includes("regional");
   const isSatker = asPath?.includes("satker");
   const [formatFilter, setFormatFilter] = useState<any>([]);
@@ -116,7 +119,7 @@ const FilterPage = () => {
 
   useEffect(() => {
     async function initState() {
-      getCategories();
+      // getCategories();
       // getSelectedCategory();
       if (isSatker) {
         getUserLevels();
@@ -162,11 +165,32 @@ const FilterPage = () => {
     formatFilter,
   ]);
 
-  async function getCategories() {
-    const category = await listCategory("2");
-    const resCategory = category?.data?.data?.content;
-    setCategories(resCategory);
-  }
+  // async function getCategories() {
+  //   const category = await listCategory("2");
+  //   const resCategory = category?.data?.data?.content;
+  //   setCategories(resCategory);
+  // }
+
+  useEffect(() => {
+    initFetch();
+  }, []);
+  const initFetch = async () => {
+    const response = await getPublicCategoryData(
+      props.group == "mabes"
+        ? ""
+        : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+        ? poldaName
+        : props.group == "satker" &&
+          satkerName &&
+          String(satkerName)?.length > 1
+        ? "satker-" + satkerName
+        : "",
+      "",
+      locale == "en" ? true : false
+    );
+    console.log("category", response);
+    setCategories(response?.data?.data?.content);
+  };
 
   useEffect(() => {
     function initState() {
diff --git a/components/form/content/video-update-form.tsx b/components/form/content/video-update-form.tsx
index c081082b..959c6aae 100644
--- a/components/form/content/video-update-form.tsx
+++ b/components/form/content/video-update-form.tsx
@@ -345,8 +345,66 @@ export default function FormVideoUpdate() {
     }
   };
 
+  // const save = async (data: VideoSchema) => {
+  //   loading();
+  //   const finalTags = tags.join(", ");
+  //   const requestData = {
+  //     ...data,
+  //     id: detail?.id,
+  //     title: data.title,
+  //     description: data.description,
+  //     htmlDescription: data.description,
+  //     fileTypeId,
+  //     categoryId: selectedTarget,
+  //     subCategoryId: selectedTarget,
+  //     uploadedBy: "2b7c8d83-d298-4b19-9f74-b07924506b58",
+  //     statusId: "1",
+  //     publishedFor: publishedFor.join(","),
+  //     creatorName: data.creatorName,
+  //     tags: finalTags,
+  //     isYoutube: false,
+  //     isInternationalMedia: false,
+  //   };
+
+  //   const response = await createMedia(requestData);
+  //   console.log("Form Data Submitted:", requestData);
+
+  //   const formMedia = new FormData();
+  //   const thumbnail = files[0];
+  //   formMedia.append("file", thumbnail);
+  //   const responseThumbnail = await uploadThumbnail(id, formMedia);
+  //   if (responseThumbnail?.error == true) {
+  //     error(responseThumbnail?.message);
+  //     return false;
+  //   }
+
+  //   const progressInfoArr = [];
+  //   for (const item of files) {
+  //     progressInfoArr.push({ percentage: 0, fileName: item.name });
+  //   }
+  //   progressInfo = progressInfoArr;
+  //   setIsStartUpload(true);
+  //   setProgressList(progressInfoArr);
+
+  //   close();
+  //   // showProgress();
+  //   files.map(async (item: any, index: number) => {
+  //     await uploadResumableFile(index, String(id), item, "0");
+  //   });
+
+  //   // MySwal.fire({
+  //   //   title: "Sukses",
+  //   //   text: "Data berhasil disimpan.",
+  //   //   icon: "success",
+  //   //   confirmButtonColor: "#3085d6",
+  //   //   confirmButtonText: "OK",
+  //   // }).then(() => {
+  //   //   router.push("/en/contributor/content/video");
+  //   // });
+  // };
   const save = async (data: VideoSchema) => {
     loading();
+
     const finalTags = tags.join(", ");
     const requestData = {
       ...data,
@@ -367,40 +425,43 @@ export default function FormVideoUpdate() {
     };
 
     const response = await createMedia(requestData);
-    console.log("Form Data Submitted:", requestData);
+    console.log("Form Data Submitted (Metadata):", requestData);
 
-    const formMedia = new FormData();
-    const thumbnail = files[0];
-    formMedia.append("file", thumbnail);
-    const responseThumbnail = await uploadThumbnail(id, formMedia);
-    if (responseThumbnail?.error == true) {
-      error(responseThumbnail?.message);
+    if (response?.error) {
+      error(response?.message);
       return false;
     }
 
-    const progressInfoArr = [];
-    for (const item of files) {
-      progressInfoArr.push({ percentage: 0, fileName: item.name });
+    if (selectedFiles.length > 0) {
+      const thumbnail = selectedFiles[0];
+      const formMedia = new FormData();
+      formMedia.append("file", thumbnail);
+      const responseThumbnail = await uploadThumbnail(id, formMedia);
+      if (responseThumbnail?.error) {
+        // Perbaiki pengecekan error
+        error(responseThumbnail?.message);
+        return false;
+      }
+      console.log("Thumbnail uploaded:", responseThumbnail);
     }
-    progressInfo = progressInfoArr;
-    setIsStartUpload(true);
-    setProgressList(progressInfoArr);
 
-    close();
-    // showProgress();
-    files.map(async (item: any, index: number) => {
-      await uploadResumableFile(index, String(id), item, "0");
-    });
+    const newVideoFilesToUpload = files.filter((file) => file instanceof File);
 
-    // MySwal.fire({
-    //   title: "Sukses",
-    //   text: "Data berhasil disimpan.",
-    //   icon: "success",
-    //   confirmButtonColor: "#3085d6",
-    //   confirmButtonText: "OK",
-    // }).then(() => {
-    //   router.push("/en/contributor/content/video");
-    // });
+    if (newVideoFilesToUpload.length > 0) {
+      const progressInfoArr = newVideoFilesToUpload.map((item) => ({
+        percentage: 0,
+        fileName: item.name,
+      }));
+      progressInfo = progressInfoArr;
+      setIsStartUpload(true);
+      setProgressList(progressInfoArr);
+
+      newVideoFilesToUpload.map(async (item: File, index: number) => {
+        await uploadResumableFile(index, String(id), item, "0");
+      });
+    } else {
+      successSubmit("/in/contributor/content/video");
+    }
   };
 
   const onSubmit = (data: VideoSchema) => {
diff --git a/components/landing-page/hero-new-polda.tsx b/components/landing-page/hero-new-polda.tsx
index fbb2f664..55df4024 100644
--- a/components/landing-page/hero-new-polda.tsx
+++ b/components/landing-page/hero-new-polda.tsx
@@ -2,21 +2,19 @@ import { formatDateToIndonesian, shimmer, toBase64 } from "@/utils/globals";
 import React, { useEffect, useRef, useState } from "react";
 import "swiper/css/bundle";
 import "swiper/css/navigation";
-import { getHeroData, listStaticBanner } from "@/service/landing/landing";
+import { getHeroData, getListContent, listStaticBanner } from "@/service/landing/landing";
 import Link from "next/link";
 import { useParams, usePathname, useRouter } from "next/navigation";
-import { Carousel, CarouselContent, CarouselItem, CarouselNext, CarouselPrevious } from "@/components/ui/carousel";
+import {
+  Carousel,
+  CarouselContent,
+  CarouselItem,
+  CarouselNext,
+  CarouselPrevious,
+} from "@/components/ui/carousel";
 import { Skeleton } from "../ui/skeleton";
 import Image from "next/image";
 import Cookies from "js-cookie";
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs";
-import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "../ui/card";
-import { Label } from "../ui/label";
-import { Input } from "../ui/input";
-import { Button } from "../ui/button";
-import { Textarea } from "../ui/textarea";
-import { Checkbox } from "../ui/checkbox";
-import { Dialog, DialogClose, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "../ui/dialog";
 import { Autoplay, Navigation, Pagination } from "swiper/modules";
 import { Swiper, SwiperClass, SwiperSlide } from "swiper/react";
 import "swiper/css";
@@ -31,7 +29,12 @@ type HeroModalProps = {
   satkerName?: string;
 };
 
-const HeroModal = ({ onClose, group, poldaName, satkerName }: HeroModalProps) => {
+const HeroModal = ({
+  onClose,
+  group,
+  poldaName,
+  satkerName,
+}: HeroModalProps) => {
   const [heroData, setHeroData] = useState<any>();
   const params = useParams();
   const locale = params?.locale;
@@ -93,17 +96,32 @@ const HeroModal = ({ onClose, group, poldaName, satkerName }: HeroModalProps) =>
       <div className="relative dark:bg-gray-900 rounded-lg  w-[90%] md:w-[600px] p-4 shadow-none">
         {heroData?.length > 0 && (
           <>
-            <button className="absolute left-3 top-1/2 z-10 -translate-y-1/2 text-white text-3xl" onClick={() => swiperRef.current?.slidePrev()}>
+            <button
+              className="absolute left-3 top-1/2 z-10 -translate-y-1/2 text-white text-3xl"
+              onClick={() => swiperRef.current?.slidePrev()}
+            >
               <ChevronLeft />
             </button>
-            <button className="absolute right-3 top-1/2 z-10 -translate-y-1/2 text-white text-3xl" onClick={() => swiperRef.current?.slideNext()}>
+            <button
+              className="absolute right-3 top-1/2 z-10 -translate-y-1/2 text-white text-3xl"
+              onClick={() => swiperRef.current?.slideNext()}
+            >
               <ChevronRight />
             </button>
           </>
         )}
-        <Swiper pagination={{ dynamicBullets: true }} modules={[Pagination, Autoplay]} onSwiper={(swiper) => (swiperRef.current = swiper)} autoplay={{ delay: 3000 }} className="mySwiper w-full">
+        <Swiper
+          pagination={{ dynamicBullets: true }}
+          modules={[Pagination, Autoplay]}
+          onSwiper={(swiper) => (swiperRef.current = swiper)}
+          autoplay={{ delay: 3000 }}
+          className="mySwiper w-full"
+        >
           <div className="relative h-[310px] lg:h-[420px]">
-            <button onClick={onClose} className="absolute top-3 right-3 text-gray-700 dark:text-gray-300 hover:text-black dark:hover:text-white border border-white bg-white rounded-full h-8 w-8 z-10">
+            <button
+              onClick={onClose}
+              className="absolute top-3 right-3 text-gray-700 dark:text-gray-300 hover:text-black dark:hover:text-white border border-white bg-white rounded-full h-8 w-8 z-10"
+            >
               ✕
             </button>
 
@@ -111,19 +129,37 @@ const HeroModal = ({ onClose, group, poldaName, satkerName }: HeroModalProps) =>
               heroData.map((list: any, index: number) => (
                 <SwiperSlide key={list?.id}>
                   <div className="relative h-[310px] lg:h-[420px]">
-                    <Image src={list?.thumbnailLink} alt="gambar-utama" width={1920} height={1080} placeholder={`data:image/svg+xml;base64,${toBase64(shimmer(700, 475))}`} className="w-full h-[310px] lg:h-[420px] rounded-lg object-cover" />
+                    <Image
+                      src={list?.thumbnailLink}
+                      alt="gambar-utama"
+                      width={1920}
+                      height={1080}
+                      placeholder={`data:image/svg+xml;base64,${toBase64(
+                        shimmer(700, 475)
+                      )}`}
+                      className="w-full h-[310px] lg:h-[420px] rounded-lg object-cover"
+                    />
 
                     <div className="absolute bottom-0 left-0 right-0 bg-black/30 backdrop-brightness-50 text-white pb-4 px-4 pt-8 rounded-bl-2xl rounded-tr-2xl mx-3 mb-2">
                       <div className="absolute top-0 left-0 bottom-0 w-2 bg-[#bb3523] rounded-bl-lg"></div>
-                      <span className="absolute top-0 left-0 mt-2 mb-3 mx-3 bg-[#bb3523] text-white text-xs font-semibold uppercase px-2 py-1 rounded">{list?.categoryName || "Liputan Kegiatan"}</span>
+                      <span className="absolute top-0 left-0 mt-2 mb-3 mx-3 bg-[#bb3523] text-white text-xs font-semibold uppercase px-2 py-1 rounded">
+                        {list?.categoryName || "Liputan Kegiatan"}
+                      </span>
 
                       <Link href={`${locale}/image/detail/${list?.slug}`}>
                         <h2 className="text-lg leading-tight">{list?.title}</h2>
                       </Link>
 
                       <p className="text-xs flex items-center gap-1 mt-2 opacity-80">
-                        {formatDateToIndonesian(new Date(list?.createdAt))} {list?.timezone || "WIB"} |{" "}
-                        <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" className="inline-block">
+                        {formatDateToIndonesian(new Date(list?.createdAt))}{" "}
+                        {list?.timezone || "WIB"} |{" "}
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          width="1em"
+                          height="1em"
+                          viewBox="0 0 24 24"
+                          className="inline-block"
+                        >
                           <path
                             fill="currentColor"
                             d="M11.5 18c4 0 7.46-2.22 9.24-5.5C18.96 9.22 15.5 7 11.5 7s-7.46 2.22-9.24 5.5C4.04 15.78 7.5 18 11.5 18m0-12c4.56 0 8.5 2.65 10.36 6.5C20 16.35 16.06 19 11.5 19S3 16.35 1.14 12.5C3 8.65 6.94 6 11.5 6m0 2C14 8 16 10 16 12.5S14 17 11.5 17S7 15 7 12.5S9 8 11.5 8m0 1A3.5 3.5 0 0 0 8 12.5a3.5 3.5 0 0 0 3.5 3.5a3.5 3.5 0 0 0 3.5-3.5A3.5 3.5 0 0 0 11.5 9"
@@ -137,7 +173,13 @@ const HeroModal = ({ onClose, group, poldaName, satkerName }: HeroModalProps) =>
               ))
             ) : (
               <div className="flex items-center justify-center h-full">
-                <Image width={1920} height={1080} src="/assets/empty-data.png" alt="empty" className="h-52 w-52 my-4" />
+                <Image
+                  width={1920}
+                  height={1080}
+                  src="/assets/empty-data.png"
+                  alt="empty"
+                  className="h-52 w-52 my-4"
+                />
               </div>
             )}
           </div>
@@ -173,6 +215,8 @@ const HeroNewPolda = (props: { group?: string }) => {
   const [showFormModal, setShowFormModal] = useState(false);
   const poldaName = params?.polda_name;
   const satkerName = params?.satker_name;
+  const [newContent, setNewContent] = useState<any>();
+  const [selectedTab, setSelectedTab] = useState("image");
 
   useEffect(() => {
     const timer = setTimeout(() => {
@@ -250,7 +294,12 @@ const HeroNewPolda = (props: { group?: string }) => {
     let data = response?.data?.data?.content;
     setHeroData(data);
 
-    if (data && props.group === "polda" && poldaName && String(poldaName)?.length > 1) {
+    if (
+      data &&
+      props.group === "polda" &&
+      poldaName &&
+      String(poldaName)?.length > 1
+    ) {
       const resStatic = await listStaticBanner(poldaName, locale == "en");
 
       for (let i = 0; i < resStatic?.data?.data?.length; i++) {
@@ -264,6 +313,43 @@ const HeroNewPolda = (props: { group?: string }) => {
     }
   };
 
+  useEffect(() => {
+    fecthNewContent();
+  }, [selectedTab]);
+  const fecthNewContent = async () => {
+    console.log("Satker Name : ", satkerName);
+    const request = {
+      title: "",
+      page: 0,
+      size: 5,
+      sortBy: "createdAt",
+      contentTypeId:
+        selectedTab == "image"
+          ? "1"
+          : selectedTab == "video"
+          ? "2"
+          : selectedTab == "text"
+          ? "3"
+          : selectedTab == "audio"
+          ? "4"
+          : "",
+      group:
+        props.group == "mabes"
+          ? ""
+          : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+          ? poldaName
+          : props.group == "satker" &&
+            satkerName &&
+            String(satkerName)?.length > 1
+          ? "satker-" + satkerName
+          : "",
+      isInt: locale == "en" ? true : false,
+    };
+    const response = await getListContent(request);
+    console.log("category", response);
+    setNewContent(response?.data?.data?.content);
+  };
+
   const shimmer = (w: number, h: number) => `
 <svg width="${w}" height="${h}" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <defs>
@@ -278,11 +364,18 @@ const HeroNewPolda = (props: { group?: string }) => {
   <animate xlink:href="#r" attributeName="x" from="-${w}" to="${w}" dur="1s" repeatCount="indefinite"  />
 </svg>`;
 
-  const toBase64 = (str: string) => (typeof window === "undefined" ? Buffer.from(str).toString("base64") : window.btoa(str));
+  const toBase64 = (str: string) =>
+    typeof window === "undefined"
+      ? Buffer.from(str).toString("base64")
+      : window.btoa(str);
 
   return (
     <div className="flex items-start justify-center mx-auto w-auto">
-      <div className="relative">{showModal && <HeroModal onClose={() => setShowModal(false)} group="polda" />}</div>
+      <div className="relative">
+        {showModal && (
+          <HeroModal onClose={() => setShowModal(false)} group="polda" />
+        )}
+      </div>
       {isLoading ? (
         <div className="flex flex-col space-y-3 mx-auto w-full lg:w-2/3">
           <Skeleton className="h-[310px] lg:h-[420px]" />
@@ -298,7 +391,16 @@ const HeroNewPolda = (props: { group?: string }) => {
               {content?.map((list: any) => (
                 <CarouselItem key={list?.id}>
                   <div className="relative h-[310px] lg:h-[700px] mt-1">
-                    <Image src={list?.thumbnailLink} alt="gambar-utama" width={1920} height={1080} placeholder={`data:image/svg+xml;base64,${toBase64(shimmer(700, 475))}`} className="w-full h-[320px] lg:h-[700px] object-cover" />
+                    <Image
+                      src={list?.thumbnailLink}
+                      alt="gambar-utama"
+                      width={1920}
+                      height={1080}
+                      placeholder={`data:image/svg+xml;base64,${toBase64(
+                        shimmer(700, 475)
+                      )}`}
+                      className="w-full h-[320px] lg:h-[700px] object-cover"
+                    />
                     <div className="absolute inset-0 bg-black bg-opacity-40" />
 
                     <Link
@@ -313,10 +415,15 @@ const HeroNewPolda = (props: { group?: string }) => {
                       }
                     >
                       <div className="absolute bottom-20 left-32 w-[60%] lg:w-[45%] text-white px-4 pt-10 pb-4">
-                        <span className="absolute top-0 left-3 text-red-600 text-lg font-bold uppercase px-1 py-2 rounded">{list?.categoryName || "Liputan Kegiatan"}</span>
-                        <h2 className="text-xl font-bold leading-tight">{list?.title}</h2>
+                        <span className="absolute top-0 left-3 text-red-600 text-lg font-bold uppercase px-1 py-2 rounded">
+                          {list?.categoryName || "Liputan Kegiatan"}
+                        </span>
+                        <h2 className="text-xl font-bold leading-tight">
+                          {list?.title}
+                        </h2>
                         <p className="text-base flex items-center gap-1 mt-2 opacity-80">
-                          {formatDateToIndonesian(new Date(list?.createdAt))} {list?.timezone || "WIB"} | 👁 {list?.clickCount}
+                          {formatDateToIndonesian(new Date(list?.createdAt))}{" "}
+                          {list?.timezone || "WIB"} | 👁 {list?.clickCount}
                         </p>
                       </div>
                     </Link>
@@ -327,10 +434,19 @@ const HeroNewPolda = (props: { group?: string }) => {
           </Carousel>
 
           <div className="hidden lg:flex flex-col gap-3 absolute bottom-4 right-4 w-[520px] bg-black/40 p-4 rounded-lg z-10">
-            {heroData?.slice(0, 3).map((item: any) => (
+            {newContent?.slice(0, 3).map((item: any) => (
               <li key={item?.id} className="flex gap-4 flex-row lg:w-full mx-2">
                 <div className="flex-shrink-0 w-32 rounded-lg">
-                  <Image placeholder={`data:image/svg+xml;base64,${toBase64(shimmer(700, 475))}`} width={720} height={480} src={item?.thumbnailLink} alt={item?.title} className="w-full h-[100px] object-cover rounded-lg" />
+                  <Image
+                    placeholder={`data:image/svg+xml;base64,${toBase64(
+                      shimmer(700, 475)
+                    )}`}
+                    width={720}
+                    height={480}
+                    src={item?.thumbnailLink}
+                    alt={item?.title}
+                    className="w-full h-[100px] object-cover rounded-lg"
+                  />
                 </div>
                 <div className="w-[280px] lg:w-[200px]">
                   <Link
@@ -344,11 +460,21 @@ const HeroNewPolda = (props: { group?: string }) => {
                         : `${locale}/audio/detail/${item?.slug}`
                     }
                   >
-                    <span className="py-1 rounded-lg flex text-red-600 font-bold uppercase w-fit">{item?.categoryName}</span>
-                    <h3 className="text-base text-white font-bold h-6 hover:h-auto truncate hover:whitespace-normal hover:overflow-visible">{item?.title}</h3>
+                    <span className="py-1 rounded-lg flex text-red-600 font-bold uppercase w-fit">
+                      {item?.categoryName}
+                    </span>
+                    <h3 className="text-base text-white font-bold h-6 hover:h-auto truncate hover:whitespace-normal hover:overflow-visible">
+                      {item?.title}
+                    </h3>
                     <p className="text-[10px] flex flex-row items-center gap-1 text-white mt-1">
-                      {formatDateToIndonesian(new Date(item?.createdAt))} {item?.timezone || "WIB"} |{" "}
-                      <svg xmlns="http://www.w3.org/2000/svg" width="1.2em" height="1.2em" viewBox="0 0 24 24">
+                      {formatDateToIndonesian(new Date(item?.createdAt))}{" "}
+                      {item?.timezone || "WIB"} |{" "}
+                      <svg
+                        xmlns="http://www.w3.org/2000/svg"
+                        width="1.2em"
+                        height="1.2em"
+                        viewBox="0 0 24 24"
+                      >
                         <path
                           fill="currentColor"
                           d="M11.5 18c4 0 7.46-2.22 9.24-5.5C18.96 9.22 15.5 7 11.5 7s-7.46 2.22-9.24 5.5C4.04 15.78 7.5 18 11.5 18m0-12c4.56 0 8.5 2.65 10.36 6.5C20 16.35 16.06 19 11.5 19S3 16.35 1.14 12.5C3 8.65 6.94 6 11.5 6m0 2C14 8 16 10 16 12.5S14 17 11.5 17S7 15 7 12.5S9 8 11.5 8m0 1A3.5 3.5 0 0 0 8 12.5a3.5 3.5 0 0 0 3.5 3.5a3.5 3.5 0 0 0 3.5-3.5A3.5 3.5 0 0 0 11.5 9"
diff --git a/components/landing-page/hero-new.tsx b/components/landing-page/hero-new.tsx
index 0b3e6dcf..88ae2bdd 100644
--- a/components/landing-page/hero-new.tsx
+++ b/components/landing-page/hero-new.tsx
@@ -4,6 +4,7 @@ import "swiper/css/bundle";
 import "swiper/css/navigation";
 import {
   getHeroData,
+  getListContent,
   listPopUp,
   listStaticBanner,
 } from "@/service/landing/landing";
@@ -222,6 +223,46 @@ const HeroNew = (props: { group?: string }) => {
   const [showFormModal, setShowFormModal] = useState(false);
   const poldaName = params?.polda_name;
   const satkerName = params?.satker_name;
+  const [newContent, setNewContent] = useState<any>();
+  const [selectedTab, setSelectedTab] = useState("image");
+
+  useEffect(() => {
+    fecthNewContent();
+  }, [selectedTab]);
+  const fecthNewContent = async () => {
+    console.log("Satker Name : ", satkerName);
+    const request = {
+      title: "",
+      page: 0,
+      size: 5,
+      sortBy: "createdAt",
+      contentTypeId:
+        selectedTab == "image"
+          ? "1"
+          : selectedTab == "video"
+          ? "2"
+          : selectedTab == "text"
+          ? "3"
+          : selectedTab == "audio"
+          ? "4"
+          : "",
+      group:
+        props.group == "mabes"
+          ? ""
+          : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+          ? poldaName
+          : props.group == "satker" &&
+            satkerName &&
+            String(satkerName)?.length > 1
+          ? "satker-" + satkerName
+          : "",
+      isInt: locale == "en" ? true : false,
+    };
+    const response = await getListContent(request);
+    console.log("category", response);
+    setNewContent(response?.data?.data?.content);
+  };
+
 
   useEffect(() => {
     const timer = setTimeout(() => {
@@ -399,7 +440,7 @@ const HeroNew = (props: { group?: string }) => {
           </Carousel>
 
           <div className="hidden lg:flex flex-col gap-3 absolute bottom-4 right-4 w-[520px] bg-black/40 p-4 rounded-lg z-10">
-            {heroData?.slice(0, 3).map((item: any) => (
+            {newContent?.slice(0, 3).map((item: any) => (
               <li key={item?.id} className="flex gap-4 flex-row lg:w-full mx-2">
                 <div className="flex-shrink-0 w-32 rounded-lg">
                   <Image
diff --git a/components/landing-page/new-content.tsx b/components/landing-page/new-content.tsx
index 8c7487e3..3dd7c627 100644
--- a/components/landing-page/new-content.tsx
+++ b/components/landing-page/new-content.tsx
@@ -2,7 +2,14 @@
 
 import React, { useEffect, useState } from "react";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { Carousel, CarouselApi, CarouselContent, CarouselItem, CarouselNext, CarouselPrevious } from "@/components/ui/carousel";
+import {
+  Carousel,
+  CarouselApi,
+  CarouselContent,
+  CarouselItem,
+  CarouselNext,
+  CarouselPrevious,
+} from "@/components/ui/carousel";
 import { useParams, usePathname } from "next/navigation";
 import { Icon } from "@iconify/react/dist/iconify.js";
 import { formatDateToIndonesian, secondToTimes } from "@/utils/globals";
@@ -46,7 +53,11 @@ const NewContent = (props: { group: string; type: string }) => {
     };
   }, [api]);
 
-  let prefixPath = poldaName ? `/polda/${poldaName}` : satkerName ? `/satker/${satkerName}` : "/";
+  let prefixPath = poldaName
+    ? `/polda/${poldaName}`
+    : satkerName
+    ? `/satker/${satkerName}`
+    : "/";
 
   useEffect(() => {
     const timer = setTimeout(() => {
@@ -66,8 +77,26 @@ const NewContent = (props: { group: string; type: string }) => {
       page: 0,
       size: 5,
       sortBy: props.type == "popular" ? "clickCount" : "createdAt",
-      contentTypeId: selectedTab == "image" ? "1" : selectedTab == "video" ? "2" : selectedTab == "text" ? "3" : selectedTab == "audio" ? "4" : "",
-      group: props.group == "mabes" ? "" : props.group == "polda" && poldaName && String(poldaName)?.length > 1 ? poldaName : props.group == "satker" && satkerName && String(satkerName)?.length > 1 ? "satker-" + satkerName : "",
+      contentTypeId:
+        selectedTab == "image"
+          ? "1"
+          : selectedTab == "video"
+          ? "2"
+          : selectedTab == "text"
+          ? "3"
+          : selectedTab == "audio"
+          ? "4"
+          : "",
+      group:
+        props.group == "mabes"
+          ? ""
+          : props.group == "polda" && poldaName && String(poldaName)?.length > 1
+          ? poldaName
+          : props.group == "satker" &&
+            satkerName &&
+            String(satkerName)?.length > 1
+          ? "satker-" + satkerName
+          : "",
       isInt: locale == "en" ? true : false,
     };
     const response = await getListContent(request);
@@ -89,7 +118,10 @@ const NewContent = (props: { group: string; type: string }) => {
     <animate xlink:href="#r" attributeName="x" from="-${w}" to="${w}" dur="1s" repeatCount="indefinite"  />
   </svg>`;
 
-  const toBase64 = (str: string) => (typeof window === "undefined" ? Buffer.from(str).toString("base64") : window.btoa(str));
+  const toBase64 = (str: string) =>
+    typeof window === "undefined"
+      ? Buffer.from(str).toString("base64")
+      : window.btoa(str);
 
   return (
     <div className="px-4 lg:px-0 py-4">
@@ -99,11 +131,21 @@ const NewContent = (props: { group: string; type: string }) => {
             {pathname?.split("/")[1] == "in" ? (
               <>
                 <span className="text-[#bb3523] ">{t("content")}</span>&nbsp;
-                {props.type == "popular" ? "Terpopuler" : props.type == "latest" ? t("new") : "Serupa"}
+                {props.type == "popular"
+                  ? "Terpopuler"
+                  : props.type == "latest"
+                  ? t("new")
+                  : "Serupa"}
               </>
             ) : (
               <>
-                <span className="text-[#bb3523] ">{props.type == "popular" ? "Popular" : props.type == "latest" ? t("new") : "Serupa"}</span>
+                <span className="text-[#bb3523] ">
+                  {props.type == "popular"
+                    ? "Popular"
+                    : props.type == "latest"
+                    ? t("new")
+                    : "Serupa"}
+                </span>
                 &nbsp;
                 {t("content")}
               </>
@@ -149,11 +191,34 @@ const NewContent = (props: { group: string; type: string }) => {
                   <Carousel setApi={setApi} className="w-full mx-auto">
                     <CarouselContent>
                       {newContent?.map((image: any) => (
-                        <CarouselItem key={image?.id} className="md:basis-1/2 lg:basis-1/3">
-                          <div onClick={() => router.push(prefixPath + `/image/detail/${image?.slug}`)} className="cursor-pointer relative group overflow-hidden bg-white rounded-xl shadow-md hover:shadow-lg transition-shadow duration-300">
+                        <CarouselItem
+                          key={image?.id}
+                          className="md:basis-1/2 lg:basis-1/3"
+                        >
+                          <div
+                            onClick={() =>
+                              router.push(
+                                prefixPath + `/image/detail/${image?.slug}`
+                              )
+                            }
+                            className="cursor-pointer relative group overflow-hidden bg-white rounded-xl shadow-md hover:shadow-lg transition-shadow duration-300"
+                          >
                             {/* Image with motion effect */}
-                            <motion.div className="w-full h-48 lg:h-60" whileHover={{ scale: 0.95 }} transition={{ duration: 0.3 }}>
-                              <Image placeholder={`data:image/svg+xml;base64,${toBase64(shimmer(700, 475))}`} width={2560} height={1440} alt="image" src={image?.smallThumbnailLink} className="w-full h-full object-cover" />
+                            <motion.div
+                              className="w-full h-48 lg:h-60"
+                              whileHover={{ scale: 0.95 }}
+                              transition={{ duration: 0.3 }}
+                            >
+                              <Image
+                                placeholder={`data:image/svg+xml;base64,${toBase64(
+                                  shimmer(700, 475)
+                                )}`}
+                                width={2560}
+                                height={1440}
+                                alt="image"
+                                src={image?.smallThumbnailLink}
+                                className="w-full h-full object-cover"
+                              />
                             </motion.div>
 
                             {/* Badge category */}
@@ -161,7 +226,12 @@ const NewContent = (props: { group: string; type: string }) => {
 
                             {/* Red icon overlay */}
                             <div className="absolute top-2 right-2 bg-[#bb3523] rounded-full p-1">
-                              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+                              <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
@@ -174,9 +244,14 @@ const NewContent = (props: { group: string; type: string }) => {
 
                             {/* Caption section */}
                             <div className="p-4">
-                              <p className="text-[12px] font-bold text-[#bb3523] uppercase mb-1">{image?.categoryName?.toUpperCase() ?? "Giat Pimpinan"}</p>
+                              <p className="text-[12px] font-bold text-[#bb3523] uppercase mb-1">
+                                {image?.categoryName?.toUpperCase() ??
+                                  "Giat Pimpinan"}
+                              </p>
 
-                              <p className="text-lg font-semibold text-black truncate">{image?.title}</p>
+                              <p className="text-lg font-semibold text-black truncate">
+                                {image?.title}
+                              </p>
 
                               {/* <p className="flex flex-row items-center text-[10px] gap-1 mt-2 text-gray-600">
                                 {formatDateToIndonesian(new Date(image?.createdAt))} {image?.timezone ?? "WIB"} |
@@ -190,7 +265,14 @@ const NewContent = (props: { group: string; type: string }) => {
 
                     <div className="flex justify-center mt-4">
                       {Array.from({ length: count }).map((_, index) => (
-                        <button key={index} className={`w-3 h-3 mx-1 rounded-full ${index === current ? "bg-gray-800" : "bg-gray-300"}`} onClick={() => api?.scrollTo(index)} aria-label={`Slide ${index + 1}`} />
+                        <button
+                          key={index}
+                          className={`w-3 h-3 mx-1 rounded-full ${
+                            index === current ? "bg-gray-800" : "bg-gray-300"
+                          }`}
+                          onClick={() => api?.scrollTo(index)}
+                          aria-label={`Slide ${index + 1}`}
+                        />
                       ))}
                     </div>
 
@@ -199,7 +281,13 @@ const NewContent = (props: { group: string; type: string }) => {
                   </Carousel>
                 ) : (
                   <p className="flex items-center justify-center">
-                    <Image width={1920} height={1080} src="/assets/empty-data.png" alt="empty" className="h-52 w-52 my-4" />
+                    <Image
+                      width={1920}
+                      height={1080}
+                      src="/assets/empty-data.png"
+                      alt="empty"
+                      className="h-52 w-52 my-4"
+                    />
                   </p>
                 )
               ) : selectedTab == "audio" ? (
@@ -207,11 +295,26 @@ const NewContent = (props: { group: string; type: string }) => {
                   <Carousel setApi={setApi} className="w-full mx-auto">
                     <CarouselContent>
                       {newContent?.map((audio: any) => (
-                        <CarouselItem key={audio?.id} className="md:basis-1/2 lg:basis-1/3">
-                          <div onClick={() => router.push(prefixPath + `/audio/detail/${audio?.slug}`)} className="cursor-pointer bg-white rounded-xl shadow-md hover:shadow-lg transition-shadow duration-300 overflow-hidden">
+                        <CarouselItem
+                          key={audio?.id}
+                          className="md:basis-1/2 lg:basis-1/3"
+                        >
+                          <div
+                            onClick={() =>
+                              router.push(
+                                prefixPath + `/audio/detail/${audio?.slug}`
+                              )
+                            }
+                            className="cursor-pointer bg-white rounded-xl shadow-md hover:shadow-lg transition-shadow duration-300 overflow-hidden"
+                          >
                             {/* Icon Background */}
                             <div className="flex items-center justify-center bg-[#bb3523] w-full h-[170px] text-white">
-                              <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" viewBox="0 0 20 20">
+                              <svg
+                                xmlns="http://www.w3.org/2000/svg"
+                                width="150"
+                                height="150"
+                                viewBox="0 0 20 20"
+                              >
                                 <path
                                   fill="currentColor"
                                   d="M14.702 2.226A1 1 0 0 1 16 3.18v6.027a5.5 5.5 0 0 0-1-.184V6.18L8 8.368V15.5a2.5 2.5 0 1 1-1-2V5.368a1 1 0 0 1 .702-.955zM8 7.32l7-2.187V3.18L8 5.368zM5.5 14a1.5 1.5 0 1 0 0 3a1.5 1.5 0 0 0 0-3m13.5.5a4.5 4.5 0 1 1-9 0a4.5 4.5 0 0 1 9 0m-2.265-.436l-2.994-1.65a.5.5 0 0 0-.741.438v3.3a.5.5 0 0 0 .741.438l2.994-1.65a.5.5 0 0 0 0-.876"
@@ -221,9 +324,14 @@ const NewContent = (props: { group: string; type: string }) => {
 
                             {/* Caption */}
                             <div className="p-4">
-                              <p className="text-[12px] font-bold text-[#bb3523] uppercase mb-1">{audio?.categoryName?.toUpperCase() ?? "GIAT PIMPINAN"}</p>
+                              <p className="text-[12px] font-bold text-[#bb3523] uppercase mb-1">
+                                {audio?.categoryName?.toUpperCase() ??
+                                  "GIAT PIMPINAN"}
+                              </p>
 
-                              <p className="text-xl font-semibold text-black truncate">{audio?.title}</p>
+                              <p className="text-xl font-semibold text-black truncate">
+                                {audio?.title}
+                              </p>
 
                               {/* <p className="text-[10px] text-gray-600 mt-2 flex items-center gap-1">
                                 {formatDateToIndonesian(new Date(audio?.createdAt))} {audio?.timezone ?? "WIB"} |
@@ -237,7 +345,14 @@ const NewContent = (props: { group: string; type: string }) => {
 
                     <div className="flex justify-center mt-4">
                       {Array.from({ length: count }).map((_, index) => (
-                        <button key={index} className={`w-3 h-3 mx-1 rounded-full ${index === current ? "bg-gray-800" : "bg-gray-300"}`} onClick={() => api?.scrollTo(index)} aria-label={`Slide ${index + 1}`} />
+                        <button
+                          key={index}
+                          className={`w-3 h-3 mx-1 rounded-full ${
+                            index === current ? "bg-gray-800" : "bg-gray-300"
+                          }`}
+                          onClick={() => api?.scrollTo(index)}
+                          aria-label={`Slide ${index + 1}`}
+                        />
                       ))}
                     </div>
 
@@ -246,7 +361,13 @@ const NewContent = (props: { group: string; type: string }) => {
                   </Carousel>
                 ) : (
                   <p className="flex items-center justify-center">
-                    <Image width={1920} height={1080} src="/assets/empty-data.png" alt="empty" className="h-52 w-52 my-4" />
+                    <Image
+                      width={1920}
+                      height={1080}
+                      src="/assets/empty-data.png"
+                      alt="empty"
+                      className="h-52 w-52 my-4"
+                    />
                   </p>
                 )
               ) : selectedTab == "video" ? (
@@ -254,11 +375,34 @@ const NewContent = (props: { group: string; type: string }) => {
                   <Carousel setApi={setApi} className="w-full mx-auto">
                     <CarouselContent>
                       {newContent?.map((video: any) => (
-                        <CarouselItem key={video?.id} className="md:basis-1/2 lg:basis-1/3">
-                          <div onClick={() => router.push(prefixPath + `/video/detail/${video?.slug}`)} className="cursor-pointer relative group overflow-hidden bg-white rounded-xl shadow-md hover:shadow-lg transition-shadow duration-300">
+                        <CarouselItem
+                          key={video?.id}
+                          className="md:basis-1/2 lg:basis-1/3"
+                        >
+                          <div
+                            onClick={() =>
+                              router.push(
+                                prefixPath + `/video/detail/${video?.slug}`
+                              )
+                            }
+                            className="cursor-pointer relative group overflow-hidden bg-white rounded-xl shadow-md hover:shadow-lg transition-shadow duration-300"
+                          >
                             {/* Image with motion effect */}
-                            <motion.div className="w-full h-48 lg:h-60" whileHover={{ scale: 0.95 }} transition={{ duration: 0.3 }}>
-                              <Image placeholder={`data:image/svg+xml;base64,${toBase64(shimmer(700, 475))}`} alt="video" width={2560} height={1440} src={video?.smallThumbnailLink} className="w-full h-full object-cover" />
+                            <motion.div
+                              className="w-full h-48 lg:h-60"
+                              whileHover={{ scale: 0.95 }}
+                              transition={{ duration: 0.3 }}
+                            >
+                              <Image
+                                placeholder={`data:image/svg+xml;base64,${toBase64(
+                                  shimmer(700, 475)
+                                )}`}
+                                alt="video"
+                                width={2560}
+                                height={1440}
+                                src={video?.smallThumbnailLink}
+                                className="w-full h-full object-cover"
+                              />
                             </motion.div>
 
                             {/* Badge category */}
@@ -266,7 +410,12 @@ const NewContent = (props: { group: string; type: string }) => {
 
                             {/* Red icon overlay */}
                             <div className="absolute top-2 right-2 bg-[#bb3523] rounded-full p-1">
-                              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+                              <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
@@ -279,9 +428,13 @@ const NewContent = (props: { group: string; type: string }) => {
 
                             {/* Caption section */}
                             <div className="p-4">
-                              <p className="text-[12px] font-bold text-[#bb3523] uppercase mb-1">{video?.categoryName?.toUpperCase() ?? "Video"}</p>
+                              <p className="text-[12px] font-bold text-[#bb3523] uppercase mb-1">
+                                {video?.categoryName?.toUpperCase() ?? "Video"}
+                              </p>
 
-                              <p className="text-lg font-semibold text-black truncate">{video?.title}</p>
+                              <p className="text-lg font-semibold text-black truncate">
+                                {video?.title}
+                              </p>
 
                               {/* <p className="flex flex-row items-center text-[10px] gap-1 mt-2 text-gray-600">
                                 {formatDateToIndonesian(new Date(video?.createdAt))} {video?.timezone ?? "WIB"} |
@@ -296,7 +449,14 @@ const NewContent = (props: { group: string; type: string }) => {
                     {/* Pagination Dots */}
                     <div className="flex justify-center mt-4">
                       {Array.from({ length: count }).map((_, index) => (
-                        <button key={index} className={`w-3 h-3 mx-1 rounded-full ${index === current ? "bg-gray-800" : "bg-gray-300"}`} onClick={() => api?.scrollTo(index)} aria-label={`Slide ${index + 1}`} />
+                        <button
+                          key={index}
+                          className={`w-3 h-3 mx-1 rounded-full ${
+                            index === current ? "bg-gray-800" : "bg-gray-300"
+                          }`}
+                          onClick={() => api?.scrollTo(index)}
+                          aria-label={`Slide ${index + 1}`}
+                        />
                       ))}
                     </div>
 
@@ -305,18 +465,39 @@ const NewContent = (props: { group: string; type: string }) => {
                   </Carousel>
                 ) : (
                   <p className="flex items-center justify-center">
-                    <Image width={1920} height={1080} src="/assets/empty-data.png" alt="empty" className="h-52 w-52 my-4" />
+                    <Image
+                      width={1920}
+                      height={1080}
+                      src="/assets/empty-data.png"
+                      alt="empty"
+                      className="h-52 w-52 my-4"
+                    />
                   </p>
                 )
               ) : newContent.length > 0 ? (
                 <Carousel setApi={setApi} className="w-full mx-auto">
                   <CarouselContent>
                     {newContent?.map((text: any) => (
-                      <CarouselItem key={text?.id} className="md:basis-1/2 lg:basis-1/3">
-                        <div onClick={() => router.push(prefixPath + `/document/detail/${text?.slug}`)} className="cursor-pointer rounded-lg shadow-md overflow-hidden bg-white">
+                      <CarouselItem
+                        key={text?.id}
+                        className="md:basis-1/2 lg:basis-1/3"
+                      >
+                        <div
+                          onClick={() =>
+                            router.push(
+                              prefixPath + `/document/detail/${text?.slug}`
+                            )
+                          }
+                          className="cursor-pointer rounded-lg shadow-md overflow-hidden bg-white"
+                        >
                           {/* Ikon di tengah dengan latar kuning */}
                           <div className="bg-[#e0c350] flex items-center justify-center h-[170px] text-white">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" viewBox="0 0 16 16">
+                            <svg
+                              xmlns="http://www.w3.org/2000/svg"
+                              width="150"
+                              height="150"
+                              viewBox="0 0 16 16"
+                            >
                               <path
                                 fill="currentColor"
                                 d="M5 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V5.414a1.5 1.5 0 0 0-.44-1.06L9.647 1.439A1.5 1.5 0 0 0 8.586 1zM4 3a1 1 0 0 1 1-1h3v2.5A1.5 1.5 0 0 0 9.5 6H12v7a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1zm7.793 2H9.5a.5.5 0 0 1-.5-.5V2.207zM7 7.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5M7.5 9a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1zM7 11.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5M5.5 8a.5.5 0 1 0 0-1a.5.5 0 0 0 0 1M6 9.5a.5.5 0 1 1-1 0a.5.5 0 0 1 1 0M5.5 12a.5.5 0 1 0 0-1a.5.5 0 0 0 0 1"
@@ -327,10 +508,14 @@ const NewContent = (props: { group: string; type: string }) => {
                           {/* Konten bawah */}
                           <div className="p-4 flex flex-col gap-2">
                             {/* Kategori merah */}
-                            <div className="text-[12px] font-bold text-red-600 uppercase">{text?.categoryName?.toUpperCase() ?? "Text"}</div>
+                            <div className="text-[12px] font-bold text-red-600 uppercase">
+                              {text?.categoryName?.toUpperCase() ?? "Text"}
+                            </div>
 
                             {/* Judul */}
-                            <div className="font-semibold text-gray-900 text-xl leading-snug line-clamp-2">{text?.title}</div>
+                            <div className="font-semibold text-gray-900 text-xl leading-snug line-clamp-2">
+                              {text?.title}
+                            </div>
 
                             {/* Meta info */}
                             {/* <div className="text-gray-500 flex items-center text-xs gap-2">
@@ -360,7 +545,14 @@ const NewContent = (props: { group: string; type: string }) => {
                   {/* Pagination Dots */}
                   <div className="flex justify-center mt-4">
                     {Array.from({ length: count }).map((_, index) => (
-                      <button key={index} className={`w-3 h-3 mx-1 rounded-full ${index === current ? "bg-gray-800" : "bg-gray-300"}`} onClick={() => api?.scrollTo(index)} aria-label={`Slide ${index + 1}`} />
+                      <button
+                        key={index}
+                        className={`w-3 h-3 mx-1 rounded-full ${
+                          index === current ? "bg-gray-800" : "bg-gray-300"
+                        }`}
+                        onClick={() => api?.scrollTo(index)}
+                        aria-label={`Slide ${index + 1}`}
+                      />
                     ))}
                   </div>
 
@@ -369,7 +561,13 @@ const NewContent = (props: { group: string; type: string }) => {
                 </Carousel>
               ) : (
                 <p className="flex items-center justify-center">
-                  <Image width={1920} height={1080} src="/assets/empty-data.png" alt="empty" className="h-52 w-52 my-4" />
+                  <Image
+                    width={1920}
+                    height={1080}
+                    src="/assets/empty-data.png"
+                    alt="empty"
+                    className="h-52 w-52 my-4"
+                  />
                 </p>
               )}
             </div>