diff --git a/agenta-web/src/components/ServerTable/components.tsx b/agenta-web/src/components/ServerTable/components.tsx index de3d5bd30d..a1e5454f2c 100644 --- a/agenta-web/src/components/ServerTable/components.tsx +++ b/agenta-web/src/components/ServerTable/components.tsx @@ -1,9 +1,9 @@ import {GenericObject, JSSTheme, PaginationQuery} from "@/lib/Types" -import {Button, Dropdown, Input, Space} from "antd" +import {Button, Dropdown, DropdownProps, Input, Space} from "antd" import {ColumnsType} from "antd/es/table" import {FilterDropdownProps} from "antd/es/table/interface" import dayjs from "dayjs" -import React, {ReactNode, useMemo} from "react" +import React, {ReactNode, useMemo, useState} from "react" import {createUseStyles} from "react-jss" import {Resizable} from "react-resizable" import EnforceAntdStyles from "../EnforceAntdStyles/EnforceAntdStyles" @@ -100,6 +100,13 @@ interface ColsDropdownProps { export const ColsDropdown = ({columns, hiddenCols, setHiddenCols}: ColsDropdownProps) => { const classes = useStyles() + const [isFilterColsDropdownOpen, setIsFilterColsDropdownOpen] = useState(false) + + const handleOpenChangeFilterCols: DropdownProps["onOpenChange"] = (nextOpen, info) => { + if (info.source === "trigger" || nextOpen) { + setIsFilterColsDropdownOpen(nextOpen) + } + } const shownCols = useMemo( () => columns @@ -119,6 +126,8 @@ export const ColsDropdown = ({columns, hiddenCols, setHiddenCols}: ColsDropd return ( ({ @@ -130,7 +139,10 @@ export const ColsDropdown = ({columns, hiddenCols, setHiddenCols}: ColsDropd ), })) as any, - onClick: ({key}) => onColToggle(key), + onClick: ({key}) => { + onColToggle(key) + setIsFilterColsDropdownOpen(true) + }, className: classes.dropdownMenu, }} > diff --git a/agenta-web/src/lib/helpers/fileManipulations.ts b/agenta-web/src/lib/helpers/fileManipulations.ts index d4434e6200..e3b6890e92 100644 --- a/agenta-web/src/lib/helpers/fileManipulations.ts +++ b/agenta-web/src/lib/helpers/fileManipulations.ts @@ -5,6 +5,8 @@ export const convertToCsv = (rows: GenericObject[], header: string[]) => { return Papa.unparse({fields: header.filter((item) => !!item), data: rows}) } +export const escapeNewlines = (value: string) => value.replace(/\n/g, "\\n") + export const downloadCsv = (csvContent: string, filename: string): void => { if (typeof window === "undefined") return