From 4c3a3b73e4e4a8280048a9911a262320265a7d70 Mon Sep 17 00:00:00 2001 From: Tom Owers Date: Fri, 18 Oct 2024 09:52:38 +0100 Subject: [PATCH] PR comments --- frontend/src/queries/Query/Query.tsx | 9 ++------- frontend/src/queries/nodes/DataTable/DataTable.tsx | 14 +++++++++++--- .../nodes/DataVisualization/DataVisualization.tsx | 2 +- .../src/queries/nodes/InsightViz/InsightViz.tsx | 2 +- frontend/src/scenes/debug/HogDebug.tsx | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/frontend/src/queries/Query/Query.tsx b/frontend/src/queries/Query/Query.tsx index 40cbf6677412c..2b5d3284bb2ed 100644 --- a/frontend/src/queries/Query/Query.tsx +++ b/frontend/src/queries/Query/Query.tsx @@ -102,6 +102,7 @@ export function Query(props: QueryProps): JSX.Element | null context={queryContext} cachedResults={props.cachedResults} uniqueKey={uniqueKey} + readOnly={readOnly} /> ) } else if (isDataVisualizationNode(query)) { @@ -135,13 +136,7 @@ export function Query(props: QueryProps): JSX.Element | null } else if (isWebOverviewQuery(query)) { component = } else if (isHogQuery(query)) { - component = ( - void)} - queryKey={String(uniqueKey)} - /> - ) + component = void} queryKey={String(uniqueKey)} /> } else { component = } diff --git a/frontend/src/queries/nodes/DataTable/DataTable.tsx b/frontend/src/queries/nodes/DataTable/DataTable.tsx index 335cd7d6730f7..12e4193fe35dc 100644 --- a/frontend/src/queries/nodes/DataTable/DataTable.tsx +++ b/frontend/src/queries/nodes/DataTable/DataTable.tsx @@ -68,7 +68,7 @@ import { DataTableOpenEditor } from './DataTableOpenEditor' interface DataTableProps { uniqueKey?: string | number query: DataTableNode - setQuery?: (query: DataTableNode) => void + setQuery: (query: DataTableNode) => void /** Custom table columns */ context?: QueryContext /* Cached Results are provided when shared or exported, @@ -76,6 +76,7 @@ interface DataTableProps { cachedResults?: AnyResponseType // Override the data logic node key if needed dataNodeLogicKey?: string + readOnly?: boolean } const eventGroupTypes = [ @@ -88,7 +89,14 @@ const personGroupTypes = [TaxonomicFilterGroupType.HogQLExpression, TaxonomicFil let uniqueNode = 0 -export function DataTable({ uniqueKey, query, setQuery, context, cachedResults }: DataTableProps): JSX.Element { +export function DataTable({ + uniqueKey, + query, + setQuery, + context, + cachedResults, + readOnly, +}: DataTableProps): JSX.Element { const [uniqueNodeKey] = useState(() => uniqueNode++) const [dataKey] = useState(() => `DataNode.${uniqueKey || uniqueNodeKey}`) const insightProps: InsightLogicProps = context?.insightProps || { @@ -148,7 +156,7 @@ export function DataTable({ uniqueKey, query, setQuery, context, cachedResults } showTimings, } = queryWithDefaults - const isReadOnly = setQuery === undefined + const isReadOnly = !!readOnly const eventActionsColumnShown = showActions && sourceFeatures.has(QueryFeature.eventActionsColumn) && columnsInResponse?.includes('*') diff --git a/frontend/src/queries/nodes/DataVisualization/DataVisualization.tsx b/frontend/src/queries/nodes/DataVisualization/DataVisualization.tsx index 799a135e5a649..830ed2aabbdb5 100644 --- a/frontend/src/queries/nodes/DataVisualization/DataVisualization.tsx +++ b/frontend/src/queries/nodes/DataVisualization/DataVisualization.tsx @@ -48,7 +48,7 @@ import { displayLogic } from './displayLogic' interface DataTableVisualizationProps { uniqueKey?: string | number query: DataVisualizationNode - setQuery?: (query: DataVisualizationNode) => void + setQuery: (query: DataVisualizationNode) => void context?: QueryContext /* Cached Results are provided when shared or exported, the data node logic becomes read only implicitly */ diff --git a/frontend/src/queries/nodes/InsightViz/InsightViz.tsx b/frontend/src/queries/nodes/InsightViz/InsightViz.tsx index ba58d4a16b5af..5e0e7be45a936 100644 --- a/frontend/src/queries/nodes/InsightViz/InsightViz.tsx +++ b/frontend/src/queries/nodes/InsightViz/InsightViz.tsx @@ -32,7 +32,7 @@ export const insightVizDataCollectionId = (props: InsightLogicProps | undef type InsightVizProps = { uniqueKey?: string | number query: InsightVizNode - setQuery?: (node: InsightVizNode) => void + setQuery: (node: InsightVizNode) => void context?: QueryContext readOnly?: boolean embedded?: boolean diff --git a/frontend/src/scenes/debug/HogDebug.tsx b/frontend/src/scenes/debug/HogDebug.tsx index c2339d759218f..7e4f280793882 100644 --- a/frontend/src/scenes/debug/HogDebug.tsx +++ b/frontend/src/scenes/debug/HogDebug.tsx @@ -100,7 +100,7 @@ export function HogQueryEditor(props: HogQueryEditorProps): JSX.Element { interface HogDebugProps { queryKey: string query: HogQuery - setQuery?: (query: HogQuery) => void + setQuery: (query: HogQuery) => void debug?: boolean }