diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a698f5c1..609c9f4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,10 +6,12 @@ build-prod: stage: build when: on_success only: - - prod - image: docker:stable + - main + - dev-landing-v2 + image: + name: docker:25.0.3-cli services: - - name: docker:dind + - name: docker:25.0.3-dind command: ["--insecure-registry=103.82.242.92:8900"] script: - docker logout diff --git a/app/[locale]/(protected)/contributor/content/image/components/table-image.tsx b/app/[locale]/(protected)/contributor/content/image/components/table-image.tsx index 74409cb8..1e74bd95 100644 --- a/app/[locale]/(protected)/contributor/content/image/components/table-image.tsx +++ b/app/[locale]/(protected)/contributor/content/image/components/table-image.tsx @@ -34,7 +34,7 @@ import { } from "@/components/ui/dropdown-menu"; import { Input } from "@/components/ui/input"; import { InputGroup, InputGroupText } from "@/components/ui/input-group"; -import { useParams } from "next/navigation"; +import { useParams, useSearchParams } from "next/navigation"; import TablePagination from "@/components/table/table-pagination"; import { listDataImage, listEnableCategory } from "@/service/content/content"; import Swal from "sweetalert2"; @@ -47,8 +47,7 @@ const TableImage = () => { const params = useParams(); const locale = params?.locale; const MySwal = withReactContent(Swal); - - // === STATES === + const searchParams = useSearchParams(); const [dataTable, setDataTable] = React.useState([]); const [totalData, setTotalData] = React.useState(1); const [totalPage, setTotalPage] = React.useState(1); @@ -63,8 +62,6 @@ const TableImage = () => { const [page, setPage] = React.useState(1); const [search, setSearch] = React.useState(""); const [searchTimeout, setSearchTimeout] = React.useState(null); - - // === FILTER STATES === const [categories, setCategories] = React.useState([]); const [selectedCategories, setSelectedCategories] = React.useState( [] @@ -105,14 +102,9 @@ const TableImage = () => { }, }); - // === EFFECTS === React.useEffect(() => { fetchData(); getCategories(); - }, [categoryFilter, statusFilter, page, showData, startDate, endDate]); - - React.useEffect(() => { - fetchData(); }, [ categoryFilter, statusFilter, @@ -121,11 +113,38 @@ const TableImage = () => { filterByCreator, filterBySource, filterByCreatorGroup, - // search, showData, page, ]); + React.useEffect(() => { + const pageFromUrl = searchParams?.get("page"); + if (pageFromUrl) { + setPage(Number(pageFromUrl)); + } + }, [searchParams]); + + // === EFFECTS === + // React.useEffect(() => { + // fetchData(); + // getCategories(); + // }, [categoryFilter, statusFilter, page, showData, startDate, endDate]); + + // React.useEffect(() => { + // fetchData(); + // }, [ + // categoryFilter, + // statusFilter, + // startDate, + // endDate, + // filterByCreator, + // filterBySource, + // filterByCreatorGroup, + // // search, + // showData, + // page, + // ]); + async function getCategories() { const category = await listEnableCategory("1"); const resCategory = category?.data?.data?.content; diff --git a/app/[locale]/(protected)/dashboard/executive/page.tsx b/app/[locale]/(protected)/dashboard/executive/page.tsx index 2432229a..382268b0 100644 --- a/app/[locale]/(protected)/dashboard/executive/page.tsx +++ b/app/[locale]/(protected)/dashboard/executive/page.tsx @@ -55,7 +55,8 @@ export default function ExecutiveDashboard() { levelName == "MABES POLRI" ? isInternational[1] ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-published-produksi?" - : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-published-produksi-executive?" + : // "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-published-produksi-executive?" + "/views/2025_10_MediaHUB-Viz-POLDA_Rev200/db-published-produksi-executive?" : safeLevelName.includes("POLDA") ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-published-produksi-polda-executive?polda-selected=${state}&` : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-published-produksi-polda-executive?polda-selected=${state}&`; @@ -64,7 +65,8 @@ export default function ExecutiveDashboard() { levelName == "MABES POLRI" ? isInternational[2] ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-waktu-akses-pengguna?" - : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-waktu-akses-pengguna-executive?" + : // "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-waktu-akses-pengguna-executive?" + "/views/2025_10_MediaHUB-Viz-POLDA_Rev200/db-waktu-akses-pengguna-executive?" : safeLevelName.includes("POLDA") ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-waktu-akses-pengguna-polda-executive?polda-selected=${state}&` : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-waktu-akses-pengguna-polda-executive?polda-selected=${state}&`; @@ -72,8 +74,11 @@ export default function ExecutiveDashboard() { const view4 = levelName == "MABES POLRI" ? isInternational[1] - ? "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda?" - : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda?" + ? + "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda?" + : + // "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda?" + "/views/2025_10_MediaHUB-Viz-POLDA_Rev200/db-konten-header?" : safeLevelName.includes("POLDA") ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda?polda-selected=${state}&` : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda?polda-selected=${state}&`; @@ -81,8 +86,10 @@ export default function ExecutiveDashboard() { const view5 = levelName == "MABES POLRI" ? isInternational[1] - ? "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polres?" - : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polres?" + ? // "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polres?" + "views/2025_10_MediaHUB-Viz-POLDA_Rev200/db-konten-header" + : // "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polres?" + "views/2025_10_MediaHUB-Viz-POLDA_Rev200/db-konten-header" : safeLevelName.includes("POLDA") ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polres?provinsi-polda=${state}&` : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polres?provinsi-polda=${state}&`; @@ -90,8 +97,10 @@ export default function ExecutiveDashboard() { const view6 = levelName == "MABES POLRI" ? isInternational[1] - ? "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-satker?" - : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-satker?" + ? // "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-satker?" + "views/2025_10_MediaHUB-Viz-POLDA_Rev200/db-konten-header" + : // "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-satker?" + "views/2025_10_MediaHUB-Viz-POLDA_Rev200/db-konten-header" : safeLevelName.includes("POLDA") ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-satker?satker-selected=${state}&` : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-satker?satker-selected=${state}&`; @@ -140,8 +149,94 @@ export default function ExecutiveDashboard() { return (
-
- {/* Polda */} +
+ +
+ {/* ===================== POLDA ===================== */} + {(levelNumber === "1" || levelNumber === "2") && ( +
+

+ Publish Konten Polda +

+ + {ticket1 == "" ? ( +