fix(hogql): fix saving hogql query nodes (#17522)

PostHog · Sep 19, 2023 · 89b22a3 · 89b22a3
1 parent ea13d0b
commit 89b22a3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/...napshots__/scenes-app-recordings--recordings-play-list-no-pinned-recordings.png b/...napshots__/scenes-app-recordings--recordings-play-list-no-pinned-recordings.png
diff --git a/frontend/src/scenes/insights/Insight.tsx b/frontend/src/scenes/insights/Insight.tsx
@@ -11,7 +11,7 @@ import { InsightSkeleton } from 'scenes/insights/InsightSkeleton'
 import { Query } from '~/queries/Query/Query'
 import { InsightPageHeader } from 'scenes/insights/InsightPageHeader'
 import { containsHogQLQuery, isInsightVizNode } from '~/queries/utils'
-
+import { Node } from '~/queries/schema'
 export interface InsightSceneProps {
     insightId: InsightShortId | 'new'
 }
@@ -30,6 +30,7 @@ export function Insight({ insightId }: InsightSceneProps): JSX.Element {
 
     // insightDataLogic
     const { query, isQueryBasedInsight, showQueryEditor } = useValues(insightDataLogic(insightProps))
+    const { setQuery: setInsightQuery } = useActions(insightDataLogic(insightProps))
 
     // other logics
     useMountedLogic(insightCommandLogic(insightProps))
@@ -48,6 +49,12 @@ export function Insight({ insightId }: InsightSceneProps): JSX.Element {
         insightMode === ItemMode.Edit &&
         ((isQueryBasedInsight && !containsHogQLQuery(query)) || (!isQueryBasedInsight && showQueryEditor))
 
+    const setQuery = (query: Node): void => {
+        if (!isInsightVizNode(query)) {
+            setInsightQuery(query)
+        }
+    }
+
     return (
         <BindLogic logic={insightLogic} props={insightProps}>
             <div className={'insights-page'}>
@@ -57,6 +64,7 @@ export function Insight({ insightId }: InsightSceneProps): JSX.Element {
 
                 <Query
                     query={isInsightVizNode(query) ? { ...query, full: true } : query}
+                    setQuery={insightMode === ItemMode.Edit ? setQuery : undefined}
                     readOnly={insightMode !== ItemMode.Edit}
                     context={{
                         showOpenEditorButton: false,

diff --git a/frontend/src/scenes/insights/insightVizDataLogic.ts b/frontend/src/scenes/insights/insightVizDataLogic.ts
@@ -242,11 +242,11 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
             }
         },
         setQuery: ({ query }) => {
-            if (props.setQuery) {
-                props.setQuery(query as InsightVizNode)
-            }
-
             if (isInsightVizNode(query)) {
+                if (props.setQuery) {
+                    props.setQuery(query as InsightVizNode)
+                }
+
                 const querySource = query.source
                 const filters = queryNodeToFilter(querySource)
                 actions.setFilters(filters)