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

Merge branch 'dev-1' of https://gitlab.com/hanifsalafi/new-netidhub-public

This commit is contained in:
hanif salafi 2025-10-07 12:15:51 +07:00
parent b91b7f93cd 0077e22717
commit 89da265615
5 changed files with 476 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
components/form/sign-up.tsx
View File

@ -16,7 +16,7 @@ import Swal from "sweetalert2";
import { error } from "console";
import { EyeFilledIcon, EyeSlashFilledIcon } from "../icons";
import { RadioGroup, RadioGroupItem } from "../ui/radio-group";
import { registerTenant } from "@/service/auth";
import { createUser, registerTenant } from "@/service/auth";
export default function SignUp() {
const router = useRouter();
@ -39,7 +39,9 @@ export default function SignUp() {
const [isResetPassword, setIsResetPassword] = useState(false);
const [checkUsernameValue, setCheckUsernameValue] = useState("");
const MySwal = withReactContent(Swal);
const [fullname, setFullname] = useState("");
const [userLevelId, setUserLevelId] = useState("");
const [userRoleId, setUserRoleId] = useState("");
const setValUsername = (e: any) => {
const uname = e.replaceAll(/[^\w.-]/g, "");
setUsername(uname.toLowerCase());
@ -81,16 +83,28 @@ export default function SignUp() {
const [isLoading, setIsLoading] = useState(false);
const [formErrors, setFormErrors] = useState<any>({});
const handleSendOtp = (e: React.FormEvent) => {
const handleSendOtp = async (e: React.FormEvent) => {
e.preventDefault();
// If role is tenant, handle tenant registration directly
// Tenant → gunakan API registerTenant
if (role === "tenant") {
handleTenantRegistration(e);
await handleTenantRegistration(e);
return;
}
// For other roles, proceed with OTP flow
// Umum dan Jurnalis → gunakan API createUser
if (role === "umum" || role === "jurnalis") {
await handleCreateUserUmum(e);
return;
}
// Kontributor (sementara ikut umum)
if (role === "kontributor") {
await handleCreateUserUmum(e);
return;
}
// Default (fallback ke OTP flow jika ada tambahan nanti)
setStep("otp");
};
@ -126,6 +140,76 @@ export default function SignUp() {
return password.length >= 8;
};
const handleCreateUserUmum = async (e: React.FormEvent) => {
e.preventDefault();
if (!fullname.trim()) {
MySwal.fire("Peringatan", "Nama lengkap wajib diisi", "warning");
return;
}
if (!validateEmail(email)) {
MySwal.fire("Peringatan", "Email tidak valid", "warning");
return;
}
if (!validatePassword(password)) {
MySwal.fire("Peringatan", "Password minimal 8 karakter", "warning");
return;
}
if (!userLevelId || !userRoleId) {
MySwal.fire("Peringatan", "Level dan Role wajib diisi", "warning");
return;
}
// ✅ Generate username otomatis
const autoUsername =
fullname.trim().replace(/\s+/g, "-").toLowerCase() || email.split("@")[0];
const payload = {
address: "",
clientId: "78356d32-52fa-4dfc-b836-6cebf4e3eead",
dateOfBirth: "",
email,
fullName: fullname,
genderType: "",
identityGroup: "",
identityGroupNumber: "",
identityNumber: "",
identityType: "",
lastEducation: "",
password,
phoneNumber: "",
userLevelId: parseInt(userLevelId),
userRoleId: 3,
username: autoUsername,
workType: "",
};
console.log("📦 createUser payload:", payload);
try {
setIsLoading(true);
const res = await createUser(payload);
if (res?.error) {
MySwal.fire("Gagal", res?.message || "Gagal mendaftar", "error");
} else {
MySwal.fire({
title: "Berhasil!",
text: "Akun berhasil dibuat, Anda akan diarahkan ke halaman login.",
icon: "success",
showConfirmButton: false,
timer: 2000,
});
setTimeout(() => router.push("/auth"), 2000);
}
} catch (err) {
console.error("Error createUser:", err);
MySwal.fire("Error", "Terjadi kesalahan server.", "error");
} finally {
setIsLoading(false);
}
};
const validateTenantForm = () => {
const errors: any = {};
@ -182,17 +266,17 @@ export default function SignUp() {
try {
const registrationData = {
adminUser: {
address: "Jakarta", // Default address as per API requirement
address: "Jakarta",
email: email,
fullname: `${firstName} ${lastName}`,
password: tenantPassword,
phoneNumber: whatsapp,
username: `${firstName}-${lastName}`, // Using firstName + lastName as username
username: `${firstName}-${lastName}`,
},
client: {
clientType: "sub_client", // Hardcoded as per API requirement
clientType: "sub_client",
name: namaTenant,
parentClientId: "78356d32-52fa-4dfc-b836-6cebf4e3eead", // Hardcoded as per API requirement
parentClientId: "78356d32-52fa-4dfc-b836-6cebf4e3eead",
},
};
@ -229,6 +313,17 @@ export default function SignUp() {
}
};
// Generate username otomatis dari nama lengkap
React.useEffect(() => {
if (fullname.trim()) {
const generated = fullname
.toLowerCase()
.replace(/\s+/g, "-")
.replace(/[^a-z0-9_]/g, "-");
setUsername(generated);
}
}, [fullname]);
return (
<div className="min-h-screen flex">
{/* Left Side - Logo Section */}
@ -300,6 +395,86 @@ export default function SignUp() {
<Label htmlFor="tenant">Tenant</Label>
</div>
</RadioGroup>
{role === "umum" && (
<div className="mb-4 space-y-4">
{/* Nama Lengkap */}
<Input
type="text"
required
placeholder="Nama Lengkap"
value={fullname}
onChange={(e) => setFullname(e.target.value)}
/>
{/* Username (auto generated) */}
<Input
type="text"
placeholder="Username (otomatis dari nama)"
value={username}
readOnly
className="bg-gray-100 text-gray-700 cursor-not-allowed"
/>
{/* Email */}
<Input
type="email"
required
placeholder="Email"
value={email}
onChange={(e) => setEmail(e.target.value)}
/>
{/* Password */}
<div className="relative">
<Input
type={isVisible ? "text" : "password"}
required
placeholder="Password"
value={password}
onChange={(e) => setPassword(e.target.value)}
className="pr-10"
/>
<button
type="button"
onClick={toggleVisibility}
className="absolute right-3 top-1/2 transform -translate-y-1/2 text-gray-500 hover:text-gray-700"
>
{isVisible ? (
<EyeSlashFilledIcon className="h-4 w-4" />
) : (
<EyeFilledIcon className="h-4 w-4" />
)}
</button>
</div>
{/* Level dan Role */}
<select
required
className="w-full border border-gray-300 rounded-md p-2 text-sm"
value={userLevelId}
onChange={(e) => setUserLevelId(e.target.value)}
>
<option value="">Pilih Level Pengguna</option>
<option value="1">Mabes</option>
<option value="2">Polda</option>
<option value="3">Satker</option>
<option value="4">Polres</option>
<option value="5">Polsek</option>
</select>
<select
required
className="w-full border border-gray-300 rounded-md p-2 text-sm"
value={userRoleId}
onChange={(e) => setUserRoleId(e.target.value)}
>
<option value="">Pilih Role</option>
<option value="1">Admin</option>
<option value="2">Editor</option>
<option value="3">User</option>
</select>
</div>
)}
{/* Jurnalis: Select Keanggotaan */}
{role === "jurnalis" && (
@ -644,6 +819,12 @@ export default function SignUp() {
</div>
) : role === "tenant" ? (
"Daftar Tenant"
) : role === "umum" ? (
"Daftar Umum"
) : role === "jurnalis" ? (
"Daftar Jurnalis"
) : role === "kontributor" ? (
"Daftar Kontributor"
) : (
"Kirim OTP"
)}

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

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

210
lib/menus.ts
View File

@ -31,7 +31,7 @@ export type Group = {
};
export function getMenuList(pathname: string, t: any): Group[] {
const roleId = getCookiesDecrypt("urie");
const roleId = Number(getCookiesDecrypt("urie"));
const levelNumber = getCookiesDecrypt("ulne");
const userLevelId = getCookiesDecrypt("ulie");
const userParentLevelId = getCookiesDecrypt("uplie");
@ -55,6 +55,8 @@ export function getMenuList(pathname: string, t: any): Group[] {
},
],
},
...(roleId === 2
? [
{
groupLabel: "Content Management",
id: "content",
@ -98,6 +100,27 @@ export function getMenuList(pathname: string, t: any): Group[] {
},
],
},
]
: []),
...(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",
// id: "master-data",
@ -120,98 +143,118 @@ export function getMenuList(pathname: string, t: any): Group[] {
// },
// ],
// },
{
groupLabel: "",
id: "agenda-setting",
menus: [
{
id: "agenda-setting",
href: "/admin/agenda-setting",
label: t("agenda-setting"),
active: pathname.includes("/agenda-setting"),
icon: "iconoir:journal-page",
submenus: [],
},
],
},
{
groupLabel: "",
id: "schedule",
menus: [
{
id: "schedule",
href: "/admin/schedule",
label: t("schedule"),
active: pathname.includes("/schedule"),
icon: "uil:schedule",
submenus: [
{
href: "/admin/schedule/live-report",
label: t("live-report"),
active: pathname.includes("/schedule/live-report"),
icon: "heroicons:arrow-trending-up",
children: [],
},
// {
// href: "/contributor/schedule/press-conference",
// label: t("press-conference"),
// active: pathname.includes("/schedule/press-conference"),
// groupLabel: "",
// id: "agenda-setting",
// menus: [
// {
// id: "agenda-setting",
// href: "/admin/agenda-setting",
// label: t("agenda-setting"),
// active: pathname.includes("/agenda-setting"),
// icon: "iconoir:journal-page",
// submenus: [],
// },
// ],
// },
// {
// groupLabel: "",
// id: "schedule",
// menus: [
// {
// id: "schedule",
// href: "/admin/schedule",
// label: t("schedule"),
// active: pathname.includes("/schedule"),
// icon: "uil:schedule",
// submenus: [
// {
// href: "/admin/schedule/live-report",
// label: t("live-report"),
// active: pathname.includes("/schedule/live-report"),
// icon: "heroicons:arrow-trending-up",
// children: [],
// },
// {
// href: "/contributor/schedule/event",
// label: "event",
// active: pathname.includes("/schedule/event"),
// icon: "heroicons:shopping-cart",
// children: [],
// // {
// // href: "/contributor/schedule/press-conference",
// // label: t("press-conference"),
// // active: pathname.includes("/schedule/press-conference"),
// // icon: "heroicons:arrow-trending-up",
// // children: [],
// // },
// // {
// // href: "/contributor/schedule/event",
// // label: "event",
// // active: pathname.includes("/schedule/event"),
// // icon: "heroicons:shopping-cart",
// // children: [],
// // },
// // {
// // href: "/contributor/schedule/press-release",
// // label: t("press-release"),
// // active: pathname.includes("/schedule/press-release"),
// // icon: "heroicons:shopping-cart",
// // children: [],
// // },
// // {
// // href: "/contributor/schedule/calendar-polri",
// // label: t("calendar-polri"),
// // active: pathname.includes("/schedule/calendar-polri"),
// // icon: "heroicons:arrow-trending-up",
// // children: [],
// // },
// ],
// },
// ],
// },
// {
// href: "/contributor/schedule/press-release",
// label: t("press-release"),
// active: pathname.includes("/schedule/press-release"),
// icon: "heroicons:shopping-cart",
// children: [],
// groupLabel: "",
// id: "task",
// menus: [
// {
// id: "task",
// href: "/admin/task",
// label: t("task"),
// active: pathname.includes("/task"),
// icon: "fluent:clipboard-task-add-24-regular",
// submenus: [],
// },
// ],
// },
// {
// href: "/contributor/schedule/calendar-polri",
// label: t("calendar-polri"),
// active: pathname.includes("/schedule/calendar-polri"),
// icon: "heroicons:arrow-trending-up",
// children: [],
// groupLabel: "",
// id: "communication",
// menus: [
// {
// id: "communication",
// href: "/admin/shared/communication",
// label: t("communication"),
// active: pathname.includes("/communication"),
// icon: "token:chat",
// submenus: [],
// },
],
},
],
},
// ],
// },
...(roleId === 3
? [
{
groupLabel: "",
id: "task",
id: "tenant",
menus: [
{
id: "task",
href: "/admin/task",
label: t("task"),
active: pathname.includes("/task"),
icon: "fluent:clipboard-task-add-24-regular",
submenus: [],
},
],
},
{
groupLabel: "",
id: "communication",
menus: [
{
id: "communication",
href: "/admin/shared/communication",
label: t("communication"),
active: pathname.includes("/communication"),
id: "tenant",
href: "/admin/settings/tenant",
label: "Tenant",
active: pathname.includes("/tenant"),
icon: "token:chat",
submenus: [],
},
],
},
]
: []),
...(roleId === 2
? [
{
groupLabel: "Settings",
id: "settings",
@ -230,17 +273,20 @@ export function getMenuList(pathname: string, t: any): Group[] {
icon: "ic:outline-image",
children: [],
},
{
href: "/admin/settings/tenant",
label: "Tenant",
active: pathname.includes("/tenant"),
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;
}

41
service/auth.ts
View File

@ -7,25 +7,25 @@ import {
postAPIWithJson,
} from "./http-config/http-interceptor-service";
export interface CreateUserPayload {
address: string;
clientId: string;
dateOfBirth: string;
email: string;
fullName: string;
genderType: string;
identityGroup: string;
identityGroupNumber: string;
identityNumber: string;
identityType: string;
lastEducation: string;
password: string;
phoneNumber: string;
userLevelId: number;
userRoleId: number;
username: string;
workType: string;
}
// export interface CreateUserPayload {
// address: string;
// clientId: string;
// dateOfBirth: string;
// email: string;
// fullName: string;
// genderType: string;
// identityGroup: string;
// identityGroupNumber: string;
// identityNumber: string;
// identityType: string;
// lastEducation: string;
// password: string;
// phoneNumber: string;
// userLevelId: number;
// userRoleId: number;
// username: string;
// workType: string;
// }
export interface RequestOtpPayload {
email: string;
@ -201,7 +201,7 @@ export async function getDataPersonil(nrp: any) {
return httpGetInterceptor(url);
}
export async function createUser(data: CreateUserPayload) {
export async function createUser(data: any) {
const url = "users";
return httpPost(url, data);
}
@ -214,4 +214,3 @@ export async function registerTenant(data: any) {
const url = "clients/with-user";
return httpPost(url, data);
}

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

@ -21,6 +21,29 @@ export async function AdministrationUserList(
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() {
const url = "users/user-levels/list";
return httpGetInterceptor(url);