From 19a63d6956a16dd1e74d4299b96bfd0d0f673de5 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Tue, 14 Jan 2025 10:56:07 -0600 Subject: [PATCH] Read filterFieldName and columnsFieldName from widgetData --- .../misc/FilterAndColumnsSetupWidget.tsx | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/qqq/components/widgets/misc/FilterAndColumnsSetupWidget.tsx b/src/qqq/components/widgets/misc/FilterAndColumnsSetupWidget.tsx index 960c163..201b4bc 100644 --- a/src/qqq/components/widgets/misc/FilterAndColumnsSetupWidget.tsx +++ b/src/qqq/components/widgets/misc/FilterAndColumnsSetupWidget.tsx @@ -86,10 +86,13 @@ const qController = Client.getInstance(); export default function FilterAndColumnsSetupWidget({isEditable, widgetMetaData, widgetData, recordValues, onSaveCallback}: FilterAndColumnsSetupWidgetProps): JSX.Element { const [modalOpen, setModalOpen] = useState(false); - const [hideColumns, setHideColumns] = useState(widgetData?.hideColumns); - const [hidePreview, setHidePreview] = useState(widgetData?.hidePreview); + const [hideColumns] = useState(widgetData?.hideColumns); + const [hidePreview] = useState(widgetData?.hidePreview); const [tableMetaData, setTableMetaData] = useState(null as QTableMetaData); + const [filterFieldName] = useState(widgetData?.filterFieldName ?? "queryFilterJson") + const [columnsFieldName] = useState(widgetData?.columnsFieldName ?? "columnsJson") + const [alertContent, setAlertContent] = useState(null as string); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -108,7 +111,7 @@ export default function FilterAndColumnsSetupWidget({isEditable, widgetMetaData, ///////////////////////////// let columns: QQueryColumns = null; let usingDefaultEmptyFilter = false; - let queryFilter = recordValues["queryFilterJson"] && JSON.parse(recordValues["queryFilterJson"]) as QQueryFilter; + let queryFilter = recordValues[filterFieldName] && JSON.parse(recordValues[filterFieldName]) as QQueryFilter; const defaultFilterFields = widgetData?.filterDefaultFieldNames; if (!queryFilter) { @@ -142,9 +145,9 @@ export default function FilterAndColumnsSetupWidget({isEditable, widgetMetaData, }); } - if (recordValues["columnsJson"]) + if (recordValues[columnsFieldName]) { - columns = QQueryColumns.buildFromJSON(recordValues["columnsJson"]); + columns = QQueryColumns.buildFromJSON(recordValues[columnsFieldName]); } ////////////////////////////////////////////////////////////////////// @@ -230,7 +233,10 @@ export default function FilterAndColumnsSetupWidget({isEditable, widgetMetaData, setFrontendQueryFilter(view.queryFilter); const filter = FilterUtils.prepQueryFilterForBackend(tableMetaData, view.queryFilter); - onSaveCallback({queryFilterJson: JSON.stringify(filter), columnsJson: JSON.stringify(view.queryColumns)}); + const rs: {[key: string]: any} = {}; + rs[filterFieldName] = JSON.stringify(filter); + rs[columnsFieldName] = JSON.stringify(view.queryColumns); + onSaveCallback(rs); closeEditor(); }