fix(grid): show load time with one decimal in all states
This commit is contained in:
3 files changed
+20
-11
No files matched your search
@@ -19,16 +19,16 @@ describe("DataGridBusyOverlay", () => {
|
|||||||
it("shows the elapsed seconds without a stop action by default", () => {
|
it("shows the elapsed seconds without a stop action by default", () => {
|
||||||
const mounted = mountComponent(DataGridBusyOverlay, { elapsedMs: 12_340 });
|
const mounted = mountComponent(DataGridBusyOverlay, { elapsedMs: 12_340 });
|
||||||
|
|
||||||
expect(hostText(mounted.root)).toContain("12.34s");
|
expect(hostText(mounted.root)).toContain("12.3s");
|
||||||
expect(findCancelButton(mounted.root)).toHaveLength(0);
|
expect(findCancelButton(mounted.root)).toHaveLength(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("formats long waits and guards non-finite elapsed values", async () => {
|
it("formats long waits and guards non-finite elapsed values", async () => {
|
||||||
const mounted = mountComponent(DataGridBusyOverlay, { elapsedMs: 312_450 });
|
const mounted = mountComponent(DataGridBusyOverlay, { elapsedMs: 312_450 });
|
||||||
expect(hostText(mounted.root)).toContain("312.45s");
|
expect(hostText(mounted.root)).toContain("312.4s");
|
||||||
|
|
||||||
await mounted.setProps({ elapsedMs: Number.NaN });
|
await mounted.setProps({ elapsedMs: Number.NaN });
|
||||||
expect(hostText(mounted.root)).toContain("0.00s");
|
expect(hostText(mounted.root)).toContain("0.0s");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("stops the running load from the elapsed pill", () => {
|
it("stops the running load from the elapsed pill", () => {
|
||||||
@@ -70,7 +70,7 @@ describe("DataGridBusyOverlay", () => {
|
|||||||
|
|
||||||
expect(hostText(mounted.root)).toContain("grid.pageJumpLoading");
|
expect(hostText(mounted.root)).toContain("grid.pageJumpLoading");
|
||||||
expect(hostText(mounted.root)).toContain("grid.pageJumpProgress");
|
expect(hostText(mounted.root)).toContain("grid.pageJumpProgress");
|
||||||
expect(hostText(mounted.root)).toContain("45.00s");
|
expect(hostText(mounted.root)).toContain("45.0s");
|
||||||
const progressbar = findOne(mounted.root, (node) => node.props.role === "progressbar");
|
const progressbar = findOne(mounted.root, (node) => node.props.role === "progressbar");
|
||||||
expect(progressbar.props["aria-valuenow"]).toBe(3);
|
expect(progressbar.props["aria-valuenow"]).toBe(3);
|
||||||
expect(progressbar.props["aria-valuemax"]).toBe(12);
|
expect(progressbar.props["aria-valuemax"]).toBe(12);
|
||||||
|
|||||||
@@ -2,14 +2,15 @@ import { describe, expect, it } from "vitest";
|
|||||||
import { formatElapsedSeconds } from "@/lib/common/elapsedTime";
|
import { formatElapsedSeconds } from "@/lib/common/elapsedTime";
|
||||||
|
|
||||||
describe("formatElapsedSeconds", () => {
|
describe("formatElapsedSeconds", () => {
|
||||||
it("formats elapsed milliseconds with two fractional second digits", () => {
|
it("formats elapsed milliseconds with one fractional second digit", () => {
|
||||||
expect(formatElapsedSeconds(1234)).toBe("1.23");
|
expect(formatElapsedSeconds(1234)).toBe("1.2");
|
||||||
expect(formatElapsedSeconds(5)).toBe("0.01");
|
expect(formatElapsedSeconds(1250)).toBe("1.3");
|
||||||
expect(formatElapsedSeconds(0)).toBe("0.00");
|
expect(formatElapsedSeconds(5)).toBe("0.0");
|
||||||
|
expect(formatElapsedSeconds(0)).toBe("0.0");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("clamps invalid elapsed values to zero", () => {
|
it("clamps invalid elapsed values to zero", () => {
|
||||||
expect(formatElapsedSeconds(-100)).toBe("0.00");
|
expect(formatElapsedSeconds(-100)).toBe("0.0");
|
||||||
expect(formatElapsedSeconds(Number.NaN)).toBe("0.00");
|
expect(formatElapsedSeconds(Number.NaN)).toBe("0.0");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -1,3 +1,11 @@
|
|||||||
|
/**
|
||||||
|
* Elapsed seconds for the running-load hints (the full-area loader, the in-grid
|
||||||
|
* busy pill, ...).
|
||||||
|
*
|
||||||
|
* One decimal on purpose: the grid footer renders a finished run through
|
||||||
|
* `formatQueryDuration` ("2.2 s"), so a two-decimal counter here made the same
|
||||||
|
* value jump between formats while loading and after it finished (#10439/#10441).
|
||||||
|
*/
|
||||||
export function formatElapsedSeconds(ms: number): string {
|
export function formatElapsedSeconds(ms: number): string {
|
||||||
return (Math.max(0, Number.isFinite(ms) ? ms : 0) / 1000).toFixed(2);
|
return (Math.max(0, Number.isFinite(ms) ? ms : 0) / 1000).toFixed(1);
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user