Skip to content

Commit

Permalink
feat: [sc-63506] Flip -s to 0s in the interest summary export (#1097)
Browse files Browse the repository at this point in the history
  • Loading branch information
haislip authored Dec 17, 2024
1 parent c97c993 commit 653728f
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 6 deletions.
32 changes: 27 additions & 5 deletions src/components/Table/GridTable.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { emptyCell, matchesFilter } from "src/components/Table/utils/utils";
import { Css, Palette } from "src/Css";
import { useComputed } from "src/hooks";
import { SelectField, TextField } from "src/inputs";
import { noop } from "src/utils";
import { isDefined, noop } from "src/utils";
import {
cell,
cellAnd,
Expand All @@ -27,6 +27,7 @@ import {
wait,
withRouter,
} from "src/utils/rtl";
import { GridCellContent } from "./components/cell";

// Most of our tests use this simple Row and 2 columns
type Data = { name: string; value: number | undefined | null };
Expand Down Expand Up @@ -3791,6 +3792,13 @@ describe("GridTable", () => {
it("can download csvs", async () => {
let api: GridTableApi<Row> | undefined;

function amountGridCellContent(amount: number): GridCellContent {
return {
content: <div />,
value: amount,
};
}

const columns: GridColumn<Row>[] = [
// Given a column returns JSX, but defines a `sortValue`
{ header: "Name", data: ({ name }) => ({ content: <div>{name}</div>, sortValue: name }) },
Expand All @@ -3802,23 +3810,37 @@ describe("GridTable", () => {
{ header: "Value", data: ({ value }) => `${value},${value}` },
// And a column returns a string with a quote in it
{ header: "Value", data: ({ value }) => `a quoted "${value}" value` },
// And a column returns when it's a grid cell contect
{ header: "GridCellValue", data: ({ value }) => (isDefined(value) ? amountGridCellContent(value) : value) },
// And a column returns undefined
{ header: "Value", data: () => undefined },
// And a column returns JSX with nothing else
{ header: "Action", data: () => <div>Actions</div>, isAction: true },
];

const csvRows: GridDataRow<Row>[] = [
simpleHeader,
{ kind: "data", id: "1", data: { name: "foo", value: 1 } },
{ kind: "data", id: "2", data: { name: "bar", value: 2 } },
{ kind: "data", id: "3", data: { name: "zeroname", value: 0 } },
{ kind: "data", id: "4", data: { name: "nullname", value: null } },
{ kind: "data", id: "5", data: { name: "undefname", value: undefined } },
];

function Test() {
api = useGridTableApi<Row>();
return <GridTable<Row> api={api} columns={columns} rows={rows} />;
return <GridTable<Row> api={api} columns={columns} rows={csvRows} />;
}

await render(<Test />);

expect((api as GridTableApiImpl<Row>).generateCsvContent()).toEqual([
"Name,Value,Value,Value,Value,Value",
`foo,1,1,"1,1","a quoted ""1"" value",`,
`bar,2,2,"2,2","a quoted ""2"" value",`,
"Name,Value,Value,Value,Value,GridCellValue,Value",
`foo,1,1,"1,1","a quoted ""1"" value",1,`,
`bar,2,2,"2,2","a quoted ""2"" value",2,`,
`zeroname,0,0,"0,0","a quoted ""0"" value",0,`,
`nullname,,null,"null,null","a quoted ""null"" value",,`,
`undefname,,undefined,"undefined,undefined","a quoted ""undefined"" value",,`,
]);
});

Expand Down
3 changes: 2 additions & 1 deletion src/components/Table/GridTableApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
import { GridDataRow } from "src/components/Table/components/Row";
import { DiscriminateUnion, Kinded } from "src/components/Table/types";
import { TableState } from "src/components/Table/utils/TableState";
import { isDefined } from "src/utils";

/**
* Creates an `api` handle to drive a `GridTable`.
Expand Down Expand Up @@ -246,7 +247,7 @@ export class GridTableApiImpl<R extends Kinded> implements GridTableApi<R> {
// Anything not isJSX (like a string) we can put into the CSV directly
if (!isJSX(content)) return content;
// Otherwise use the value/sortValue values
return cell.value ? maybeApply(cell.value) : cell.sortValue ? maybeApply(cell.sortValue) : "-";
return isDefined(cell.value) ? maybeApply(cell.value) : cell.sortValue ? maybeApply(cell.sortValue) : "-"; // Do we need the "-" handling unclear if we use it ever
} else {
// ReactNode
return isJSX(maybeContent) ? "-" : maybeContent;
Expand Down

0 comments on commit 653728f

Please sign in to comment.