Skip to content

Job application tracker and AI-powered job search assistant. Helps job seekers manage their search journey with AI resume review, job matching, task logging, and application analytics, all while keeping your data private.

Refactor companies, titles and locations pagination

Khuram Niaz15755c21edf9
diff --git a/src/components/admin/AdminTabsContainer.tsx b/src/components/admin/AdminTabsContainer.tsx
index d6da4dd..6e7c5c3 100644
--- a/src/components/admin/AdminTabsContainer.tsx
+++ b/src/components/admin/AdminTabsContainer.tsx
@@ -22,7 +22,7 @@ function AdminTabsContainer() {
);
const onTabChange = (tab: string) => {
- router.push(pathname + "?" + createQueryString("page", "1"));
+ router.push(pathname + "?" + createQueryString("tab", tab));
};
return (
<Tabs
@@ -31,13 +31,13 @@ function AdminTabsContainer() {
>
<TabsList>
<TabsTrigger value="companies">Companies</TabsTrigger>
- <TabsTrigger value="titles">Job Titles</TabsTrigger>
+ <TabsTrigger value="job-titles">Job Titles</TabsTrigger>
<TabsTrigger value="locations">Locations</TabsTrigger>
</TabsList>
<TabsContent value="companies">
- <CompaniesContainer createQueryString={createQueryString} />
+ <CompaniesContainer />
</TabsContent>
- <TabsContent value="titles">
+ <TabsContent value="job-titles">
<JobTitlesContainer />
</TabsContent>
<TabsContent value="locations">
diff --git a/src/components/admin/CompaniesContainer.tsx b/src/components/admin/CompaniesContainer.tsx
index f62a1fb..9474f41 100644
--- a/src/components/admin/CompaniesContainer.tsx
+++ b/src/components/admin/CompaniesContainer.tsx
@@ -7,29 +7,18 @@ import { Company } from "@/models/job.model";
import { getCompanyById, getCompanyList } from "@/actions/company.actions";
import { APP_CONSTANTS } from "@/lib/constants";
import Loading from "../Loading";
-import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { Button } from "../ui/button";
-function CompaniesContainer({
- createQueryString,
-}: {
- createQueryString: (name: string, value: string) => void;
-}) {
- const queryParams = useSearchParams();
- const router = useRouter();
- const pathname = usePathname();
+function CompaniesContainer() {
const [companies, setCompanies] = useState<Company[]>([]);
- const [totalCompanies, setTotalCompanies] = useState(0);
- const [currentPage, setCurrentPage] = useState(
- Number(queryParams.get("page")) || 1
- );
+ const [totalCompanies, setTotalCompanies] = useState<number>(0);
+ const [page, setPage] = useState<number>(1);
const [dialogOpen, setDialogOpen] = useState(false);
const [editCompany, setEditCompany] = useState(null);
- const [loading, setLoading] = useState(false);
+ const [loading, setLoading] = useState<boolean>(false);
const recordsPerPage = APP_CONSTANTS.RECORDS_PER_PAGE;
- const totalPages = Math.ceil(totalCompanies / recordsPerPage);
-
const loadCompanies = useCallback(
async (page: number) => {
setLoading(true);
@@ -38,26 +27,27 @@ function CompaniesContainer({
recordsPerPage,
"applied"
);
- setCompanies(data);
- setTotalCompanies(total);
if (data) {
+ setCompanies((prev) => (page === 1 ? data : [...prev, ...data]));
+ setTotalCompanies(total);
+ setPage(page);
setLoading(false);
}
},
[recordsPerPage]
);
- const reloadCompanies = (page = 1) => {
- loadCompanies(page);
- };
+ const reloadCompanies = useCallback(async () => {
+ await loadCompanies(1);
+ }, [loadCompanies]);
const resetEditCompany = () => {
setEditCompany(null);
};
useEffect(() => {
- loadCompanies(currentPage);
- }, [currentPage, loadCompanies]);
+ (async () => await loadCompanies(1))();
+ }, [loadCompanies]);
const onEditCompany = async (companyId: string) => {
const company = await getCompanyById(companyId);
@@ -65,11 +55,6 @@ function CompaniesContainer({
setDialogOpen(true);
};
- const onPageChange = (page: number) => {
- setCurrentPage(page);
- router.push(pathname + "?" + createQueryString("page", page.toString()));
- };
-
return (
<>
<div className="col-span-3">
@@ -89,19 +74,36 @@ function CompaniesContainer({
</div>
</CardHeader>
<CardContent>
- {!loading ? (
- <CompaniesTable
- companies={companies}
- reloadCompanies={reloadCompanies}
- currentPage={currentPage}
- totalPages={totalPages}
- recordsPerPage={recordsPerPage}
- totalCompanies={totalCompanies}
- onPageChange={onPageChange}
- editCompany={onEditCompany}
- />
- ) : (
- <Loading />
+ {loading && <Loading />}
+ {companies.length && (
+ <>
+ <CompaniesTable
+ companies={companies}
+ reloadCompanies={reloadCompanies}
+ editCompany={onEditCompany}
+ />
+ <div className="text-xs text-muted-foreground">
+ Showing{" "}
+ <strong>
+ {1} to {companies.length}
+ </strong>{" "}
+ of
+ <strong> {totalCompanies}</strong> companies
+ </div>
+ </>
+ )}
+ {companies.length < totalCompanies && (
+ <div className="flex justify-center p-4">
+ <Button
+ size="sm"
+ variant="outline"
+ onClick={() => loadCompanies(page + 1)}
+ disabled={loading}
+ className="btn btn-primary"
+ >
+ {loading ? "Loading..." : "Load More"}
+ </Button>
+ </div>
)}
</CardContent>
</Card>
diff --git a/src/components/admin/CompaniesTable.tsx b/src/components/admin/CompaniesTable.tsx
index d6bee2d..adf915d 100644
--- a/src/components/admin/CompaniesTable.tsx
+++ b/src/components/admin/CompaniesTable.tsx
@@ -1,5 +1,5 @@
"use client";
-import { Button, buttonVariants } from "../ui/button";
+import { Button } from "../ui/button";
import Image from "next/image";
import {
DropdownMenu,
@@ -18,22 +18,15 @@ import {
} from "../ui/table";
import { Company } from "@/models/job.model";
import { MoreHorizontal, Pencil, Trash } from "lucide-react";
-import { TablePagination } from "../TablePagination";
import { useState } from "react";
import { AlertDialog } from "../ui/alert-dialog";
import { deleteCompanyById } from "@/actions/company.actions";
import { toast } from "../ui/use-toast";
-import { redirect } from "next/navigation";
import { DeleteAlertDialog } from "../DeleteAlertDialog";
type CompaniesTableProps = {
companies: Company[];
- reloadCompanies: (p: number) => void;
- currentPage: number;
- totalPages: number;
- totalCompanies: number;
- recordsPerPage: number;
- onPageChange: (n: number) => void;
+ reloadCompanies: () => void;
editCompany: (id: string) => void;
};
@@ -48,19 +41,12 @@ type AlertDialog = {
function CompaniesTable({
companies,
reloadCompanies,
- currentPage,
- totalPages,
- totalCompanies,
- recordsPerPage,
- onPageChange,
editCompany,
}: CompaniesTableProps) {
const [alert, setAlert] = useState<AlertDialog>({
openState: false,
deleteAction: false,
});
- const startPostIndex = (currentPage - 1) * recordsPerPage + 1;
- const endPostIndex = Math.min(currentPage * recordsPerPage, totalCompanies);
const onDeleteCompany = (company: Company) => {
if (company._count?.jobsApplied! > 0) {
@@ -91,7 +77,7 @@ function CompaniesTable({
variant: "success",
description: `Company has been deleted successfully`,
});
- reloadCompanies(currentPage);
+ reloadCompanies();
} else {
toast({
variant: "destructive",
@@ -171,21 +157,6 @@ function CompaniesTable({
})}
</TableBody>
</Table>
- <div className="text-xs text-muted-foreground">
- Showing{" "}
- <strong>
- {startPostIndex} to {endPostIndex}
- </strong>{" "}
- of
- <strong> {totalCompanies}</strong> companies
- </div>
- {totalCompanies > recordsPerPage && (
- <TablePagination
- currentPage={currentPage}
- totalPages={totalPages}
- onPageChange={onPageChange}
- />
- )}
<DeleteAlertDialog
pageTitle="company"
open={alert.openState}
diff --git a/src/components/admin/JobLocationsContainer.tsx b/src/components/admin/JobLocationsContainer.tsx
index 42e09dc..c7ebe3c 100644
--- a/src/components/admin/JobLocationsContainer.tsx
+++ b/src/components/admin/JobLocationsContainer.tsx
@@ -5,41 +5,42 @@ import { APP_CONSTANTS } from "@/lib/constants";
import { JobTitle } from "@prisma/client";
import JobLocationsTable from "./JobLocationsTable";
import { getJobLocationsList } from "@/actions/jobLocation.actions";
+import Loading from "../Loading";
+import { Button } from "../ui/button";
function JobLocationsContainer() {
- const [Locations, setLocations] = useState<JobTitle[]>([]);
- const [totalJobLocations, setTotalJobLocations] = useState(0);
- const [currentPage, setCurrentPage] = useState(1);
- const [editJobLocation, setEditJobLocation] = useState(null);
+ const [locations, setLocations] = useState<JobTitle[]>([]);
+ const [totalJobLocations, setTotalJobLocations] = useState<number>(0);
+ const [page, setPage] = useState<number>(1);
+ const [loading, setLoading] = useState<boolean>(false);
const recordsPerPage = APP_CONSTANTS.RECORDS_PER_PAGE;
- const totalPages = Math.ceil(totalJobLocations / recordsPerPage);
-
const loadJobLocations = useCallback(
async (page: number) => {
+ setLoading(true);
const { data, total } = await getJobLocationsList(
page,
recordsPerPage,
"applied"
);
- setLocations(data);
- setTotalJobLocations(total);
+ if (data) {
+ setLocations((prev) => (page === 1 ? data : [...prev, ...data]));
+ setTotalJobLocations(total);
+ setPage(page);
+ setLoading(false);
+ }
},
[recordsPerPage]
);
- const reloadJobLocations = () => {
- loadJobLocations(1);
- };
-
- const resetEditJobLocation = () => {
- setEditJobLocation(null);
- };
+ const reloadJobLocations = useCallback(async () => {
+ await loadJobLocations(1);
+ }, [loadJobLocations]);
useEffect(() => {
- loadJobLocations(currentPage);
- }, [currentPage, loadJobLocations]);
+ (async () => await loadJobLocations(1))();
+ }, [loadJobLocations]);
return (
<>
@@ -54,14 +55,36 @@ function JobLocationsContainer() {
</div>
</CardHeader>
<CardContent>
- <JobLocationsTable
- jobLocations={Locations}
- currentPage={currentPage}
- totalPages={totalPages}
- recordsPerPage={recordsPerPage}
- totalJobLocations={totalJobLocations}
- onPageChange={setCurrentPage}
- />
+ {loading && <Loading />}
+ {locations.length && (
+ <>
+ <JobLocationsTable
+ jobLocations={locations}
+ reloadJobLocations={reloadJobLocations}
+ />
+ <div className="text-xs text-muted-foreground">
+ Showing{" "}
+ <strong>
+ {1} to {locations.length}
+ </strong>{" "}
+ of
+ <strong> {totalJobLocations}</strong> job locations
+ </div>
+ </>
+ )}
+ {locations.length < totalJobLocations && (
+ <div className="flex justify-center p-4">
+ <Button
+ size="sm"
+ variant="outline"
+ onClick={() => loadJobLocations(page + 1)}
+ disabled={loading}
+ className="btn btn-primary"
+ >
+ {loading ? "Loading..." : "Load More"}
+ </Button>
+ </div>
+ )}
</CardContent>
</Card>
</div>
diff --git a/src/components/admin/JobLocationsTable.tsx b/src/components/admin/JobLocationsTable.tsx
index 3ec2cb6..b73ce44 100644
--- a/src/components/admin/JobLocationsTable.tsx
+++ b/src/components/admin/JobLocationsTable.tsx
@@ -16,33 +16,18 @@ import {
TableHeader,
TableRow,
} from "../ui/table";
-import { JobLocation, JobTitle } from "@/models/job.model";
+import { JobLocation } from "@/models/job.model";
import { MoreHorizontal } from "lucide-react";
-import { TablePagination } from "../TablePagination";
type JobLocationsTableProps = {
jobLocations: JobLocation[];
- currentPage: number;
- totalPages: number;
- totalJobLocations: number;
- recordsPerPage: number;
- onPageChange: (n: number) => void;
+ reloadJobLocations: () => void;
};
function JobLocationsTable({
jobLocations,
- currentPage,
- totalPages,
- totalJobLocations,
- recordsPerPage,
- onPageChange,
+ reloadJobLocations,
}: JobLocationsTableProps) {
- const startPostIndex = (currentPage - 1) * recordsPerPage + 1;
- const endPostIndex = Math.min(
- currentPage * recordsPerPage,
- totalJobLocations
- );
-
return (
<>
<Table>
@@ -87,21 +72,6 @@ function JobLocationsTable({
})}
</TableBody>
</Table>
- <div className="text-xs text-muted-foreground">
- Showing{" "}
- <strong>
- {startPostIndex} to {endPostIndex}
- </strong>{" "}
- of
- <strong> {totalJobLocations}</strong> locations
- </div>
- {totalJobLocations > recordsPerPage && (
- <TablePagination
- currentPage={currentPage}
- totalPages={totalPages}
- onPageChange={onPageChange}
- />
- )}
</>
);
}
diff --git a/src/components/admin/JobTitlesContainer.tsx b/src/components/admin/JobTitlesContainer.tsx
index 48ce1be..f741e38 100644
--- a/src/components/admin/JobTitlesContainer.tsx
+++ b/src/components/admin/JobTitlesContainer.tsx
@@ -5,41 +5,42 @@ import { APP_CONSTANTS } from "@/lib/constants";
import { JobTitle } from "@prisma/client";
import JobTitlesTable from "./JobTitlesTable";
import { getJobTitleList } from "@/actions/jobtitle.actions";
+import Loading from "../Loading";
+import { Button } from "../ui/button";
function JobTitlesContainer() {
const [titles, setTitles] = useState<JobTitle[]>([]);
- const [totalJobTitles, setTotalJobTitles] = useState(0);
- const [currentPage, setCurrentPage] = useState(1);
- const [editJobTitle, setEditJobTitle] = useState(null);
+ const [totalJobTitles, setTotalJobTitles] = useState<number>(0);
+ const [page, setPage] = useState<number>(1);
+ const [loading, setLoading] = useState<boolean>(false);
const recordsPerPage = APP_CONSTANTS.RECORDS_PER_PAGE;
- const totalPages = Math.ceil(totalJobTitles / recordsPerPage);
-
const loadJobTitles = useCallback(
async (page: number) => {
+ setLoading(true);
const { data, total } = await getJobTitleList(
page,
recordsPerPage,
"applied"
);
- setTitles(data);
- setTotalJobTitles(total);
+ if (data) {
+ setTitles((prev) => (page === 1 ? data : [...prev, ...data]));
+ setTotalJobTitles(total);
+ setPage(page);
+ setLoading(false);
+ }
},
[recordsPerPage]
);
- const reloadJobTitles = () => {
- loadJobTitles(1);
- };
-
- const resetEditJobTitle = () => {
- setEditJobTitle(null);
- };
+ const reloadJobTitles = useCallback(async () => {
+ await loadJobTitles(1);
+ }, [loadJobTitles]);
useEffect(() => {
- loadJobTitles(currentPage);
- }, [currentPage, loadJobTitles]);
+ (async () => await loadJobTitles(1))();
+ }, [loadJobTitles]);
return (
<>
@@ -54,14 +55,36 @@ function JobTitlesContainer() {
</div>
</CardHeader>
<CardContent>
- <JobTitlesTable
- jobTitles={titles}
- currentPage={currentPage}
- totalPages={totalPages}
- recordsPerPage={recordsPerPage}
- totalJobTitles={totalJobTitles}
- onPageChange={setCurrentPage}
- />
+ {loading && <Loading />}
+ {titles.length && (
+ <>
+ <JobTitlesTable
+ jobTitles={titles}
+ reloadJobTitles={reloadJobTitles}
+ />
+ <div className="text-xs text-muted-foreground">
+ Showing{" "}
+ <strong>
+ {1} to {titles.length}
+ </strong>{" "}
+ of
+ <strong> {totalJobTitles}</strong> job titles
+ </div>
+ </>
+ )}
+ {titles.length < totalJobTitles && (
+ <div className="flex justify-center p-4">
+ <Button
+ size="sm"
+ variant="outline"
+ onClick={() => loadJobTitles(page + 1)}
+ disabled={loading}
+ className="btn btn-primary"
+ >
+ {loading ? "Loading..." : "Load More"}
+ </Button>
+ </div>
+ )}
</CardContent>
</Card>
</div>
diff --git a/src/components/admin/JobTitlesTable.tsx b/src/components/admin/JobTitlesTable.tsx
index f64bd58..1cf1cf2 100644
--- a/src/components/admin/JobTitlesTable.tsx
+++ b/src/components/admin/JobTitlesTable.tsx
@@ -17,29 +17,14 @@ import {
TableRow,
} from "../ui/table";
import { JobTitle } from "@/models/job.model";
-import { MoreHorizontal, Pencil } from "lucide-react";
-import { TablePagination } from "../TablePagination";
+import { MoreHorizontal } from "lucide-react";
type JobTitlesTableProps = {
jobTitles: JobTitle[];
- currentPage: number;
- totalPages: number;
- totalJobTitles: number;
- recordsPerPage: number;
- onPageChange: (n: number) => void;
+ reloadJobTitles: () => void;
};
-function JobTitlesTable({
- jobTitles,
- currentPage,
- totalPages,
- totalJobTitles,
- recordsPerPage,
- onPageChange,
-}: JobTitlesTableProps) {
- const startPostIndex = (currentPage - 1) * recordsPerPage + 1;
- const endPostIndex = Math.min(currentPage * recordsPerPage, totalJobTitles);
-
+function JobTitlesTable({ jobTitles, reloadJobTitles }: JobTitlesTableProps) {
return (
<>
<Table>
@@ -84,21 +69,6 @@ function JobTitlesTable({
})}
</TableBody>
</Table>
- <div className="text-xs text-muted-foreground">
- Showing{" "}
- <strong>
- {startPostIndex} to {endPostIndex}
- </strong>{" "}
- of
- <strong> {totalJobTitles}</strong> titles
- </div>
- {totalJobTitles > recordsPerPage && (
- <TablePagination
- currentPage={currentPage}
- totalPages={totalPages}
- onPageChange={onPageChange}
- />
- )}
</>
);
}