diff --git a/src/frontend/src/components/tableAutoCellRender/index.tsx b/src/frontend/src/components/tableComponent/components/tableAutoCellRender/index.tsx similarity index 78% rename from src/frontend/src/components/tableAutoCellRender/index.tsx rename to src/frontend/src/components/tableComponent/components/tableAutoCellRender/index.tsx index 37f58f3ac..9fdb684a1 100644 --- a/src/frontend/src/components/tableAutoCellRender/index.tsx +++ b/src/frontend/src/components/tableComponent/components/tableAutoCellRender/index.tsx @@ -1,11 +1,11 @@ import { CustomCellRendererProps } from "ag-grid-react"; -import { cn, isTimeStampString } from "../../utils/utils"; -import ArrayReader from "../arrayReaderComponent"; -import DateReader from "../dateReaderComponent"; -import NumberReader from "../numberReader"; -import ObjectRender from "../objectRender"; -import StringReader from "../stringReaderComponent"; -import { Badge } from "../ui/badge"; +import { cn, isTimeStampString } from "../../../../utils/utils"; +import ArrayReader from "../../../arrayReaderComponent"; +import DateReader from "../../../dateReaderComponent"; +import NumberReader from "../../../numberReader"; +import ObjectRender from "../../../objectRender"; +import StringReader from "../../../stringReaderComponent"; +import { Badge } from "../../../ui/badge"; export default function TableAutoCellRender({ value, diff --git a/src/frontend/src/modals/editNodeModal/components/tableNodeCellRender/index.tsx b/src/frontend/src/components/tableComponent/components/tableNodeCellRender/index.tsx similarity index 88% rename from src/frontend/src/modals/editNodeModal/components/tableNodeCellRender/index.tsx rename to src/frontend/src/components/tableComponent/components/tableNodeCellRender/index.tsx index a6656f07c..cddabd330 100644 --- a/src/frontend/src/modals/editNodeModal/components/tableNodeCellRender/index.tsx +++ b/src/frontend/src/components/tableComponent/components/tableNodeCellRender/index.tsx @@ -1,18 +1,18 @@ import { CustomCellRendererProps } from "ag-grid-react"; import { cloneDeep } from "lodash"; import { useState } from "react"; -import CodeAreaComponent from "../../../../components/codeAreaComponent"; -import DictComponent from "../../../../components/dictComponent"; -import Dropdown from "../../../../components/dropdownComponent"; -import FloatComponent from "../../../../components/floatComponent"; -import InputFileComponent from "../../../../components/inputFileComponent"; -import InputGlobalComponent from "../../../../components/inputGlobalComponent"; -import InputListComponent from "../../../../components/inputListComponent"; -import IntComponent from "../../../../components/intComponent"; -import KeypairListComponent from "../../../../components/keypairListComponent"; -import PromptAreaComponent from "../../../../components/promptComponent"; -import TextAreaComponent from "../../../../components/textAreaComponent"; -import ToggleShadComponent from "../../../../components/toggleShadComponent"; +import CodeAreaComponent from "../../../codeAreaComponent"; +import DictComponent from "../../../dictComponent"; +import Dropdown from "../../../dropdownComponent"; +import FloatComponent from "../../../floatComponent"; +import InputFileComponent from "../../../inputFileComponent"; +import InputGlobalComponent from "../../../inputGlobalComponent"; +import InputListComponent from "../../../inputListComponent"; +import IntComponent from "../../../intComponent"; +import KeypairListComponent from "../../../keypairListComponent"; +import PromptAreaComponent from "../../../promptComponent"; +import TextAreaComponent from "../../../textAreaComponent"; +import ToggleShadComponent from "../../../toggleShadComponent"; import useFlowStore from "../../../../stores/flowStore"; import { convertObjToArray, @@ -63,8 +63,8 @@ export default function TableNodeCellRender({ ...id, proxy: templateData.proxy, } - : id - ) + : id, + ), ) ?? false; function getCellType() { switch (templateData.type) { @@ -135,7 +135,7 @@ export default function TableNodeCellRender({
1 ? "my-3" : "" + templateValue?.length > 1 ? "my-3" : "", )} > + { + setValue(e); + setEnabled(e); + }} + size="small" + editNode={true} + /> +
+ ); +} diff --git a/src/frontend/src/modals/editNodeModal/components/tableTooltipRender/index.tsx b/src/frontend/src/components/tableComponent/components/tableTooltipRender/index.tsx similarity index 100% rename from src/frontend/src/modals/editNodeModal/components/tableTooltipRender/index.tsx rename to src/frontend/src/components/tableComponent/components/tableTooltipRender/index.tsx diff --git a/src/frontend/src/modals/editNodeModal/components/tableToggleCellRender/index.tsx b/src/frontend/src/modals/editNodeModal/components/tableToggleCellRender/index.tsx deleted file mode 100644 index 9f9634dca..000000000 --- a/src/frontend/src/modals/editNodeModal/components/tableToggleCellRender/index.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import { CustomCellRendererProps } from "ag-grid-react"; -import { useState } from "react"; -import ToggleShadComponent from "../../../../components/toggleShadComponent"; - -export default function TableToggleCellRender({ - value: { name, enabled, setEnabled }, -}: CustomCellRendererProps) { - const [value, setValue] = useState(enabled); - - return ( - { - setValue(e); - setEnabled(e); - }} - size="small" - editNode={true} - /> - ); -} diff --git a/src/frontend/src/modals/editNodeModal/hooks/use-column-defs.tsx b/src/frontend/src/modals/editNodeModal/hooks/use-column-defs.tsx index 577c10b67..12bfbf302 100644 --- a/src/frontend/src/modals/editNodeModal/hooks/use-column-defs.tsx +++ b/src/frontend/src/modals/editNodeModal/hooks/use-column-defs.tsx @@ -1,14 +1,14 @@ import { ColDef, ValueGetterParams } from "ag-grid-community"; import { useMemo } from "react"; -import TableAutoCellRender from "../../../components/tableAutoCellRender"; -import TableNodeCellRender from "../components/tableNodeCellRender"; -import TableToggleCellRender from "../components/tableToggleCellRender"; -import TableTooltipRender from "../components/tableTooltipRender"; +import TableAutoCellRender from "../../../components/tableComponent/components/tableAutoCellRender"; +import TableNodeCellRender from "../../../components/tableComponent/components/tableNodeCellRender"; +import TableToggleCellRender from "../../../components/tableComponent/components/tableToggleCellRender"; +import TableTooltipRender from "../../../components/tableComponent/components/tableTooltipRender"; const useColumnDefs = ( myData: any, handleOnNewValue: (newValue: any, name: string) => void, - changeAdvanced: (n: string) => void + changeAdvanced: (n: string) => void, ) => { const columnDefs: ColDef[] = useMemo( () => [ @@ -77,7 +77,7 @@ const useColumnDefs = ( cellClass: "no-border", }, ], - [] + [], ); return columnDefs; diff --git a/src/frontend/src/pages/SettingsPage/pages/ApiKeysPage/helpers/column-defs.ts b/src/frontend/src/pages/SettingsPage/pages/ApiKeysPage/helpers/column-defs.ts index b9845098a..9ea7af469 100644 --- a/src/frontend/src/pages/SettingsPage/pages/ApiKeysPage/helpers/column-defs.ts +++ b/src/frontend/src/pages/SettingsPage/pages/ApiKeysPage/helpers/column-defs.ts @@ -1,4 +1,4 @@ -import TableAutoCellRender from "../../../../../components/tableAutoCellRender"; +import TableAutoCellRender from "../../../../../components/tableComponent/components/tableAutoCellRender"; export const getColumnDefs = () => { return [ diff --git a/src/frontend/src/utils/utils.ts b/src/frontend/src/utils/utils.ts index 4680cf8a9..b4a4c058f 100644 --- a/src/frontend/src/utils/utils.ts +++ b/src/frontend/src/utils/utils.ts @@ -1,7 +1,7 @@ import { ColDef, ColGroupDef } from "ag-grid-community"; import clsx, { ClassValue } from "clsx"; import { twMerge } from "tailwind-merge"; -import TableAutoCellRender from "../components/tableAutoCellRender"; +import TableAutoCellRender from "../components/tableComponent/components/tableAutoCellRender"; import { APIDataType, TemplateVariableType } from "../types/api"; import { groupedObjType,