From b78fb88dd75a475019e82e6db8e93ebac0b52bfe Mon Sep 17 00:00:00 2001
From: John Knox <jknox@fb.com>
Date: Wed, 29 May 2019 08:40:53 -0700
Subject: [PATCH] Make 'Refresh' update database list

Summary: Previously it only reloaded the current page.

Reviewed By: danielbuechele

Differential Revision: D15535168

fbshipit-source-id: b8252c24ffa74fdf22b2d4b6d5b7f99b40db8e47
---
 src/plugins/databases/index.js | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/plugins/databases/index.js b/src/plugins/databases/index.js
index bac6278da..aa424d5fd 100644
--- a/src/plugins/databases/index.js
+++ b/src/plugins/databases/index.js
@@ -43,6 +43,7 @@ type DatabasesPluginState = {|
   selectedDatabaseTable: ?string,
   pageRowNumber: number,
   databases: Array<DatabaseEntry>,
+  outdatedDatabaseList: boolean,
   viewMode: 'data' | 'structure',
   error: ?null,
   currentPage: ?Page,
@@ -316,6 +317,7 @@ export default class DatabasesPlugin extends FlipperPlugin<
     selectedDatabaseTable: null,
     pageRowNumber: 0,
     databases: [],
+    outdatedDatabaseList: true,
     viewMode: 'data',
     error: null,
     currentPage: null,
@@ -333,17 +335,25 @@ export default class DatabasesPlugin extends FlipperPlugin<
         const updates = results.databases;
         const databases = updates;
         const selectedDatabase =
-          state.selectedDatabase || Object.values(databases)[0]
+          state.selectedDatabase ||
+          (Object.values(databases)[0]
             ? // $FlowFixMe
               Object.values(databases)[0].id
-            : 0;
-        const selectedTable = databases[selectedDatabase - 1].tables[0];
+            : 0);
+        const selectedTable =
+          state.selectedDatabaseTable &&
+          databases[selectedDatabase - 1].tables.includes(
+            state.selectedDatabaseTable,
+          )
+            ? state.selectedDatabaseTable
+            : databases[selectedDatabase - 1].tables[0];
         const sameTableSelected =
           selectedDatabase === state.selectedDatabase &&
           selectedTable === state.selectedDatabaseTable;
         return {
           ...state,
           databases,
+          outdatedDatabaseList: false,
           selectedDatabase: selectedDatabase,
           selectedDatabaseTable: selectedTable,
           pageRowNumber: 0,
@@ -496,6 +506,7 @@ export default class DatabasesPlugin extends FlipperPlugin<
       ): DatabasesPluginState => {
         return {
           ...state,
+          outdatedDatabaseList: true,
           currentPage: null,
         };
       },
@@ -600,12 +611,19 @@ export default class DatabasesPlugin extends FlipperPlugin<
           this.setState({error: e});
         });
     }
+    if (!previousState.outdatedDatabaseList && newState.outdatedDatabaseList) {
+      this.databaseClient.getDatabases({}).then(databases => {
+        this.dispatchAction({
+          type: 'UpdateDatabases',
+          databases,
+        });
+      });
+    }
   }
 
   init() {
     this.databaseClient = new DatabaseClient(this.client);
     this.databaseClient.getDatabases({}).then(databases => {
-      console.log(databases);
       this.dispatchAction({
         type: 'UpdateDatabases',
         databases,