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.

feat(myjobs): restyle title/company links, add job-type/workplace/salary info, promote row shortcuts, fix company back nav

Khuram Niaz03fbdddeb292
diff --git a/__tests__/CompanyDetails.spec.tsx b/__tests__/CompanyDetails.spec.tsx
index c43baac..c71db22 100644
--- a/__tests__/CompanyDetails.spec.tsx
+++ b/__tests__/CompanyDetails.spec.tsx
@@ -111,21 +111,12 @@ describe("CompanyDetails – header", () => {
expect(screen.getByRole("heading", { name: "Stripe" }).nextElementSibling).toBeNull();
});
- it("goes back to the Library companies tab", () => {
+ it("goes back using browser history", async () => {
render(<CompanyDetails details={makeDetails()} />);
- expect(
- screen.getByRole("link", { name: /back to companies/i }),
- ).toHaveAttribute("href", "/dashboard/admin?tab=companies");
- });
-
- it("returns to the watchlist scope it was opened from", () => {
- searchParams = new URLSearchParams("scope=watchlist");
- render(<CompanyDetails details={makeDetails()} />);
+ await user.click(screen.getByRole("button", { name: /back to companies/i }));
- expect(
- screen.getByRole("link", { name: /back to companies/i }),
- ).toHaveAttribute("href", "/dashboard/admin?tab=companies&scope=watchlist");
+ expect(router.back).toHaveBeenCalled();
});
it("watches the company and refreshes the page", async () => {
diff --git a/__tests__/MyJobsGrid.spec.tsx b/__tests__/MyJobsGrid.spec.tsx
index 11e1312..e67e312 100644
--- a/__tests__/MyJobsGrid.spec.tsx
+++ b/__tests__/MyJobsGrid.spec.tsx
@@ -84,8 +84,7 @@ describe("MyJobsGrid", () => {
}),
]);
- await user.click(screen.getAllByTestId("job-actions-menu-btn")[1]);
- await user.click(screen.getByText("Delete"));
+ await user.click(screen.getAllByRole("button", { name: "Delete Job" })[1]);
expect(
screen.getByText("Are you sure you want to delete this job?"),
diff --git a/__tests__/MyJobsTable.spec.tsx b/__tests__/MyJobsTable.spec.tsx
index 3c9b321..66281a2 100644
--- a/__tests__/MyJobsTable.spec.tsx
+++ b/__tests__/MyJobsTable.spec.tsx
@@ -167,8 +167,7 @@ describe("MyJobsTable", () => {
it("calls editJob with the job id when Edit Job is clicked", async () => {
const { editJob } = renderTable([makeJob()]);
- await user.click(screen.getByTestId("job-actions-menu-btn"));
- await user.click(screen.getByText("Edit Job"));
+ await user.click(screen.getByRole("button", { name: "Edit Job" }));
expect(editJob).toHaveBeenCalledWith("job-1");
});
@@ -185,8 +184,7 @@ describe("MyJobsTable", () => {
it("opens the delete confirmation dialog and calls deleteJob on confirm", async () => {
const { deleteJob } = renderTable([makeJob()]);
- await user.click(screen.getByTestId("job-actions-menu-btn"));
- await user.click(screen.getByText("Delete"));
+ await user.click(screen.getByRole("button", { name: "Delete Job" }));
expect(
screen.getByText("Are you sure you want to delete this job?"),
diff --git a/e2e/add-job.spec.ts b/e2e/add-job.spec.ts
index e4c8f82..3aa8d9e 100644
--- a/e2e/add-job.spec.ts
+++ b/e2e/add-job.spec.ts
@@ -15,10 +15,9 @@ test.describe("Add New Job", () => {
await page
.getByRole("row", { name: jobText })
- .getByTestId("job-actions-menu-btn")
+ .getByRole("button", { name: "Edit Job" })
.first()
.click();
- await page.getByRole("menuitem", { name: "Edit Job" }).click();
await expect(
page.getByPlaceholder("Copy and paste job link here"),
).toHaveValue("www.google.com");
@@ -54,10 +53,9 @@ test.describe("Add New Job", () => {
await page
.getByRole("row", { name: jobText })
- .getByTestId("job-actions-menu-btn")
+ .getByRole("button", { name: "Delete Job" })
.first()
.click();
- await page.getByRole("menuitem", { name: "Delete" }).click();
await page.getByRole("button", { name: "Delete" }).click();
await expect(page.getByRole("row", { name: jobText })).not.toBeVisible();
@@ -70,10 +68,9 @@ test.describe("Add New Job", () => {
await page
.getByRole("row", { name: jobText })
- .getByTestId("job-actions-menu-btn")
+ .getByRole("button", { name: "Edit Job" })
.first()
.click();
- await page.getByRole("menuitem", { name: "Edit Job" }).click();
await expect(
page.getByPlaceholder("Copy and paste job link here"),
).toHaveValue("");
@@ -93,10 +90,9 @@ test.describe("Add New Job", () => {
await page
.getByRole("row", { name: jobText })
- .getByTestId("job-actions-menu-btn")
+ .getByRole("button", { name: "Edit Job" })
.first()
.click();
- await page.getByRole("menuitem", { name: "Edit Job" }).click();
await expect(page.getByRole("switch")).toBeChecked();
await expect(page.getByLabel("Select Job Status")).toContainText("Applied");
await expect(page.getByLabel("Date Applied")).toContainText(
@@ -126,10 +122,9 @@ test.describe("Add New Job", () => {
await page
.getByRole("row", { name: jobText })
- .getByTestId("job-actions-menu-btn")
+ .getByRole("button", { name: "Edit Job" })
.first()
.click();
- await page.getByRole("menuitem", { name: "Edit Job" }).click();
await expect(page.getByLabel("Salary Range")).toContainText(salary);
});
@@ -147,10 +142,9 @@ test.describe("Add New Job", () => {
await page
.getByRole("row", { name: jobText })
- .getByTestId("job-actions-menu-btn")
+ .getByRole("button", { name: "Edit Job" })
.first()
.click();
- await page.getByRole("menuitem", { name: "Edit Job" }).click();
await expect(page.getByRole("radio", { name: "Remote" })).toBeChecked();
});
@@ -171,10 +165,9 @@ test.describe("Add New Job", () => {
await page
.getByRole("row", { name: jobText })
- .getByTestId("job-actions-menu-btn")
+ .getByRole("button", { name: "Edit Job" })
.first()
.click();
- await page.getByRole("menuitem", { name: "Edit Job" }).click();
await expect(page.getByLabel("Due Date")).toContainText(expectedDueDate);
});
@@ -188,10 +181,9 @@ test.describe("Add New Job", () => {
await page
.getByRole("row", { name: jobText })
- .getByTestId("job-actions-menu-btn")
+ .getByRole("button", { name: "Edit Job" })
.first()
.click();
- await page.getByRole("menuitem", { name: "Edit Job" }).click();
await expect(page.getByTestId("add-job-dialog-title")).toBeVisible();
await page.getByRole("button", { name: "New Note" }).click();
@@ -336,10 +328,9 @@ test.describe("Add New Job", () => {
await page
.getByRole("row", { name: jobText })
- .getByTestId("job-actions-menu-btn")
+ .getByRole("button", { name: "Edit Job" })
.first()
.click();
- await page.getByRole("menuitem", { name: "Edit Job" }).click();
await expect(page.getByLabel("Job Title")).toContainText(jobText);
await expect(page.getByLabel("Company")).toContainText(`company ${suffix}`);
await expect(page.getByLabel("Job Location")).toContainText(
@@ -418,10 +409,9 @@ test.describe("Add New Job", () => {
await page
.getByRole("row", { name: jobText })
- .getByTestId("job-actions-menu-btn")
+ .getByRole("button", { name: "Edit Job" })
.first()
.click();
- await page.getByRole("menuitem", { name: "Edit Job" }).click();
await expect(page.getByTestId("add-job-dialog-title")).toBeVisible();
await expect(page.getByText(tagText, { exact: true })).toBeVisible();
});
diff --git a/src/actions/job/queries.ts b/src/actions/job/queries.ts
index 5f89fce..a4eaaec 100644
--- a/src/actions/job/queries.ts
+++ b/src/actions/job/queries.ts
@@ -13,6 +13,7 @@ const JOB_LIST_SELECT = {
JobTitle: true,
jobType: true,
workplaceType: true,
+ salaryRange: true,
Company: true,
Status: true,
Location: true,
diff --git a/src/components/admin/CompanyDetails.tsx b/src/components/admin/CompanyDetails.tsx
index 70d4673..01bedef 100644
--- a/src/components/admin/CompanyDetails.tsx
+++ b/src/components/admin/CompanyDetails.tsx
@@ -43,6 +43,7 @@ function CompanyDetails({ details }: CompanyDetailsProps) {
searchParams.get("scope") === "watchlist"
? `${LIBRARY_COMPANIES}&scope=watchlist`
: LIBRARY_COMPANIES;
+ const goBack = () => router.back();
const [activeTab, handleTabChange] = useTabQueryParam(
COMPANY_DETAIL_TABS,
"jobs",
@@ -112,7 +113,7 @@ function CompanyDetails({ details }: CompanyDetailsProps) {
<div className="py-6 space-y-6">
<CompanyDetailsHeader
company={details}
- backHref={backHref}
+ onBack={goBack}
onToggleWatch={toggleWatch}
onEdit={openEdit}
onDelete={onDelete}
diff --git a/src/components/admin/company-details/CompanyDetailsHeader.tsx b/src/components/admin/company-details/CompanyDetailsHeader.tsx
index e8299e1..38389d6 100644
--- a/src/components/admin/company-details/CompanyDetailsHeader.tsx
+++ b/src/components/admin/company-details/CompanyDetailsHeader.tsx
@@ -1,6 +1,5 @@
"use client";
-import Link from "next/link";
import {
ArrowLeft,
ExternalLink,
@@ -27,7 +26,7 @@ import { hostnameOf } from "./hostname";
type CompanyDetailsHeaderProps = {
company: Company;
- backHref: string;
+ onBack: () => void;
onToggleWatch: () => void;
onEdit: () => void;
onDelete: () => void;
@@ -35,7 +34,7 @@ type CompanyDetailsHeaderProps = {
export function CompanyDetailsHeader({
company,
- backHref,
+ onBack,
onToggleWatch,
onEdit,
onDelete,
@@ -60,10 +59,14 @@ export function CompanyDetailsHeader({
return (
<div className="flex flex-col gap-4 @5xl/main:flex-row @5xl/main:items-center">
<div className="flex flex-1 min-w-0 items-center gap-4">
- <Button variant="ghost" size="icon" title="Go Back" asChild>
- <Link href={backHref} aria-label="Back to Companies">
- <ArrowLeft className="h-4 w-4" />
- </Link>
+ <Button
+ variant="ghost"
+ size="icon"
+ title="Go Back"
+ aria-label="Back to Companies"
+ onClick={onBack}
+ >
+ <ArrowLeft className="h-4 w-4" />
</Button>
<CompanyLogo
logoUrl={company.logoUrl}
diff --git a/src/components/myjobs/JobActionsMenu.tsx b/src/components/myjobs/JobActionsMenu.tsx
index 096b7a4..88367f8 100644
--- a/src/components/myjobs/JobActionsMenu.tsx
+++ b/src/components/myjobs/JobActionsMenu.tsx
@@ -1,5 +1,5 @@
"use client";
-import { ListCollapse, MoreVertical, Pencil, StickyNote, Tags, Trash } from "lucide-react";
+import { ListCollapse, MoreVertical, StickyNote, Tags } from "lucide-react";
import { useRouter } from "next/navigation";
import {
DropdownMenu,
@@ -21,19 +21,15 @@ import { JobStatusMenuItems } from "./JobStatusMenuItems";
type JobActionsMenuProps = {
job: JobResponse;
jobStatuses: JobStatus[];
- editJob: (id: string) => void;
onChangeJobStatus: (id: string, status: JobStatus) => void;
onAddNote: (jobId: string) => void;
- onDeleteJob: (jobId: string) => void;
};
export function JobActionsMenu({
job,
jobStatuses,
- editJob,
onChangeJobStatus,
onAddNote,
- onDeleteJob,
}: JobActionsMenuProps) {
const router = useRouter();
@@ -60,13 +56,6 @@ export function JobActionsMenu({
<ListCollapse className="mr-2 h-4 w-4" />
View Details
</DropdownMenuItem>
- <DropdownMenuItem
- className="cursor-pointer"
- onClick={() => editJob(job.id)}
- >
- <Pencil className="mr-2 h-4 w-4" />
- Edit Job
- </DropdownMenuItem>
<DropdownMenuItem
className="cursor-pointer"
onClick={() => onAddNote(job.id)}
@@ -90,14 +79,6 @@ export function JobActionsMenu({
</DropdownMenuSubContent>
</DropdownMenuPortal>
</DropdownMenuSub>
- <DropdownMenuSeparator />
- <DropdownMenuItem
- className="text-red-600 cursor-pointer"
- onClick={() => onDeleteJob(job.id)}
- >
- <Trash className="mr-2 h-4 w-4" />
- Delete
- </DropdownMenuItem>
</DropdownMenuGroup>
</DropdownMenuContent>
</DropdownMenu>
diff --git a/src/components/myjobs/JobCard.tsx b/src/components/myjobs/JobCard.tsx
index eb77b84..22a3066 100644
--- a/src/components/myjobs/JobCard.tsx
+++ b/src/components/myjobs/JobCard.tsx
@@ -1,10 +1,24 @@
"use client";
-import { Calendar, MapPin, PlusCircle, StickyNote } from "lucide-react";
+import {
+ Calendar,
+ DollarSign,
+ MapPin,
+ Pencil,
+ PlusCircle,
+ StickyNote,
+ Trash,
+} from "lucide-react";
import { format } from "date-fns";
import Link from "next/link";
import { Badge } from "../ui/badge";
+import { Button } from "../ui/button";
import { CircularScore } from "@/components/CircularScore";
-import { JobResponse, JobStatus } from "@/models/job.model";
+import {
+ JobResponse,
+ JobStatus,
+ getJobTypeLabel,
+ getWorkplaceTypeLabel,
+} from "@/models/job.model";
import { JobStatusBadge } from "./JobStatusBadge";
import { JobActionsMenu } from "./JobActionsMenu";
import { MatchJobButton } from "./MatchJobButton";
@@ -40,7 +54,7 @@ export function JobCard({
<div className="flex items-center gap-1.5">
<Link
href={`/dashboard/myjobs/${job?.id}`}
- className="truncate font-semibold"
+ className="truncate font-semibold text-primary underline-offset-4 hover:underline"
>
{job.JobTitle?.label}
</Link>
@@ -54,9 +68,18 @@ export function JobCard({
</Badge>
)}
</div>
- <p className="truncate text-sm text-muted-foreground">
- {job.Company?.label}
- </p>
+ {job.Company?.id ? (
+ <Link
+ href={`/dashboard/admin/companies/${job.Company.id}`}
+ className="block truncate text-sm text-teal-600 underline-offset-4 hover:underline"
+ >
+ {job.Company.label}
+ </Link>
+ ) : (
+ <p className="truncate text-sm text-muted-foreground">
+ {job.Company?.label}
+ </p>
+ )}
</div>
{job.matchScore != null ? (
<CircularScore score={job.matchScore} size="sm" animate={false} />
@@ -82,18 +105,53 @@ export function JobCard({
<span className="truncate">{job.JobSource.label}</span>
</span>
)}
+ {job.salaryRange && (
+ <span className="flex min-w-0 items-center gap-1">
+ <DollarSign className="h-3.5 w-3.5 shrink-0" />
+ <span className="truncate">{job.salaryRange}</span>
+ </span>
+ )}
</div>
- <div className="mt-auto flex items-center justify-between border-t pt-3">
- <JobStatusBadge job={job} />
- <JobActionsMenu
- job={job}
- jobStatuses={jobStatuses}
- editJob={editJob}
- onChangeJobStatus={onChangeJobStatus}
- onAddNote={onAddNote}
- onDeleteJob={onDeleteJob}
- />
+ <div className="mt-auto flex items-center justify-between gap-2 border-t pt-3">
+ <div className="flex min-w-0 items-center gap-2">
+ <JobStatusBadge job={job} />
+ <span className="truncate text-xs text-muted-foreground">
+ {[
+ getJobTypeLabel(job.jobType),
+ job.workplaceType ? getWorkplaceTypeLabel(job.workplaceType) : null,
+ ]
+ .filter(Boolean)
+ .join(" · ")}
+ </span>
+ </div>
+ <div className="flex items-center gap-1">
+ <Button
+ variant="ghost"
+ size="icon"
+ title="Edit Job"
+ aria-label="Edit Job"
+ onClick={() => editJob(job.id)}
+ >
+ <Pencil className="h-4 w-4" />
+ </Button>
+ <Button
+ variant="ghost"
+ size="icon"
+ title="Delete Job"
+ aria-label="Delete Job"
+ className="text-destructive hover:text-destructive"
+ onClick={() => onDeleteJob(job.id)}
+ >
+ <Trash className="h-4 w-4" />
+ </Button>
+ <JobActionsMenu
+ job={job}
+ jobStatuses={jobStatuses}
+ onChangeJobStatus={onChangeJobStatus}
+ onAddNote={onAddNote}
+ />
+ </div>
</div>
</div>
);
diff --git a/src/components/myjobs/MyJobsTable.tsx b/src/components/myjobs/MyJobsTable.tsx
index b7d9a2a..f93289c 100644
--- a/src/components/myjobs/MyJobsTable.tsx
+++ b/src/components/myjobs/MyJobsTable.tsx
@@ -7,11 +7,17 @@ import {
TableHeader,
TableRow,
} from "../ui/table";
-import { StickyNote } from "lucide-react";
+import { Pencil, StickyNote, Trash } from "lucide-react";
import { Badge } from "../ui/badge";
+import { Button } from "../ui/button";
import { format } from "date-fns";
import { useState } from "react";
-import { JobResponse, JobStatus } from "@/models/job.model";
+import {
+ JobResponse,
+ JobStatus,
+ getJobTypeLabel,
+ getWorkplaceTypeLabel,
+} from "@/models/job.model";
import Link from "next/link";
import { DeleteAlertDialog } from "../DeleteAlertDialog";
import { CircularScore } from "@/components/CircularScore";
@@ -83,7 +89,7 @@ function MyJobsTable({
className="font-medium cursor-pointer max-w-[120px] md:max-w-[220px]"
>
<div className="flex items-center gap-1.5">
- <Link href={`/dashboard/myjobs/${job?.id}`} className="block truncate">
+ <Link href={`/dashboard/myjobs/${job?.id}`} className="block truncate text-primary underline-offset-4 hover:underline">
{job.JobTitle?.label}
</Link>
{(job._count?.Notes ?? 0) > 0 && (
@@ -93,9 +99,26 @@ function MyJobsTable({
</Badge>
)}
</div>
+ <span className="block truncate text-xs font-normal text-muted-foreground">
+ {[
+ getJobTypeLabel(job.jobType),
+ job.workplaceType ? getWorkplaceTypeLabel(job.workplaceType) : null,
+ ]
+ .filter(Boolean)
+ .join(" · ")}
+ </span>
</TableCell>
<TableCell className="font-medium max-w-[100px] md:max-w-[160px]">
- <span className="block truncate">{job.Company?.label}</span>
+ {job.Company?.id ? (
+ <Link
+ href={`/dashboard/admin/companies/${job.Company.id}`}
+ className="block truncate text-teal-600 underline-offset-4 hover:underline"
+ >
+ {job.Company.label}
+ </Link>
+ ) : (
+ <span className="block truncate">{job.Company?.label}</span>
+ )}
</TableCell>
<TableCell className="hidden md:table-cell whitespace-nowrap max-w-[120px]">
<span className="block truncate">{job.Location?.label}</span>
@@ -124,14 +147,33 @@ function MyJobsTable({
{job.JobSource?.label}
</TableCell>
<TableCell>
- <JobActionsMenu
- job={job}
- jobStatuses={jobStatuses}
- editJob={editJob}
- onChangeJobStatus={onChangeJobStatus}
- onAddNote={onAddNote}
- onDeleteJob={onDeleteJob}
- />
+ <div className="flex items-center gap-1">
+ <Button
+ variant="ghost"
+ size="icon"
+ title="Edit Job"
+ aria-label="Edit Job"
+ onClick={() => editJob(job.id)}
+ >
+ <Pencil className="h-4 w-4" />
+ </Button>
+ <Button
+ variant="ghost"
+ size="icon"
+ title="Delete Job"
+ aria-label="Delete Job"
+ className="text-destructive hover:text-destructive"
+ onClick={() => onDeleteJob(job.id)}
+ >
+ <Trash className="h-4 w-4" />
+ </Button>
+ <JobActionsMenu
+ job={job}
+ jobStatuses={jobStatuses}
+ onChangeJobStatus={onChangeJobStatus}
+ onAddNote={onAddNote}
+ />
+ </div>
</TableCell>
</TableRow>
);