From 35e4d5f6e47c4f4b8d4970683a17f09df60ee00e Mon Sep 17 00:00:00 2001 From: shamsmosowi Date: Mon, 16 Jan 2023 15:55:37 +0100 Subject: [PATCH] enable filter from column menu for derivatives --- src/components/ColumnMenu/ColumnMenu.tsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/ColumnMenu/ColumnMenu.tsx b/src/components/ColumnMenu/ColumnMenu.tsx index 7dff465e..8253eeb4 100644 --- a/src/components/ColumnMenu/ColumnMenu.tsx +++ b/src/components/ColumnMenu/ColumnMenu.tsx @@ -234,14 +234,24 @@ export default function ColumnMenu({ defaultQuery: { key: column.fieldName, operator: - getFieldProp("filter", column.type)!.operators[0]?.value || "==", + getFieldProp( + "filter", + column.type === FieldType.derivative + ? column.config?.renderFieldType + : column.type + )!.operators[0]?.value || "==", value: "", }, }); handleClose(); }, active: column.hidden, - disabled: !getFieldProp("filter", column.type), + disabled: !getFieldProp( + "filter", + column.type === FieldType.derivative + ? column.config?.renderFieldType + : column.type + ), }, ];