fix: handle null and boolean correctly on table parameter (#6722)
* Added Null, Undefined and Bool rendering to table
* Handling formatter to come from the backend in table definitions
* Added validator to make type as formatter and vice versa
* Added boolean case to show badge
* Added Toggle Cell Editor
* Supress Row Click Selection on Table node component
* ADd boolean as type for formatter
* Adds Boolean formatter type to show toggle editor
* run format_backend
* ✅ (tableInputComponent.spec.ts): update unit test for table input component to use new methods for interacting with elements and improve readability and maintainability of the test code.
---------
Co-authored-by: Gabriel Luiz Freitas Almeida <gabriel@langflow.org>
Co-authored-by: cristhianzl <cristhian.lousa@gmail.com>
This commit is contained in:
parent
5e40c5f199
commit
3257c5720e
7 changed files with 119 additions and 27 deletions
|
|
@ -179,6 +179,10 @@ export default function TableNodeComponent({
|
|||
pagination={!table_options?.hide_options}
|
||||
addRow={addRow}
|
||||
onDelete={deleteRow}
|
||||
gridOptions={{
|
||||
ensureDomOrder: true,
|
||||
suppressRowClickSelection: true,
|
||||
}}
|
||||
onDuplicate={duplicateRow}
|
||||
displayEmptyAlert={false}
|
||||
className="h-full w-full"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import { cn, isTimeStampString } from "@/utils/utils";
|
|||
import { CustomCellRendererProps } from "ag-grid-react";
|
||||
|
||||
interface CustomCellRender extends CustomCellRendererProps {
|
||||
formatter?: "json" | "text";
|
||||
formatter?: "json" | "text" | "boolean" | "number" | "undefined" | "null";
|
||||
}
|
||||
|
||||
export default function TableAutoCellRender({
|
||||
|
|
@ -71,13 +71,32 @@ export default function TableAutoCellRender({
|
|||
}
|
||||
case "number":
|
||||
return <NumberReader number={value} />;
|
||||
case "undefined":
|
||||
return "";
|
||||
case "null":
|
||||
return "";
|
||||
case "boolean":
|
||||
value =
|
||||
(typeof value === "string" && value.toLowerCase() === "true") ||
|
||||
value === true
|
||||
? true
|
||||
: false;
|
||||
return (
|
||||
<Badge
|
||||
variant={value ? "successStatic" : "errorStatic"}
|
||||
size="sq"
|
||||
className="h-[18px]"
|
||||
>
|
||||
{String(value).toLowerCase()}
|
||||
</Badge>
|
||||
);
|
||||
default:
|
||||
return String(value);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="group flex h-full w-full truncate text-align-last-left">
|
||||
<div className="group flex h-full w-full items-center truncate text-align-last-left">
|
||||
{getCellType()}
|
||||
</div>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
import { CustomCellEditorProps } from "ag-grid-react";
|
||||
import { uniqueId } from "lodash";
|
||||
import ToggleShadComponent from "../../../toggleShadComponent";
|
||||
|
||||
export default function TableToggleCellEditor({
|
||||
value,
|
||||
onValueChange,
|
||||
colDef,
|
||||
}: CustomCellEditorProps) {
|
||||
value =
|
||||
(typeof value === "string" && value.toLowerCase() === "true") ||
|
||||
value === true
|
||||
? true
|
||||
: false;
|
||||
return (
|
||||
<div className="flex h-full items-center px-2">
|
||||
<ToggleShadComponent
|
||||
value={value}
|
||||
handleOnNewValue={(data) => {
|
||||
onValueChange?.(data.value);
|
||||
}}
|
||||
editNode={true}
|
||||
id={"toggle" + colDef?.colId + uniqueId()}
|
||||
disabled={false}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -14,6 +14,7 @@ export enum FormatterType {
|
|||
text = "text",
|
||||
number = "number",
|
||||
json = "json",
|
||||
boolean = "boolean",
|
||||
}
|
||||
|
||||
export interface ColumnField {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import TableAutoCellRender from "@/components/core/parameterRenderComponent/components/tableComponent/components/tableAutoCellRender";
|
||||
import TableToggleCellEditor from "@/components/core/parameterRenderComponent/components/tableComponent/components/tableToggleCellEditor";
|
||||
import useAlertStore from "@/stores/alertStore";
|
||||
import { ColumnField, FormatterType } from "@/types/utils/functions";
|
||||
import { ColDef, ColGroupDef, ValueParserParams } from "ag-grid-community";
|
||||
|
|
@ -566,7 +567,10 @@ export function FormatColumns(columns: ColumnField[]): ColDef<any>[] {
|
|||
formatter: col.formatter,
|
||||
};
|
||||
if (col.formatter !== FormatterType.text || col.edit_mode !== "inline") {
|
||||
if (col.edit_mode === "popover") {
|
||||
if (
|
||||
col.edit_mode === "popover" &&
|
||||
col.formatter === FormatterType.text
|
||||
) {
|
||||
newCol.wrapText = false;
|
||||
newCol.autoHeight = false;
|
||||
newCol.cellEditor = "agLargeTextCellEditor";
|
||||
|
|
@ -574,6 +578,13 @@ export function FormatColumns(columns: ColumnField[]): ColDef<any>[] {
|
|||
newCol.cellEditorParams = {
|
||||
maxLength: 100000000,
|
||||
};
|
||||
} else if (col.formatter === FormatterType.boolean) {
|
||||
newCol.cellRenderer = TableAutoCellRender;
|
||||
newCol.cellEditorPopup = false;
|
||||
newCol.cellEditor = TableToggleCellEditor;
|
||||
newCol.autoHeight = false;
|
||||
newCol.cellClass = "no-border !py-2";
|
||||
newCol.type = "boolean";
|
||||
} else {
|
||||
newCol.cellRenderer = TableAutoCellRender;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,33 +113,27 @@ class CustomComponent(Component):
|
|||
await expect(page.getByText(text).last()).toBeVisible();
|
||||
}
|
||||
|
||||
await page.locator(".ag-cell-value").first().click();
|
||||
|
||||
await page.getByPlaceholder("Empty").fill(randomText);
|
||||
await page.getByText("Save").last().click();
|
||||
await expect(page.getByTestId("icon-Type")).toBeHidden({
|
||||
timeout: 2000,
|
||||
});
|
||||
await page.locator(".ag-cell-value").nth(12).click();
|
||||
|
||||
await page.getByPlaceholder("Empty").fill(secondRandomText);
|
||||
await page.getByText("Save").last().click();
|
||||
await expect(page.getByTestId("icon-Type")).toBeHidden({
|
||||
timeout: 2000,
|
||||
await page.locator(".ag-cell-value").first().dblclick({
|
||||
force: true,
|
||||
});
|
||||
|
||||
await page.locator(".ag-cell-value").nth(24).click();
|
||||
await expect(page.getByTestId("icon-Type")).toBeVisible({
|
||||
timeout: 2000,
|
||||
await page.getByLabel("Input Editor").fill(randomText);
|
||||
await page.keyboard.press("Enter");
|
||||
|
||||
await page.locator(".ag-cell-value").nth(12).dblclick({
|
||||
force: true,
|
||||
});
|
||||
|
||||
await page.getByPlaceholder("Empty").fill(thirdRandomText);
|
||||
await page.getByText("Save").last().click();
|
||||
await page.getByLabel("Input Editor").fill(secondRandomText);
|
||||
await page.keyboard.press("Enter");
|
||||
|
||||
await expect(page.getByTestId("icon-Type")).toBeHidden({
|
||||
timeout: 2000,
|
||||
await page.locator(".ag-cell-value").nth(24).dblclick({
|
||||
force: true,
|
||||
});
|
||||
|
||||
await page.getByLabel("Input Editor").fill(thirdRandomText);
|
||||
await page.keyboard.press("Enter");
|
||||
|
||||
expect(page.getByText(randomText)).toBeVisible();
|
||||
expect(page.getByText(secondRandomText)).toBeVisible();
|
||||
expect(page.getByText(thirdRandomText)).toBeVisible();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue