PostHog · daibhin · Oct 24, 2023 · Oct 3, 2023 · Oct 3, 2023 · Oct 3, 2023
diff --git a/...snapshots__/scenes-app-notebooks-components-notebook-select-button--default.png b/...snapshots__/scenes-app-notebooks-components-notebook-select-button--default.png
diff --git a/...ks-components-notebook-select-button--with-no-existing-containing-notebooks.png b/...ks-components-notebook-select-button--with-no-existing-containing-notebooks.png
diff --git a/..._/scenes-app-notebooks-components-notebook-select-button--with-no-notebooks.png b/..._/scenes-app-notebooks-components-notebook-select-button--with-no-notebooks.png
diff --git a/...app-notebooks-components-notebook-select-button--with-slow-network-response.png b/...app-notebooks-components-notebook-select-button--with-slow-network-response.png
diff --git a/frontend/src/scenes/insights/InsightPageHeader.tsx b/frontend/src/scenes/insights/InsightPageHeader.tsx
@@ -285,10 +285,8 @@ export function InsightPageHeader({ insightLogicProps }: { insightLogicProps: In
                             <>
                                 <NotebookSelectButton
                                     resource={{
-                                        attrs: {
-                                            query: { kind: NodeKind.SavedInsightNode, shortId: insight.short_id },
-                                        },
                                         type: NotebookNodeType.Query,
+                                        attrs: { id: insight.short_id },
                                     }}
                                     type="secondary"
                                 />

diff --git a/frontend/src/scenes/notebooks/Notebook/utils.ts b/frontend/src/scenes/notebooks/Notebook/utils.ts
@@ -114,7 +114,6 @@ export const textContent = (node: any): string => {
         'ph-feature-flag': customOrTitleSerializer,
         'ph-feature-flag-code-example': customOrTitleSerializer,
         'ph-image': customOrTitleSerializer,
-        'ph-insight': customOrTitleSerializer,
         'ph-person': customOrTitleSerializer,
         'ph-query': customOrTitleSerializer,
         'ph-recording': customOrTitleSerializer,

diff --git a/frontend/src/scenes/notebooks/NotebookSelectButton/NotebookSelectButton.tsx b/frontend/src/scenes/notebooks/NotebookSelectButton/NotebookSelectButton.tsx
@@ -118,8 +118,8 @@ export function NotebookSelectList(props: NotebookSelectProps): JSX.Element {
     }, [])
 
     return (
-        <div className="space-y-2 flex flex-col flex-1 h-full overflow-hidden">
-            <div className="border-b space-y-2 flex-0">
+        <div className="flex flex-col flex-1 h-full overflow-hidden">
+            <div className="space-y-2 flex-0">
                 <LemonInput
                     type="search"
                     placeholder="Search notebooks..."
@@ -131,6 +131,7 @@ export function NotebookSelectList(props: NotebookSelectProps): JSX.Element {
                     New notebook
                 </LemonButton>
             </div>
+            <LemonDivider />
             <div className="overflow-y-auto flex-1">
                 {notebooksLoading && !notebooksNotContainingResource.length && !notebooksContainingResource.length ? (
                     <div className={'px-2 py-1 flex flex-row items-center space-x-1'}>

diff --git a/frontend/src/scenes/notebooks/NotebooksTable/ContainsTypeFilter.tsx b/frontend/src/scenes/notebooks/NotebooksTable/ContainsTypeFilter.tsx
@@ -9,7 +9,6 @@ export const fromNodeTypeToLabel: Omit<Record<NotebookNodeType, string>, Noteboo
     [NotebookNodeType.EarlyAccessFeature]: 'Early Access Features',
     [NotebookNodeType.Survey]: 'Surveys',
     [NotebookNodeType.Image]: 'Images',
-    [NotebookNodeType.Insight]: 'Insights',
     [NotebookNodeType.Person]: 'Persons',
     [NotebookNodeType.Query]: 'Queries',
     [NotebookNodeType.Recording]: 'Session recordings',

diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -3062,7 +3062,6 @@ export type NotebookType = NotebookListItemType & {
 }
 
 export enum NotebookNodeType {
-    Insight = 'ph-insight',
     Query = 'ph-query',
     Recording = 'ph-recording',
     RecordingPlaylist = 'ph-recording-playlist',

diff --git a/posthog/api/notebook.py b/posthog/api/notebook.py
@@ -290,6 +290,8 @@ def _filter_request(self, request: request.Request, queryset: QuerySet) -> Query
                             # replay timestamps are not at the top level, they're one-level down in a content array
                             presence_match_structure = [{"content": [{"type": f"ph-{target}"}]}]
                             id_match_structure = [{"content": [{"attrs": {"sessionRecordingId": match}}]}]
+                        elif target == "query":
+                            id_match_structure = [{"attrs": {"query": {"kind": "SavedInsightNode", "shortId": match}}}]
 
                         if match == "true" or match is None:
                             queryset = queryset.filter(content__content__contains=presence_match_structure)

diff --git a/posthog/api/test/notebooks/test_notebook_filtering.py b/posthog/api/test/notebooks/test_notebook_filtering.py
@@ -35,10 +35,13 @@
     ],
 }
 
-INSIGHT_COMMENT = lambda id: {
-    "type": "ph-insight",
+QUERY_CONTENT = lambda id: {
+    "type": "ph-query",
     "attrs": {
-        "id": id or "insight_short_id",
+        "query": {
+            "kind": "SavedInsightNode",
+            "shortId": id or "insight_short_id",
+        }
     },
 }
 
@@ -133,7 +136,7 @@ def test_filters_based_on_params(self) -> None:
 
     def test_filtering_by_types(self) -> None:
         playlist_content_notebook = self._create_notebook_with_content([PLAYLIST_CONTENT()])
-        insight_content_notebook = self._create_notebook_with_content([INSIGHT_COMMENT("insight_id")])
+        insight_content_notebook = self._create_notebook_with_content([QUERY_CONTENT("insight_id")])
         feature_flag_content_notebook = self._create_notebook_with_content([FEATURE_FLAG_CONTENT(1)])
         person_content_notebook = self._create_notebook_with_content([PERSON_CONTENT("person_id")])
         recording_comment_notebook = self._create_notebook_with_content(
@@ -146,7 +149,7 @@ def test_filtering_by_types(self) -> None:
         assert len(no_filter_response.json()["results"]) == 6
 
         # filter by insight
-        insight_filter_response = self.client.get(f"/api/projects/{self.team.id}/notebooks?contains=insight:true")
+        insight_filter_response = self.client.get(f"/api/projects/{self.team.id}/notebooks?contains=query:true")
         assert [n["id"] for n in insight_filter_response.json()["results"]] == [insight_content_notebook]
 
         # filter by playlist
@@ -177,7 +180,7 @@ def test_filtering_by_types(self) -> None:
 
     def test_filtering_by_abscence_of_types(self) -> None:
         playlist_content_notebook = self._create_notebook_with_content([PLAYLIST_CONTENT()])
-        insight_content_notebook = self._create_notebook_with_content([INSIGHT_COMMENT("insight_id")])
+        insight_content_notebook = self._create_notebook_with_content([QUERY_CONTENT("insight_id")])
         feature_flag_content_notebook = self._create_notebook_with_content([FEATURE_FLAG_CONTENT(1)])
         person_content_notebook = self._create_notebook_with_content([PERSON_CONTENT("person_id")])
         recording_comment_notebook = self._create_notebook_with_content(
@@ -190,7 +193,7 @@ def test_filtering_by_abscence_of_types(self) -> None:
         assert len(no_filter_response.json()["results"]) == 6
 
         # filter by insight
-        insight_filter_response = self.client.get(f"/api/projects/{self.team.id}/notebooks?contains=insight:false")
+        insight_filter_response = self.client.get(f"/api/projects/{self.team.id}/notebooks?contains=query:false")
         assert sorted([n["id"] for n in insight_filter_response.json()["results"]]) == sorted(
             [
                 playlist_content_notebook,
@@ -267,9 +270,9 @@ def test_filtering_by_abscence_of_types(self) -> None:
             ]
         )
 
-    @parameterized.expand([["insight"], ["insights"]])
+    @parameterized.expand([["query"], ["queries"]])
     def test_filtering_by_just_the_target_name_is_truthy(self, target_name: str) -> None:
-        insight_content_notebook_one = self._create_notebook_with_content([INSIGHT_COMMENT("insight_id_one")])
+        insight_content_notebook_one = self._create_notebook_with_content([QUERY_CONTENT("insight_id_one")])
         _feature_flag_content_notebook_one = self._create_notebook_with_content([FEATURE_FLAG_CONTENT(1)])
         filter_response = self.client.get(f"/api/projects/{self.team.id}/notebooks?contains={target_name}")
         assert sorted([n["id"] for n in filter_response.json()["results"]]) == sorted(
@@ -281,8 +284,8 @@ def test_filtering_by_just_the_target_name_is_truthy(self, target_name: str) ->
     def test_filtering_by_id_of_types(self) -> None:
         self._create_notebook_with_content([PLAYLIST_CONTENT()])
 
-        insight_content_notebook_one = self._create_notebook_with_content([INSIGHT_COMMENT("insight_id_one")])
-        _insight_content_notebook_two = self._create_notebook_with_content([INSIGHT_COMMENT("insight_id_two")])
+        insight_content_notebook_one = self._create_notebook_with_content([QUERY_CONTENT("insight_id_one")])
+        _insight_content_notebook_two = self._create_notebook_with_content([QUERY_CONTENT("insight_id_two")])
 
         feature_flag_content_notebook_one = self._create_notebook_with_content([FEATURE_FLAG_CONTENT(1)])
         _feature_flag_content_notebook_two = self._create_notebook_with_content([FEATURE_FLAG_CONTENT(2)])
@@ -310,7 +313,7 @@ def test_filtering_by_id_of_types(self) -> None:
 
         # filter by insight
         insight_filter_response = self.client.get(
-            f"/api/projects/{self.team.id}/notebooks?contains=insight:insight_id_one"
+            f"/api/projects/{self.team.id}/notebooks?contains=query:insight_id_one"
         )
         assert sorted([n["id"] for n in insight_filter_response.json()["results"]]) == sorted(
             [