Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions packages/frontend/src/api/utils/customDataUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { TCustomItem } from "src/api/types";
import {
validateCustomData,
evaluateTranslationTemplate,
formatCustomDataField,
} from "./customDataUtils";

export const validCustomData: JSONValue = [
Expand Down Expand Up @@ -93,4 +94,32 @@ describe("Tests for custom data utilities", () => {
);
});
});

test("formatCustomDataField: zero numeric values show N/A", () => {
// number format
expect(
formatCustomDataField({ rawField: "0", format: "number" }).field
).toBe("N/A");

expect(
formatCustomDataField({ rawField: "0", format: "decimal" }).field
).toBe("N/A");
expect(
formatCustomDataField({ rawField: "0.00", format: "decimal" }).field
).toBe("N/A");

expect(
formatCustomDataField({ rawField: "0", format: "currency" }).field
).toBe("N/A");

// percentage: zero should be formatted normally (eg. "0%") not N/A
expect(
formatCustomDataField({
rawField: "0%",
format: "percentage",
}).field
).toBe(
formatCustomDataField({ rawField: "0", format: "percentage" }).field
);
});
});
14 changes: 14 additions & 0 deletions packages/frontend/src/api/utils/customDataUtils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,13 @@ export const formatCustomDataField: (
error: undefined,
};
}
// When the type is numeric and the value is zero, show N/A instead of "0"
const parsedNumber = Number(
String(rawField).replace(/[^0-9.-]+/g, "")
);
if (!Number.isNaN(parsedNumber) && parsedNumber === 0) {
return { field: "N/A", error: undefined };
}
return {
field: formatNumber({ value: rawField }).value,
error: undefined,
Expand All @@ -325,6 +332,12 @@ export const formatCustomDataField: (
error: undefined,
};
}
const parsedNumber = Number(
String(rawField).replace(/[^0-9.-]+/g, "")
);
if (!Number.isNaN(parsedNumber) && parsedNumber === 0) {
return { field: "N/A", error: undefined };
}
return {
field: formatNumber({
value: rawField,
Expand All @@ -347,6 +360,7 @@ export const formatCustomDataField: (
error: undefined,
};
}
// For percentages, keep zero values as formatted strings (e.g., "0%")
return {
field: formatNumber({
value: rawField,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ export const GridBasedTable: React.FC<IGridBasedTableProps> = ({
gridAutoRows: "min-content",
}}
>
{/* Headers */}
{visibleColumns.map((column) => (
<div
key={`header-${column.id}`}
Expand All @@ -246,7 +245,6 @@ export const GridBasedTable: React.FC<IGridBasedTableProps> = ({
</div>
))}

{/* Cells */}
{items.map((item) =>
visibleColumns.map((column) => {
const rawValue =
Expand Down Expand Up @@ -282,7 +280,6 @@ export const GridBasedTable: React.FC<IGridBasedTableProps> = ({
className="px-5 py-2 border-b border-borderLine hover:bg-background max-w-[200px] min-h-0"
style={{ minWidth: `${minCellSize}px` }}
>
{/* Your cell content rendering logic */}
{column.format === "image" && imageUri ? (
<img
src={imageUri}
Expand Down
Loading