Remove flicks when manually refresh database list

sergiisyrovatchenko · May 31, 2020 · 17021a5 · 17021a5
1 parent 4d7958d
commit 17021a5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/Forms/DatabaseBox.cs b/Forms/DatabaseBox.cs
@@ -60,10 +60,7 @@ private void ScanDatabases(object sender, DoWorkEventArgs e) {
         try {
           connection.Open();
 
-          if (!Settings.ServerInfo.IsAzure && Settings.ServerInfo.IsSysAdmin) {
-            _disks = QueryEngine.GetDiskInfo(connection);
-          }
-
+          _disks = QueryEngine.GetDiskInfo(connection);
           _databases = QueryEngine.GetDatabases(connection);
         }
         catch (Exception ex) {
@@ -77,9 +74,11 @@ private void ScanDatabases(object sender, DoWorkEventArgs e) {
     }
 
     private void ScanDatabasesFinish(object sender, RunWorkerCompletedEventArgs e) {
-      if (_disks.Count > 0) {
-        Text = $"{Resources.DatabaseBoxTitle}      {string.Join("  |  ", _disks.Select(_ => _.ToString()))}";
-      }
+      Text = _disks.Count > 0
+          ? $"{Resources.DatabaseBoxTitle}      {string.Join("  |  ", _disks.Select(_ => _.ToString()))}"
+          : Resources.DatabaseBoxTitle;
+
+      grid.DataSource = null;
 
       if (_databases.Count > 0) {
         var max = _databases.Max(_ => _.TotalSize);
@@ -106,10 +105,6 @@ private void RefreshDatabases() {
       Output.Current.Add("Refresh databases...");
 
       _ts = Stopwatch.StartNew();
-      _databases.Clear();
-      _disks.Clear();
-
-      grid.DataSource = null;
       buttonOK.Enabled = false;
       buttonRefresh.Enabled = false;
       TotalSize.Visible = DataSize.Visible = LogSize.Visible = DataFreeSize.Visible = LogFreeSize.Visible = !Settings.ServerInfo.IsAzure;

diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
@@ -293,7 +293,7 @@
     <value>ModifyDate</value>
   </data>
   <data name="DatabaseBoxTitle" xml:space="preserve">
-    <value>Select Databases</value>
+    <value>Databases</value>
   </data>
   <data name="LastRead" xml:space="preserve">
     <value>LastRead</value>