adam/seahaven-ap
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/seahaven-ap.git synced 2026-10-06 21:41:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(web): hide Payment Date when the drawer omits it

Browse source
This commit is contained in:
Adam Moussa 2026-09-25 17:30:48 -04:00
parent 2c40943908
commit cf86cfed30
No known key found for this signature in database
4 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
e2e/dashboard-grids.spec.ts
View file

@ -53,6 +53,19 @@ test.describe("dashboard grids", () => {
/Pay run stub: [2-9]\d* invoice\(s\) selected/, /Pay run stub: [2-9]\d* invoice\(s\) selected/,
); );
await page.getByTestId("columns-toggle").click();
const drawer = page.getByTestId("columns-drawer");
await drawer.getByTestId("columns-hidden-search").fill("Payment Date");
await drawer
.getByTestId("columns-hidden-paymentDate")
.locator('input[type="checkbox"]')
.evaluate((el: HTMLInputElement) => {
el.click();
});
await expect(
readyGrid.locator('.MuiDataGrid-columnHeader[data-field="payDate"]'),
).toBeVisible();
const payDateCell = readyGrid.locator('[data-field="payDate"]').nth(1); const payDateCell = readyGrid.locator('[data-field="payDate"]').nth(1);
await payDateCell.dblclick(); await payDateCell.dblclick();
const editor = readyGrid const editor = readyGrid

13
src/dashboard/approved-columns.ts
View file

@ -1,16 +1,9 @@
import type { GridColDef } from "@mui/x-data-grid"; import type { GridColDef } from "@mui/x-data-grid";
import type { MockInvoice } from "@/mocks"; import type { MockInvoice } from "@/mocks";
/** Keep one editable pay-date column on the approved grid. */ /** Mark a visible pay-date column editable. A hidden Payment Date stays omitted. */
export function withEditablePayDate( export function withEditablePayDate(columns: GridColDef<MockInvoice>[]): GridColDef<MockInvoice>[] {
columns: GridColDef<MockInvoice>[], return columns.map((column) =>
payDateColumn: GridColDef<MockInvoice>,
): GridColDef<MockInvoice>[] {
const next = columns.map((column) =>
column.field === "payDate" ? { ...column, editable: true } : column, column.field === "payDate" ? { ...column, editable: true } : column,
); );
if (next.some((column) => column.field === "payDate")) {
return next;
}
return [...next, { ...payDateColumn, editable: true }];
} }

10
src/dashboard/columns.test.ts
View file

@ -34,15 +34,13 @@ describe("withEditablePayDate", () => {
const hidden: GridColDef<MockInvoice> = { field: "vendorName", headerName: "Vendor" }; const hidden: GridColDef<MockInvoice> = { field: "vendorName", headerName: "Vendor" };
const payDate: GridColDef<MockInvoice> = { field: "payDate", headerName: "Payment Date" }; const payDate: GridColDef<MockInvoice> = { field: "payDate", headerName: "Payment Date" };
it("appends an editable pay date when the catalog hides Payment Date", () => { it("leaves Payment Date hidden when the catalog omits it", () => {
const columns = withEditablePayDate([hidden], payDate); const columns = withEditablePayDate([hidden]);
expect(columns.filter((column) => column.field === "payDate")).toEqual([ expect(columns.some((column) => column.field === "payDate")).toBe(false);
{ field: "payDate", headerName: "Payment Date", editable: true },
]);
}); });
it("keeps a single editable pay date when Payment Date is already visible", () => { it("keeps a single editable pay date when Payment Date is already visible", () => {
const columns = withEditablePayDate([hidden, { ...payDate, editable: false }], payDate); const columns = withEditablePayDate([hidden, { ...payDate, editable: false }]);
const matches = columns.filter((column) => column.field === "payDate"); const matches = columns.filter((column) => column.field === "payDate");
expect(matches).toHaveLength(1); expect(matches).toHaveLength(1);
expect(matches[0]?.editable).toBe(true); expect(matches[0]?.editable).toBe(true);

4
src/dashboard/columns.tsx
View file

@ -251,9 +251,9 @@ export function columnsFromCatalogKeys(keys: InvoiceColumnKey[]): GridColDef<Moc
return keys.map((key) => catalogColumnDefs[key]); return keys.map((key) => catalogColumnDefs[key]);
} }
/** Approved tab keeps an editable pay date even when the catalog hides Payment Date. */ /** Approved tab keeps pay date editable when the drawer shows Payment Date. */
export function columnsForApprovedGrid(keys: InvoiceColumnKey[]): GridColDef<MockInvoice>[] { export function columnsForApprovedGrid(keys: InvoiceColumnKey[]): GridColDef<MockInvoice>[] {
return withEditablePayDate(columnsFromCatalogKeys(keys), catalogColumnDefs.paymentDate); return withEditablePayDate(columnsFromCatalogKeys(keys));
} }
export const readyToPayColumns: GridColDef<MockInvoice>[] = [ export const readyToPayColumns: GridColDef<MockInvoice>[] = [