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 AddCompany component

Khuram Niaz70cd7d320fdf
diff --git a/__tests__/AddCompany.spec.tsx b/__tests__/AddCompany.spec.tsx
index 7066172..f77266e 100644
--- a/__tests__/AddCompany.spec.tsx
+++ b/__tests__/AddCompany.spec.tsx
@@ -11,6 +11,7 @@ jest.mock("@/actions/company.actions", () => ({
describe("AddCompany Component", () => {
const mockReloadCompanies = jest.fn();
const mockResetEditCompany = jest.fn();
+ const mockSetDialogOpen = jest.fn();
beforeEach(() => {
jest.clearAllMocks();
@@ -21,6 +22,8 @@ describe("AddCompany Component", () => {
<AddCompany
reloadCompanies={mockReloadCompanies}
resetEditCompany={mockResetEditCompany}
+ dialogOpen={false}
+ setDialogOpen={mockSetDialogOpen}
/>
);
expect(
@@ -33,6 +36,8 @@ describe("AddCompany Component", () => {
<AddCompany
reloadCompanies={mockReloadCompanies}
resetEditCompany={mockResetEditCompany}
+ dialogOpen={false}
+ setDialogOpen={mockSetDialogOpen}
/>
);
const addCompanyButton = screen.getByRole("button", {
@@ -40,8 +45,7 @@ describe("AddCompany Component", () => {
});
fireEvent.click(addCompanyButton);
- const dialog = await screen.findByRole("dialog");
- expect(dialog).toBeInTheDocument();
+ expect(mockSetDialogOpen).toHaveBeenCalledWith(true);
});
it("should populate form fields when editing a company", async () => {
@@ -58,6 +62,8 @@ describe("AddCompany Component", () => {
reloadCompanies={mockReloadCompanies}
resetEditCompany={mockResetEditCompany}
editCompany={mockEditCompany}
+ dialogOpen={true}
+ setDialogOpen={mockSetDialogOpen}
/>
);
@@ -77,6 +83,8 @@ describe("AddCompany Component", () => {
<AddCompany
reloadCompanies={mockReloadCompanies}
resetEditCompany={mockResetEditCompany}
+ dialogOpen={true}
+ setDialogOpen={mockSetDialogOpen}
/>
);
@@ -117,6 +125,8 @@ describe("AddCompany Component", () => {
reloadCompanies={mockReloadCompanies}
resetEditCompany={mockResetEditCompany}
editCompany={mockEditCompany}
+ dialogOpen={true}
+ setDialogOpen={mockSetDialogOpen}
/>
);
diff --git a/src/components/admin/AddCompany.tsx b/src/components/admin/AddCompany.tsx
index 264ebff..22dbcb4 100644
--- a/src/components/admin/AddCompany.tsx
+++ b/src/components/admin/AddCompany.tsx
@@ -3,7 +3,6 @@ import { useTransition, useState, useEffect } from "react";
import { Button } from "../ui/button";
import {
Dialog,
- DialogClose,
DialogContent,
DialogDescription,
DialogFooter,
@@ -32,14 +31,17 @@ type AddCompanyProps = {
reloadCompanies: () => void;
editCompany?: Company | null;
resetEditCompany: () => void;
+ dialogOpen: boolean;
+ setDialogOpen: (e: boolean) => void;
};
function AddCompany({
reloadCompanies,
editCompany,
resetEditCompany,
+ dialogOpen,
+ setDialogOpen,
}: AddCompanyProps) {
- const [dialogOpen, setDialogOpen] = useState(false);
const [isPending, startTransition] = useTransition();
const pageTitle = editCompany ? "Edit Company" : "Add Company";
@@ -48,21 +50,22 @@ function AddCompany({
resolver: zodResolver(AddCompanyFormSchema),
});
- const { setValue, reset, formState, clearErrors } = form;
+ const { reset, formState } = form;
useEffect(() => {
+ console.log("use effect");
if (editCompany) {
- clearErrors();
- setValue("id", editCompany.id);
- setValue("company", editCompany.label);
- setValue("createdBy", editCompany.createdBy);
- if (editCompany.logoUrl) {
- setValue("logoUrl", editCompany?.logoUrl);
- }
-
- setDialogOpen(true);
+ reset(
+ {
+ id: editCompany?.id,
+ company: editCompany?.label ?? "",
+ createdBy: editCompany?.createdBy,
+ logoUrl: editCompany?.logoUrl ?? "",
+ },
+ { keepDefaultValues: true }
+ );
}
- }, [editCompany, setValue, clearErrors]);
+ }, [editCompany, reset]);
const addCompanyForm = () => {
reset();
diff --git a/src/components/admin/CompaniesContainer.tsx b/src/components/admin/CompaniesContainer.tsx
index a440d45..344cc0e 100644
--- a/src/components/admin/CompaniesContainer.tsx
+++ b/src/components/admin/CompaniesContainer.tsx
@@ -22,6 +22,7 @@ function CompaniesContainer({
const [currentPage, setCurrentPage] = useState(
Number(queryParams.get("page")) || 1
);
+ const [dialogOpen, setDialogOpen] = useState(false);
const [editCompany, setEditCompany] = useState(null);
const [loading, setLoading] = useState(false);
@@ -61,6 +62,7 @@ function CompaniesContainer({
const onEditCompany = async (companyId: string) => {
const company = await getCompanyById(companyId);
setEditCompany(company);
+ setDialogOpen(true);
};
const onPageChange = (page: number) => {
@@ -80,6 +82,8 @@ function CompaniesContainer({
editCompany={editCompany}
reloadCompanies={reloadCompanies}
resetEditCompany={resetEditCompany}
+ dialogOpen={dialogOpen}
+ setDialogOpen={setDialogOpen}
/>
</div>
</div>