WIP feat(admin-devices): enhance device management from admin with dynamic filters and improved blocking functionality

This commit is contained in:
2025-06-30 15:16:36 +05:00
parent 0157eccd57
commit 01b064aee7
7 changed files with 266 additions and 307 deletions

View File

@ -1,8 +1,8 @@
"use server";
import { revalidatePath } from "next/cache";
import type { GroupProfile, MacAddress, OmadaResponse } from "@/lib/types";
import { formatMacAddress } from "@/lib/utils";
import { revalidatePath } from "next/cache";
async function fetchOmadaGroupProfiles(siteId: string): Promise<OmadaResponse> {
if (!siteId) {

View File

@ -51,13 +51,6 @@ export default async function Devices({
label: "Vendor",
type: "string",
placeholder: "Enter vendor name",
}, {
label: "Amount of Devices",
name: "amount",
type: "dual-range-slider",
min: 1,
max: 100,
sliderLabel: "MVR"
}
]}
/>

View File

@ -1,9 +1,7 @@
import { AdminDevicesTable } from "@/components/admin/admin-devices-table";
import Search from "@/components/search";
import { Suspense } from "react";
import { AdminDevicesTable } from "@/components/admin/admin-devices-table";
import DynamicFilter from "@/components/generic-filter";
import Search from "@/components/search";
export default async function UserDevices({
searchParams,
@ -19,17 +17,37 @@ export default async function UserDevices({
return (
<div>
<div className="flex justify-between items-center border rounded-md border-dashed font-bold title-bg py-4 px-2 mb-4">
<h3 className="text-sarLinkOrange text-2xl">
User Devices
</h3>
<h3 className="text-sarLinkOrange text-2xl">User Devices</h3>
</div>
<div
id="user-filters"
className=" pb-4 gap-4 flex sm:flex-row flex-col items-start justify-start"
>
<Search />
<DynamicFilter
description="Filter devices by name, MAC address, or vendor."
title="Device Filter"
inputs={[
{
name: "name",
label: "Device Name",
type: "string",
placeholder: "Enter device name",
},
{
name: "mac",
label: "MAC Address",
type: "string",
placeholder: "Enter MAC address",
},
{
name: "vendor",
label: "Vendor",
type: "string",
placeholder: "Enter vendor name",
},
]}
/>
</div>
<Suspense key={query} fallback={"loading...."}>
<AdminDevicesTable parentalControl={true} searchParams={searchParams} />

View File

@ -1,204 +1,181 @@
// import {
// Table,
// TableBody,
// TableCaption,
// TableCell,
// TableFooter,
// TableHead,
// TableHeader,
// TableRow,
// } from "@/components/ui/table";
// import { headers } from "next/headers";
// import Link from "next/link";
// import BlockDeviceDialog from "../block-device-dialog";
// import DeviceCard from "../device-card";
// import Pagination from "../pagination";
import { HandCoins } from "lucide-react";
import Link from "next/link";
import { redirect } from "next/navigation";
import { getServerSession } from "next-auth";
import { authOptions } from "@/app/auth";
import {
Table,
TableBody,
TableCaption,
TableCell,
TableFooter,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table";
import { cn } from "@/lib/utils";
import { getDevices } from "@/queries/devices";
import { tryCatch } from "@/utils/tryCatch";
import AddDevicesToCartButton from "../add-devices-to-cart-button";
import BlockDeviceDialog from "../block-device-dialog";
import ClientErrorMessage from "../client-error-message";
import DeviceCard from "../device-card";
import Pagination from "../pagination";
export async function AdminDevicesTable({
searchParams,
parentalControl,
}: {
searchParams: Promise<{
query: string;
page: number;
sortBy: string;
[key: string]: unknown;
}>;
parentalControl?: boolean;
}) {
console.log(parentalControl);
// const session = await auth.api.getSession({
// headers: await headers(),
// });
// const isAdmin = session?.user.role === "ADMIN";
const query = (await searchParams)?.query || "";
const page = (await searchParams)?.page;
console.log(query, page);
// const sortBy = (await searchParams)?.sortBy || "asc";
// const totalDevices = await prisma.device.count({
// where: {
// OR: [
// {
// name: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// {
// mac: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// ],
// },
// });
const resolvedParams = await searchParams;
const session = await getServerSession(authOptions);
const isAdmin = session?.user?.is_superuser;
// const totalPages = Math.ceil(totalDevices / 10);
// const limit = 10;
// const offset = (Number(page) - 1) * limit || 0;
const page = Number.parseInt(resolvedParams.page as string) || 1;
const limit = 10;
const offset = (page - 1) * limit;
// const devices = await prisma.device.findMany({
// where: {
// OR: [
// {
// name: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// {
// mac: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// ],
// },
// include: {
// User: true,
// payments: true,
// },
// skip: offset,
// take: limit,
// orderBy: {
// name: `${sortBy}` as "asc" | "desc",
// },
// });
return null;
// return (
// <div>
// {devices.length === 0 ? (
// <div className="h-[calc(100svh-400px)] flex flex-col items-center justify-center my-4">
// <h3>No devices yet.</h3>
// </div>
// ) : (
// <>
// <div className="hidden sm:block">
// <Table className="overflow-scroll">
// <TableCaption>Table of all devices.</TableCaption>
// <TableHeader>
// <TableRow>
// <TableHead>Device Name</TableHead>
// <TableHead>User</TableHead>
// <TableHead>MAC Address</TableHead>
// <TableHead>isActive</TableHead>
// <TableHead>blocked</TableHead>
// <TableHead>blockedBy</TableHead>
// <TableHead>expiryDate</TableHead>
// </TableRow>
// </TableHeader>
// <TableBody className="overflow-scroll">
// {devices.map((device) => (
// <TableRow key={device.id}>
// <TableCell>
// <div className="flex flex-col items-start">
// <Link
// className="font-medium hover:underline"
// href={`/devices/${device.id}`}
// >
// {device.name}
// </Link>
// {device.isActive && (
// <span className="text-muted-foreground">
// Active until{" "}
// {new Date().toLocaleDateString("en-US", {
// month: "short",
// day: "2-digit",
// year: "numeric",
// })}
// </span>
// )}
// Build params object for getDevices
const apiParams: Record<string, string | number | undefined> = {};
for (const [key, value] of Object.entries(resolvedParams)) {
if (value !== undefined && value !== "") {
apiParams[key] = typeof value === "number" ? value : String(value);
}
}
apiParams.limit = limit;
apiParams.offset = offset;
// {device.blocked && (
// <div className="p-2 rounded border my-2">
// <span>Comment: </span>
// <p className="text-neutral-500">
// blocked because he was watching youtube
// </p>
// </div>
// )}
// </div>
// </TableCell>
// <TableCell className="font-medium">
// {device.User?.name}
// </TableCell>
const [error, devices] = await tryCatch(
getDevices(apiParams, true),
);
if (error) {
if (error.message === "UNAUTHORIZED") {
redirect("/auth/signin");
} else {
return <ClientErrorMessage message={error.message} />;
}
}
const { meta, data } = devices;
return (
<div>
{data?.length === 0 ? (
<div className="h-[calc(100svh-400px)] text-muted-foreground flex flex-col items-center justify-center my-4">
<h3>No devices.</h3>
</div>
) : (
<>
<div className="hidden sm:block">
<Table className="overflow-scroll">
<TableCaption>Table of all devices.</TableCaption>
<TableHeader>
<TableRow>
<TableHead>Device Name</TableHead>
<TableHead>User</TableHead>
<TableHead>MAC Address</TableHead>
<TableHead>Vendor</TableHead>
<TableHead>#</TableHead>
</TableRow>
</TableHeader>
<TableBody className="overflow-scroll">
{data?.map((device) => (
<TableRow
key={device.id}
>
<TableCell>
<div className="flex flex-col items-start">
<Link
className={cn(
"hover:underline font-semibold",
device.is_active ? "text-green-600" : "",
)}
href={`/devices/${device.id}`}
>
{device.name}
</Link>
{device.is_active ? (
<div className="text-muted-foreground">
Active until{" "}
<span className="font-semibold">
{new Date(device.expiry_date || "").toLocaleDateString(
"en-US",
{
month: "short",
day: "2-digit",
year: "numeric",
},
)}
</span>
</div>
) : (
<p className="text-muted-foreground">Device Inactive</p>
)}
{device.has_a_pending_payment && (
<Link href={`/payments/${device.pending_payment_id}`}>
<span className="bg-muted rounded px-2 p-1 mt-2 flex hover:underline items-center justify-center gap-2 text-muted-foreground">
Payment Pending{" "}
<HandCoins className="animate-pulse" size={14} />
</span>
</Link>
)}
// <TableCell className="font-medium">{device.mac}</TableCell>
// <TableCell>
// {device.isActive ? "Active" : "Inactive"}
// </TableCell>
// <TableCell>
// {device.blocked ? "Blocked" : "Not Blocked"}
// </TableCell>
// <TableCell>
// {device.blocked ? device.blockedBy : ""}
// </TableCell>
// <TableCell>
// {new Date().toLocaleDateString("en-US", {
// month: "short",
// day: "2-digit",
// year: "numeric",
// })}
// </TableCell>
// <TableCell>
// <BlockDeviceDialog
// admin={isAdmin}
// type={device.blocked ? "unblock" : "block"}
// device={device}
// />
// </TableCell>
// </TableRow>
// ))}
// </TableBody>
// <TableFooter>
// <TableRow>
// <TableCell colSpan={7}>
// {query.length > 0 && (
// <p className="text-sm text-muted-foreground">
// Showing {devices.length} locations for &quot;{query}
// &quot;
// </p>
// )}
// </TableCell>
// <TableCell className="text-muted-foreground">
// {totalDevices} devices
// </TableCell>
// </TableRow>
// </TableFooter>
// </Table>
// <Pagination totalPages={totalPages} currentPage={page} />
// </div>
// <div className="sm:hidden my-4">
// {devices.map((device) => (
// <DeviceCard
// parentalControl={parentalControl}
// key={device.id}
// device={device}
// />
// ))}
// </div>
// </>
// )}
// </div>
// );
{device.blocked_by === "ADMIN" && device.blocked && (
<div className="p-2 rounded border my-2 bg-white dark:bg-neutral-800 shadow">
<span className="font-semibold">Comment</span>
<p className="text-neutral-400">{device?.reason_for_blocking}</p>
</div>
)}
</div>
</TableCell>
<TableCell className="font-medium">{device.user}</TableCell>
<TableCell className="font-medium">{device.mac}</TableCell>
<TableCell className="font-medium">{device?.vendor}</TableCell>
<TableCell>
<BlockDeviceDialog
admin={isAdmin}
type={device.blocked ? "unblock" : "block"}
device={device}
/>
</TableCell>
</TableRow>
))}
</TableBody>
<TableFooter>
<TableRow>
<TableCell colSpan={5} className="text-muted-foreground">
{meta?.total === 1 ? (
<p className="text-center">
Total {meta?.total} device.
</p>
) : (
<p className="text-center">
Total {meta?.total} devices.
</p>
)}
</TableCell>
</TableRow>
</TableFooter>
</Table>
</div>
<div className="sm:hidden my-4">
{data?.map((device) => (
<DeviceCard
parentalControl={parentalControl}
key={device.id}
device={device}
/>
))}
</div>
<Pagination
totalPages={meta?.last_page}
currentPage={meta?.current_page}
/>
</>
)
}
</div >
);
}

View File

@ -1,5 +1,12 @@
"use client";
import { zodResolver } from "@hookform/resolvers/zod";
import { OctagonX } from "lucide-react";
import { useState } from "react";
import { type SubmitHandler, useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
import { blockDevice as BlockDeviceFromOmada } from "@/actions/omada-actions";
import { Button } from "@/components/ui/button";
import {
@ -14,13 +21,6 @@ import { Label } from "@/components/ui/label";
import type { Device } from "@/lib/backend-types";
import { cn } from "@/lib/utils";
import { blockDevice } from "@/queries/devices";
import { zodResolver } from "@hookform/resolvers/zod";
import { OctagonX } from "lucide-react";
import { useState } from "react";
import { type SubmitHandler, useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
import { TextShimmer } from "./ui/text-shimmer";
import { Textarea } from "./ui/textarea";
@ -44,7 +44,7 @@ export default function BlockDeviceDialog({
const onSubmit: SubmitHandler<z.infer<typeof validationSchema>> = (data) => {
setDisabled(true);
console.log(data);
console.log("data in block device dialog", data);
toast.promise(
blockDevice({
deviceId: String(device.id),
@ -59,8 +59,9 @@ export default function BlockDeviceDialog({
return "Blocked!";
},
error: (error) => {
console.error("Error blocking device:", error);
setDisabled(false);
return error || "Something went wrong";
return error.message || "Something went wrong";
},
},
);
@ -74,10 +75,10 @@ export default function BlockDeviceDialog({
onClick={() => {
setDisabled(true);
toast.promise(
BlockDeviceFromOmada({
macAddress: device.mac,
type: "unblock",
reason: "",
blockDevice({
blocked_by: "ADMIN",
deviceId: String(device.id),
reason_for_blocking: "",
}),
{
loading: "unblockinig...",
@ -85,9 +86,9 @@ export default function BlockDeviceDialog({
setDisabled(false);
return "Unblocked!";
},
error: () => {
error: (error) => {
setDisabled(false);
return "Something went wrong";
return error.message || "Something went wrong";
},
},
);
@ -96,84 +97,53 @@ export default function BlockDeviceDialog({
{disabled ? <TextShimmer>Unblocking</TextShimmer> : "Unblock"}
</Button>
) : (
<>
{!admin ? (
<Button
variant={"destructive"}
onClick={() => {
setDisabled(true);
toast.promise(
BlockDeviceFromOmada({
macAddress: device.mac,
type: "block",
reason: "",
blockedBy: "PARENT",
}),
{
loading: "blocking...",
success: () => {
setDisabled(false);
return "blocked!";
},
error: () => {
setDisabled(false);
return "Something went wrong";
},
},
);
}}
>
<OctagonX />
{disabled ? <TextShimmer>Blocking</TextShimmer> : "Block"}
</Button>
) : (
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>
<Button disabled={disabled} variant="destructive">
<OctagonX />
Block
</Button>
</DialogTrigger>
<DialogContent className="sm:max-w-[425px]">
<DialogHeader>
<DialogTitle>
Please provide a reason for blocking this device.
</DialogTitle>
</DialogHeader>
<form onSubmit={handleSubmit(onSubmit)}>
<div className="grid gap-4 py-4">
<div className="flex flex-col items-start gap-1">
<Label htmlFor="reason" className="text-right">
Reason for blocking
</Label>
<Textarea
rows={10}
{...register("reasonForBlocking")}
id="reasonForBlocking"
className={cn(
"col-span-5",
errors.reasonForBlocking && "ring-2 ring-red-500",
)}
/>
<span className="text-sm text-red-500">
{errors.reasonForBlocking?.message}
</span>
</div>
<div>
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>
<Button disabled={disabled} variant="destructive">
<OctagonX />
Block
</Button>
</DialogTrigger>
<DialogContent className="sm:max-w-[425px]">
<DialogHeader>
<DialogTitle className="text-muted-foreground">
Reason for blocking this device 🚫
</DialogTitle>
</DialogHeader>
<form onSubmit={handleSubmit(onSubmit)}>
<div className="grid gap-2 py-2">
<div className="flex flex-col items-start gap-4">
<Label htmlFor="reason" className="text-right text-muted-foreground">
Reason for blocking
</Label>
<Textarea
rows={10}
{...register("reasonForBlocking")}
id="reasonForBlocking"
className={cn(
"col-span-5",
errors.reasonForBlocking && "ring-2 ring-red-500",
)}
/>
<span className="text-sm text-red-500">
{errors.reasonForBlocking?.message}
</span>
</div>
<DialogFooter>
<Button
variant={"destructive"}
disabled={disabled}
type="submit"
>
Block
</Button>
</DialogFooter>
</form>
</DialogContent>
</Dialog>
)}
</>
</div>
<DialogFooter>
<Button
variant={"destructive"}
disabled={disabled}
type="submit"
>
Block
</Button>
</DialogFooter>
</form>
</DialogContent>
</Dialog>
</div>
)}
</div>
);

View File

@ -1,11 +1,11 @@
"use client";
import { useAtom } from "jotai";
import { HandCoins } from "lucide-react";
import Link from "next/link";
import { TableCell, TableRow } from "@/components/ui/table";
import { deviceCartAtom } from "@/lib/atoms";
import type { Device } from "@/lib/backend-types";
import { cn } from "@/lib/utils";
import { useAtom } from "jotai";
import { HandCoins } from "lucide-react";
import Link from "next/link";
import AddDevicesToCartButton from "./add-devices-to-cart-button";
import BlockDeviceDialog from "./block-device-dialog";
export default function ClickableRow({

View File

@ -1,12 +1,12 @@
"use server";
import { revalidatePath } from "next/cache";
import { getServerSession } from "next-auth";
import { authOptions } from "@/app/auth";
import type { AddDeviceFormState, initialState } from "@/components/user/add-device-dialog";
import type { ApiError, ApiResponse, Device } from "@/lib/backend-types";
import { checkSession } from "@/utils/session";
import { handleApiResponse } from "@/utils/tryCatch";
import { getServerSession } from "next-auth";
import { revalidatePath } from "next/cache";
type GetDevicesProps = {
name?: string;
@ -17,7 +17,7 @@ type GetDevicesProps = {
status?: string;
[key: string]: string | number | undefined; // Allow additional properties for flexibility
};
export async function getDevices(params: GetDevicesProps) {
export async function getDevices(params: GetDevicesProps, allDevices = false) {
const session = await checkSession();
// Build query string from all defined params
@ -27,7 +27,7 @@ export async function getDevices(params: GetDevicesProps) {
.join("&");
const response = await fetch(
`${process.env.SARLINK_API_BASE_URL}/api/devices/?${query}`,
`${process.env.SARLINK_API_BASE_URL}/api/devices/?${query}&all_devices=${allDevices}`,
{
method: "GET",
headers: {
@ -123,6 +123,7 @@ export async function blockDevice({
reason_for_blocking: string;
blocked_by: "ADMIN" | "PARENT";
}) {
console.log("Blocking device:", deviceId, reason_for_blocking, blocked_by);
const session = await getServerSession(authOptions);
const response = await fetch(
`${process.env.SARLINK_API_BASE_URL}/api/devices/${deviceId}/block/`,