Cleaning stale elements when the reportHash changes (streamlit#617)

* Cleaning stale elements when the reportHash changes * Cleaning * Fixing Metrics * Removing reportName and some cleaning
b-xiang · Nov 7, 2019 · 5f3f902 · 5f3f902
1 parent ae4ac67
commit 5f3f902
Showing 1 changed file with 37 additions and 10 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -78,7 +78,7 @@ interface State {
   connectionState: ConnectionState
   elements: Elements
   reportId: string
-  reportName: string | null
+  reportHash: string | null
   reportRunState: ReportRunState
   showLoginBox: boolean
   userSettings: UserSettings
@@ -113,7 +113,7 @@ class App extends PureComponent<Props, State> {
         sidebar: fromJS([]),
       },
       reportId: "<null>",
-      reportName: null,
+      reportHash: null,
       reportRunState: ReportRunState.NOT_RUNNING,
       showLoginBox: false,
       userSettings: {
@@ -382,10 +382,14 @@ class App extends PureComponent<Props, State> {
    * @param newReportProto a NewReport protobuf
    */
   handleNewReport(newReportProto: NewReport): void {
-    const name = newReportProto.name
-    const scriptPath = newReportProto.scriptPath
+    const { reportHash } = this.state
+    const { name: reportName, scriptPath } = newReportProto
 
-    document.title = `${name} · Streamlit`
+    const newReportHash = hashString(
+      SessionInfo.current.installationId + scriptPath
+    )
+
+    document.title = `${reportName} · Streamlit`
 
     MetricsManager.current.clearDeltaCounter()
 
@@ -394,13 +398,16 @@ class App extends PureComponent<Props, State> {
       // how many projects are being created with Streamlit while still keeping
       // possibly-sensitive info like the scriptPath outside of our metrics
       // services.
-      reportHash: hashString(SessionInfo.current.installationId + scriptPath),
+      reportHash: newReportHash,
     })
 
-    this.setState({
-      reportId: newReportProto.id,
-      reportName: name,
-    })
+    if (reportHash === newReportHash) {
+      this.setState({
+        reportId: newReportProto.id,
+      })
+    } else {
+      this.clearAppState(newReportHash, newReportProto.id)
+    }
   }
 
   /**
@@ -465,6 +472,26 @@ class App extends PureComponent<Props, State> {
       .filter((element: any) => element !== null)
   }
 
+  /*
+   * Clear all elements from the state.
+   */
+  clearAppState(reportHash: string, reportId: string): void {
+    this.setState(
+      {
+        reportHash,
+        reportId,
+        elements: {
+          main: fromJS([]),
+          sidebar: fromJS([]),
+        },
+      },
+      () => {
+        this.elementListBuffer = this.state.elements
+        this.widgetMgr.clean(fromJS([]))
+      }
+    )
+  }
+
   /**
    * Opens a dialog with the specified state.
    */