From d1656f8561fd3c0beaee9e63e798bb836639a684 Mon Sep 17 00:00:00 2001
From: Nikhil <nikhil.k.mandlik@nasa.gov>
Date: Tue, 24 Nov 2020 14:21:36 -0800
Subject: [PATCH] Notebook localstorage issue (#3545)

* Unable to edit Notebooks (Firefox) #3534
Unable to take a snapshot - snapshot dropdown not working #3533

* Navigating to a Notebook snapshot not working #3538

Co-authored-by: Shefali Joshi <simplyrender@gmail.com>
---
 .../notebook/components/NotebookEmbed.vue     |  3 ++-
 .../components/NotebookMenuSwitcher.vue       |  4 +++-
 .../notebook/utils/notebook-storage.js        | 21 +++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/plugins/notebook/components/NotebookEmbed.vue b/src/plugins/notebook/components/NotebookEmbed.vue
index 9a61fc6700..d291cc5374 100644
--- a/src/plugins/notebook/components/NotebookEmbed.vue
+++ b/src/plugins/notebook/components/NotebookEmbed.vue
@@ -118,7 +118,7 @@ export default {
             painterroInstance.show(this.embed.snapshot.src);
         },
         changeLocation() {
-            const link = this.embed.historicLink;
+            const hash = this.embed.historicLink;
 
             const bounds = this.openmct.time.bounds();
             const isTimeBoundChanged = this.embed.bounds.start !== bounds.start
@@ -143,6 +143,7 @@ export default {
                 this.openmct.notifications.alert(message);
             }
 
+            const link = `${location.host}${location.pathname}${hash}`;
             const url = new URL(link);
             window.location.href = url.hash;
         },
diff --git a/src/plugins/notebook/components/NotebookMenuSwitcher.vue b/src/plugins/notebook/components/NotebookMenuSwitcher.vue
index 05a9307bcd..faf0f7052d 100644
--- a/src/plugins/notebook/components/NotebookMenuSwitcher.vue
+++ b/src/plugins/notebook/components/NotebookMenuSwitcher.vue
@@ -17,7 +17,7 @@
 
 <script>
 import Snapshot from '../snapshot';
-import { getDefaultNotebook } from '../utils/notebook-storage';
+import { getDefaultNotebook, validateNotebookStorageObject } from '../utils/notebook-storage';
 import { NOTEBOOK_DEFAULT, NOTEBOOK_SNAPSHOT } from '../notebook-constants';
 
 export default {
@@ -49,6 +49,8 @@ export default {
         };
     },
     mounted() {
+        validateNotebookStorageObject();
+
         this.notebookSnapshot = new Snapshot(this.openmct);
         this.setDefaultNotebookStatus();
     },
diff --git a/src/plugins/notebook/utils/notebook-storage.js b/src/plugins/notebook/utils/notebook-storage.js
index 7084f69d60..307e7040ea 100644
--- a/src/plugins/notebook/utils/notebook-storage.js
+++ b/src/plugins/notebook/utils/notebook-storage.js
@@ -67,3 +67,24 @@ export function setDefaultNotebookPage(page) {
     notebookStorage.page = page;
     saveDefaultNotebook(notebookStorage);
 }
+
+export function validateNotebookStorageObject() {
+    const notebookStorage = getDefaultNotebook();
+
+    let valid = false;
+    if (notebookStorage) {
+        Object.entries(notebookStorage).forEach(([key, value]) => {
+            const validKey = key !== undefined && key !== null;
+            const validValue = value !== undefined && value !== null;
+            valid = validKey && validValue;
+        });
+    }
+
+    if (valid) {
+        return notebookStorage;
+    }
+
+    console.warn('Invalid Notebook object, clearing default notebook storage');
+
+    clearDefaultNotebook();
+}