kontenhumas
/
kontenhumas-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: sidebar

This commit is contained in:
Sabda Yagra 2025-10-07 12:10:34 +07:00
parent 8ff369e34a
commit 0077e22717
3 changed files with 265 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
components/table/management-user/management-user-internal-table.tsx
View File

@ -15,7 +15,6 @@ import {
useReactTable, useReactTable,
} from "@tanstack/react-table"; } from "@tanstack/react-table";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { import {
Table, Table,
TableBody, TableBody,
@ -46,7 +45,9 @@ import {
import { Checkbox } from "@/components/ui/checkbox"; import { Checkbox } from "@/components/ui/checkbox";
import { close, loading } from "@/config/swal"; import { close, loading } from "@/config/swal";
import { Link, useRouter } from "@/i18n/routing"; import { Link, useRouter } from "@/i18n/routing";
import { AdministrationUserList } from "@/service/service/management-user/management-user"; import { getAllUsers } from "@/service/management-user/management-user";
// ✅ Import service baru dari Swagger
const UserInternalTable = () => { const UserInternalTable = () => {
const router = useRouter(); const router = useRouter();
@ -69,11 +70,11 @@ const UserInternalTable = () => {
pageSize: Number(showData), pageSize: Number(showData),
}); });
const [search, setSearch] = React.useState(""); const [search, setSearch] = React.useState("");
const [categoryFilter, setCategoryFilter] = React.useState<number[]>([]); const [categoryFilter, setCategoryFilter] = React.useState<number[]>([]);
const [statusFilter, setStatusFilter] = React.useState<number[]>([]); const [statusFilter, setStatusFilter] = React.useState<number[]>([]);
const [page, setPage] = React.useState(1); const [page, setPage] = React.useState(1);
const [totalPage, setTotalPage] = React.useState(1); const [totalPage, setTotalPage] = React.useState(1);
const table = useReactTable({ const table = useReactTable({
data: dataTable, data: dataTable,
columns, columns,
@ -131,31 +132,41 @@ const UserInternalTable = () => {
}); });
}, [page, showData]); }, [page, showData]);
// === 🔥 Implementasi service getAllUsers dari Swagger ===
async function fetchData() { async function fetchData() {
try { try {
loading(); loading();
const res = await AdministrationUserList(
String(levelId), const res = await getAllUsers({
page - 1, count: 1,
search, limit: Number(showData),
showData, nextPage: page + 1,
"1", page: page,
statusFilter?.sort().join(",") previousPage: page - 1,
); sort: "desc",
const data = res?.data?.data; sortBy: "id",
const contentData = data?.content ?? []; totalPage: 10,
});
const data = res?.data;
const contentData = Array.isArray(data)
? data
: data?.content || data?.items || [];
// Tambahkan nomor urut
contentData.forEach((item: any, index: number) => { contentData.forEach((item: any, index: number) => {
item.no = (page - 1) * Number(showData) + index + 1; item.no = (page - 1) * Number(showData) + index + 1;
}); });
console.log("contentData : ", contentData); console.log("📦 contentData:", contentData);
setDataTable(contentData); setDataTable(contentData);
setTotalData(data?.totalElements ?? 0); setTotalData(data?.totalElements ?? contentData.length ?? 0);
setTotalPage(data?.totalPages ?? 0); setTotalPage(data?.totalPages ?? 1);
close(); close();
} catch (error) { } catch (error) {
console.error("Error fetching tasks:", error); console.error("❌ Error fetching users:", error);
close();
} }
} }
@ -336,6 +347,8 @@ const UserInternalTable = () => {
</Popover> </Popover>
</div> </div>
</div> </div>
{/* === TABLE === */}
<Table className="overflow-hidden"> <Table className="overflow-hidden">
<TableHeader> <TableHeader>
{table.getHeaderGroups().map((headerGroup) => ( {table.getHeaderGroups().map((headerGroup) => (
@ -377,6 +390,7 @@ const UserInternalTable = () => {
)} )}
</TableBody> </TableBody>
</Table> </Table>
<TablePagination <TablePagination
table={table} table={table}
totalData={totalData} totalData={totalData}

376
lib/menus.ts
View File

@ -31,7 +31,7 @@ export type Group = {
}; };
export function getMenuList(pathname: string, t: any): Group[] { export function getMenuList(pathname: string, t: any): Group[] {
const roleId = getCookiesDecrypt("urie"); const roleId = Number(getCookiesDecrypt("urie"));
const levelNumber = getCookiesDecrypt("ulne"); const levelNumber = getCookiesDecrypt("ulne");
const userLevelId = getCookiesDecrypt("ulie"); const userLevelId = getCookiesDecrypt("ulie");
const userParentLevelId = getCookiesDecrypt("uplie"); const userParentLevelId = getCookiesDecrypt("uplie");
@ -55,49 +55,72 @@ export function getMenuList(pathname: string, t: any): Group[] {
}, },
], ],
}, },
{ ...(roleId === 2
groupLabel: "Content Management", ? [
id: "content", {
menus: [ groupLabel: "Content Management",
{ id: "content",
id: "content", menus: [
href: "/admin/content/image", {
label: "Content", id: "content",
active: pathname.includes("/content"), href: "/admin/content/image",
icon: "line-md:youtube", label: "Content",
submenus: [ active: pathname.includes("/content"),
{ icon: "line-md:youtube",
href: "/admin/content/image", submenus: [
label: "Image", {
active: pathname.includes("/content/image"), href: "/admin/content/image",
icon: "ic:outline-image", label: "Image",
children: [], active: pathname.includes("/content/image"),
}, icon: "ic:outline-image",
{ children: [],
href: "/admin/content/audio-visual", },
label: "Audio Visual", {
active: pathname.includes("/content/audio-visual"), href: "/admin/content/audio-visual",
icon: "line-md:youtube", label: "Audio Visual",
children: [], active: pathname.includes("/content/audio-visual"),
}, icon: "line-md:youtube",
{ children: [],
href: "/admin/content/document", },
label: "Document", {
active: pathname.includes("/content/document"), href: "/admin/content/document",
icon: "heroicons:document", label: "Document",
children: [], active: pathname.includes("/content/document"),
}, icon: "heroicons:document",
{ children: [],
href: "/admin/content/audio", },
label: "Audio", {
active: pathname.includes("/content/audio"), href: "/admin/content/audio",
icon: "heroicons:share", label: "Audio",
children: [], active: pathname.includes("/content/audio"),
}, icon: "heroicons:share",
], children: [],
}, },
], ],
}, },
],
},
]
: []),
...(roleId === 3
? [
{
groupLabel: "",
id: "management-user",
menus: [
{
id: "management-user-menu",
href: "/admin/management-user",
label: "Management User",
active: pathname.includes("/management-user"),
icon: "clarity:users-solid",
submenus: [],
},
],
},
]
: []),
// { // {
// groupLabel: "Master Data", // groupLabel: "Master Data",
// id: "master-data", // id: "master-data",
@ -120,127 +143,150 @@ export function getMenuList(pathname: string, t: any): Group[] {
// }, // },
// ], // ],
// }, // },
{ // {
groupLabel: "", // groupLabel: "",
id: "agenda-setting", // id: "agenda-setting",
menus: [ // menus: [
{ // {
id: "agenda-setting", // id: "agenda-setting",
href: "/admin/agenda-setting", // href: "/admin/agenda-setting",
label: t("agenda-setting"), // label: t("agenda-setting"),
active: pathname.includes("/agenda-setting"), // active: pathname.includes("/agenda-setting"),
icon: "iconoir:journal-page", // icon: "iconoir:journal-page",
submenus: [], // submenus: [],
}, // },
], // ],
}, // },
{ // {
groupLabel: "", // groupLabel: "",
id: "schedule", // id: "schedule",
menus: [ // menus: [
{ // {
id: "schedule", // id: "schedule",
href: "/admin/schedule", // href: "/admin/schedule",
label: t("schedule"), // label: t("schedule"),
active: pathname.includes("/schedule"), // active: pathname.includes("/schedule"),
icon: "uil:schedule", // icon: "uil:schedule",
submenus: [ // submenus: [
{ // {
href: "/admin/schedule/live-report", // href: "/admin/schedule/live-report",
label: t("live-report"), // label: t("live-report"),
active: pathname.includes("/schedule/live-report"), // active: pathname.includes("/schedule/live-report"),
icon: "heroicons:arrow-trending-up", // icon: "heroicons:arrow-trending-up",
children: [], // children: [],
}, // },
// { // // {
// href: "/contributor/schedule/press-conference", // // href: "/contributor/schedule/press-conference",
// label: t("press-conference"), // // label: t("press-conference"),
// active: pathname.includes("/schedule/press-conference"), // // active: pathname.includes("/schedule/press-conference"),
// icon: "heroicons:arrow-trending-up", // // icon: "heroicons:arrow-trending-up",
// children: [], // // children: [],
// }, // // },
// { // // {
// href: "/contributor/schedule/event", // // href: "/contributor/schedule/event",
// label: "event", // // label: "event",
// active: pathname.includes("/schedule/event"), // // active: pathname.includes("/schedule/event"),
// icon: "heroicons:shopping-cart", // // icon: "heroicons:shopping-cart",
// children: [], // // children: [],
// }, // // },
// { // // {
// href: "/contributor/schedule/press-release", // // href: "/contributor/schedule/press-release",
// label: t("press-release"), // // label: t("press-release"),
// active: pathname.includes("/schedule/press-release"), // // active: pathname.includes("/schedule/press-release"),
// icon: "heroicons:shopping-cart", // // icon: "heroicons:shopping-cart",
// children: [], // // children: [],
// }, // // },
// { // // {
// href: "/contributor/schedule/calendar-polri", // // href: "/contributor/schedule/calendar-polri",
// label: t("calendar-polri"), // // label: t("calendar-polri"),
// active: pathname.includes("/schedule/calendar-polri"), // // active: pathname.includes("/schedule/calendar-polri"),
// icon: "heroicons:arrow-trending-up", // // icon: "heroicons:arrow-trending-up",
// children: [], // // children: [],
// }, // // },
], // ],
}, // },
], // ],
}, // },
{ // {
groupLabel: "", // groupLabel: "",
id: "task", // id: "task",
menus: [ // menus: [
{ // {
id: "task", // id: "task",
href: "/admin/task", // href: "/admin/task",
label: t("task"), // label: t("task"),
active: pathname.includes("/task"), // active: pathname.includes("/task"),
icon: "fluent:clipboard-task-add-24-regular", // icon: "fluent:clipboard-task-add-24-regular",
submenus: [], // submenus: [],
}, // },
], // ],
}, // },
{ // {
groupLabel: "", // groupLabel: "",
id: "communication", // id: "communication",
menus: [ // menus: [
{ // {
id: "communication", // id: "communication",
href: "/admin/shared/communication", // href: "/admin/shared/communication",
label: t("communication"), // label: t("communication"),
active: pathname.includes("/communication"), // active: pathname.includes("/communication"),
icon: "token:chat", // icon: "token:chat",
submenus: [], // submenus: [],
}, // },
], // ],
}, // },
{ ...(roleId === 3
groupLabel: "Settings", ? [
id: "settings", {
menus: [ groupLabel: "",
{ id: "tenant",
id: "settings", menus: [
href: "/admin/settings", {
label: "Settings", id: "tenant",
active: pathname.includes("/settings"), href: "/admin/settings/tenant",
icon: "heroicons:cog-6-tooth", label: "Tenant",
submenus: [ active: pathname.includes("/tenant"),
{ icon: "token:chat",
href: "/admin/categories", submenus: [],
label: "Categories", },
active: pathname.includes("/categories"), ],
icon: "ic:outline-image", },
children: [], ]
}, : []),
{ ...(roleId === 2
href: "/admin/settings/tenant", ? [
label: "Tenant", {
active: pathname.includes("/tenant"), groupLabel: "Settings",
icon: "ic:outline-image", id: "settings",
children: [], menus: [
}, {
], id: "settings",
}, href: "/admin/settings",
], label: "Settings",
}, active: pathname.includes("/settings"),
icon: "heroicons:cog-6-tooth",
submenus: [
{
href: "/admin/categories",
label: "Categories",
active: pathname.includes("/categories"),
icon: "ic:outline-image",
children: [],
},
// kalau nanti Tenant mau dimunculkan lagi:
// {
// href: "/admin/settings/tenant",
// label: "Tenant",
// active: pathname.includes("/tenant"),
// icon: "ic:outline-image",
// children: [],
// },
],
},
],
},
]
: []),
]; ];
return menusSelected; return menusSelected;
} }

23
service/management-user/management-user.ts
View File

@ -21,6 +21,29 @@ export async function AdministrationUserList(
return httpGetInterceptor(url); return httpGetInterceptor(url);
} }
export async function getAllUsers({
count = 1,
limit = 10,
nextPage = 1,
page = 1,
previousPage = 1,
sort = "desc",
sortBy = "id",
totalPage = 10,
}: {
count?: number;
limit?: number;
nextPage?: number;
page?: number;
previousPage?: number;
sort?: string;
sortBy?: string;
totalPage?: number;
}) {
const url = `users?count=${count}&limit=${limit}&nextPage=${nextPage}&page=${page}&previousPage=${previousPage}&sort=${sort}&sortBy=${sortBy}&totalPage=${totalPage}`;
return httpGetInterceptor(url);
}
export async function AdministrationLevelList() { export async function AdministrationLevelList() {
const url = "users/user-levels/list"; const url = "users/user-levels/list";
return httpGetInterceptor(url); return httpGetInterceptor(url);