Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Boolean table cell in edit mode #2258

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Boolean table cell in edit mode #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f40035
Boolean table cell in edit mode
Nov 18, 2024
db05b9c
Merge branch 'develop' into bug/#2257-boolean-table-cell-in-edit-mode
FredLL-Avaiga Nov 18, 2024
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
28 changes: 0 additions & 28 deletions frontend/taipy-gui/src/components/Taipy/tableUtils.spec.ts
View file
Open in desktop

This file was deleted.

118 changes: 118 additions & 0 deletions frontend/taipy-gui/src/components/Taipy/tableUtils.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
import { render } from "@testing-library/react";
import "@testing-library/jest-dom";
import userEvent from "@testing-library/user-event";

import { EditableCell, generateHeaderClassName, RowValue } from "./tableUtils";

describe("generateHeaderClassName", () => {
it("should generate a CSS class name with a hyphen prefix and convert to lowercase", () => {
const result = generateHeaderClassName("ColumnName");
expect(result).toBe("-columnname");
});

it("should replace spaces and special characters with hyphens", () => {
const result = generateHeaderClassName("Column Name@123!");
expect(result).toBe("-column-name-123-");
});

it("should remove multiple hyphens in a row", () => {
const result = generateHeaderClassName("Column--Name");
expect(result).toBe("-column-name");
});

it("should handle empty strings and return an empty string", () => {
const result = generateHeaderClassName("");
expect(result).toBe("");
});

it("should return empty string for the undefined", () => {
const result = generateHeaderClassName(undefined);
expect(result).toBe("");
});
});

describe("Editable cell", () => {
const formatConfig = {
timeZone: "FR",
forceTZ: false,
date: "dd/MM/yyyy",
dateTime: "dd/MM/yyyy hh:mm",
number: "",
};
const colDesc = { dfid: "id", type: "bool", index: 0 };
describe("Non editable mode", () => {
it("show a boolean as a switch", () => {
const { getByRole } = render(
<EditableCell
rowIndex={0}
value={true}
formatConfig={formatConfig}
colDesc={colDesc}
tableClassName="taipy-table"
/>
);
const elt = getByRole("checkbox");
expect(elt.tagName).toBe("INPUT");
const switchCtl = elt.closest(".MuiSwitch-root");
expect(switchCtl).not.toBeNull();
expect(switchCtl).toHaveClass("taipy-table-bool");
});
it("show a boolean as a check", () => {
const { getByRole } = render(
<EditableCell
rowIndex={0}
value={true}
formatConfig={formatConfig}
colDesc={colDesc}
useCheckbox={true}
tableClassName="taipy-table"
/>
);
const elt = getByRole("checkbox");
expect(elt.tagName).toBe("INPUT");
expect(elt.closest(".MuiSwitch-root")).toBeNull();
expect(elt).toHaveClass("taipy-table-bool");
});
});
describe("Editable mode", () => {
const onValidation = (value: RowValue, rowIndex: number, colName: string, userValue: string, tz?: string) => {};
it("show a boolean as a switch", async () => {
const { getByRole, getByTestId } = render(
<EditableCell
rowIndex={0}
value={true}
formatConfig={formatConfig}
colDesc={colDesc}
tableClassName="taipy-table"
onValidation={onValidation}
/>
);
const but = getByTestId("EditIcon");
await userEvent.click(but);
const elt = getByRole("checkbox");
expect(elt.tagName).toBe("INPUT");
const switchCtl = elt.closest(".MuiSwitch-root");
expect(switchCtl).not.toBeNull();
expect(switchCtl).toHaveClass("taipy-table-bool");
});
it("show a boolean as a check", async () => {
const { getByRole, getByTestId } = render(
<EditableCell
rowIndex={0}
value={true}
formatConfig={formatConfig}
colDesc={colDesc}
useCheckbox={true}
tableClassName="taipy-table"
onValidation={onValidation}
/>
);
const but = getByTestId("EditIcon");
await userEvent.click(but);
const elt = getByRole("checkbox");
expect(elt.tagName).toBe("INPUT");
expect(elt.closest(".MuiSwitch-root")).toBeNull();
expect(elt).toHaveClass("taipy-table-bool");
});
});
});
5 changes: 3 additions & 2 deletions frontend/taipy-gui/src/components/Taipy/tableUtils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ export const EditableCell = (props: EditableCellProps) => {
{edit ? (
colDesc.type?.startsWith("bool") ? (
<Box sx={cellBoxSx}>
lightBool ? (
{useCheckbox ? (
<input
type="checkbox"
checked={val as boolean}
Expand All @@ -585,7 +585,7 @@ export const EditableCell = (props: EditableCellProps) => {
inputRef={setInputFocus}
className={getSuffixedClassNames(tableClassName, "-bool")}
/>
)
)}
<Box sx={iconsWrapperSx}>
<IconButton onClick={onCheckClick} size="small" sx={iconInRowSx}>
<CheckIcon fontSize="inherit" />
Expand Down Expand Up @@ -741,6 +741,7 @@ export const EditableCell = (props: EditableCellProps) => {
checked={value as boolean}
title={boolTitle}
style={defaultCursor}
readOnly
className={getSuffixedClassNames(tableClassName, "-bool")}
/>
) : (
Expand Down
Loading