feat: Re-add the scratchpad to the menu and fix persistence (#18214)

PostHog · Oct 26, 2023 · 578a602 · 578a602
1 parent fa58cb6
commit 578a602
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 7 deletions.
diff --git a/...cenes-app-notebooks-components-notebook-select-button--closed-popover-state.png b/...cenes-app-notebooks-components-notebook-select-button--closed-popover-state.png
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/...omponents-notebook-select-button--with-slow-network-response-closed-popover.png b/...omponents-notebook-select-button--with-slow-network-response-closed-popover.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/models/notebooksModel.ts b/frontend/src/models/notebooksModel.ts
@@ -21,7 +21,7 @@ import { InsightVizNode, Node, NodeKind } from '~/queries/schema'
 
 export const SCRATCHPAD_NOTEBOOK: NotebookListItemType = {
     short_id: 'scratchpad',
-    title: 'Scratchpad',
+    title: 'My scratchpad',
     created_at: '',
     created_by: null,
 }

diff --git a/frontend/src/scenes/notebooks/Notebook/NotebookListMini.tsx b/frontend/src/scenes/notebooks/Notebook/NotebookListMini.tsx
@@ -16,7 +16,7 @@ export function NotebookListMini({ selectedNotebookId }: NotebookListMiniProps):
 
     const selectedTitle =
         selectedNotebookId === 'scratchpad'
-            ? 'Scratchpad'
+            ? 'My scratchpad'
             : notebookTemplates.find((notebook) => notebook.short_id === selectedNotebookId)?.title ||
               notebooks.find((notebook) => notebook.short_id === selectedNotebookId)?.title ||
               'Untitled'

diff --git a/frontend/src/scenes/notebooks/Notebook/migrations/migrate.ts b/frontend/src/scenes/notebooks/Notebook/migrations/migrate.ts
@@ -9,7 +9,7 @@ import { NotebookNodeType, NotebookType } from '~/types'
 export const NOTEBOOKS_VERSION = '1'
 
 export function migrate(notebook: NotebookType): NotebookType {
-    let content = notebook.content.content
+    let content = notebook.content?.content
 
     if (!content) {
         return notebook

diff --git a/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts b/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts
@@ -111,7 +111,7 @@ export const notebookLogic = kea<notebookLogicType>([
     reducers(({ props }) => ({
         localContent: [
             null as JSONContent | null,
-            { persist: props.mode === 'notebook', prefix: NOTEBOOKS_VERSION },
+            { persist: props.mode !== 'canvas', prefix: NOTEBOOKS_VERSION },
             {
                 setLocalContent: (_, { jsonContent }) => jsonContent,
                 clearLocalContent: () => null,
@@ -198,7 +198,7 @@ export const notebookLogic = kea<notebookLogicType>([
                     if (props.shortId === SCRATCHPAD_NOTEBOOK.short_id) {
                         response = {
                             ...values.scratchpadNotebook,
-                            content: {},
+                            content: null,
                             text_content: null,
                             version: 0,
                         }
@@ -215,7 +215,7 @@ export const notebookLogic = kea<notebookLogicType>([
 
                     const notebook = migrate(response)
 
-                    if (!values.notebook) {
+                    if (!values.notebook && notebook.content) {
                         // If this is the first load we need to override the content fully
                         values.editor?.setContent(notebook.content)
                     }

diff --git a/frontend/src/scenes/notebooks/NotebookSelectButton/NotebookSelectButton.tsx b/frontend/src/scenes/notebooks/NotebookSelectButton/NotebookSelectButton.tsx
@@ -130,6 +130,15 @@ export function NotebookSelectList(props: NotebookSelectProps): JSX.Element {
                 <LemonButton fullWidth icon={<IconPlus />} onClick={openNewNotebook}>
                     New notebook
                 </LemonButton>
+                <LemonButton
+                    fullWidth
+                    onClick={() => {
+                        setShowPopover(false)
+                        openAndAddToNotebook('scratchpad', false)
+                    }}
+                >
+                    My scratchpad
+                </LemonButton>
             </div>
             <LemonDivider />
             <div className="overflow-y-auto flex-1">

diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -3060,7 +3060,7 @@ export type NotebookListItemType = {
 }
 
 export type NotebookType = NotebookListItemType & {
-    content: JSONContent // TODO: Type this better
+    content: JSONContent | null
     version: number
     // used to power text-based search
     text_content?: string | null