Reworked to fix Documents DataGridView refresh issues. #76

Signed-off-by: Robert F. Frasca <[email protected]>

Author: rffrasca

src/PDFKeeper.Core/Extensions/DataTableExtension.cs

@@ -38,14 +38,21 @@ internal static class DataTableExtension
         internal static bool Compare(this DataTable dataTable1, DataTable dataTable2)
         {
             var diffsExist = false;
-            var set1 = new HashSet<string>(dataTable1.AsEnumerable().Select(row => string.Join(
+            if (dataTable1.Rows.Count.Equals(dataTable2.Rows.Count))
+            {
+                var set1 = new HashSet<string>(dataTable1.AsEnumerable().Select(row => string.Join(
                 ",",
                 row.ItemArray)));
-            var set2 = new HashSet<string>(dataTable2.AsEnumerable().Select(row => string.Join(
-                ",",
-                row.ItemArray)));
-            set1.Except(set2).ToList().ForEach(diff => diffsExist = true);
-            set2.Except(set2).ToList().ForEach(diff => diffsExist = true);
+                var set2 = new HashSet<string>(dataTable2.AsEnumerable().Select(row => string.Join(
+                    ",",
+                    row.ItemArray)));
+                set1.Except(set2).ToList().ForEach(diff => diffsExist = true);
+                set2.Except(set2).ToList().ForEach(diff => diffsExist = true);
+            }
+            else
+            {
+                diffsExist = true;
+            }         
             return diffsExist;
         }
     }

src/PDFKeeper.Core/Presenters/MainPresenter.cs

@@ -1208,7 +1208,7 @@ private void SetStateForNotesChanged(bool notesChanged, bool canUndo)
 
         /// <summary>
         /// Gets a list of documents based on the properties in
-        /// ApplicationGlobal.FindDocumentsParam
+        /// ApplicationGlobal.FindDocumentsParam.
         /// </summary>
         /// <param name="selectCurrentDocument">
         /// Select the current document after getting documents.
@@ -1252,11 +1252,9 @@ private void GetListOfDocuments(bool selectCurrentDocument)
                             documents = documentRepository.GetListOfDocuments();
                         }
                     }
-                    if (ViewModel.Documents == null)
-                    {
-                        ViewModel.Documents = documents;
-                    }
-                    else if (documents.Compare(ViewModel.Documents))
+                    if (selectCurrentDocument &&
+                        documents.Compare(ViewModel.Documents) ||
+                        !selectCurrentDocument)
                     {
                         ViewModel.Documents = documents;
                     }
@@ -1267,13 +1265,16 @@ private void GetListOfDocuments(bool selectCurrentDocument)
                 }
                 finally
                 {
-                    var columnName = ViewModel.Documents.Columns[0].ColumnName;
-                    foreach (DataRow row in ViewModel.Documents.Rows)
+                    if (selectCurrentDocument)
                     {
-                        var id = Convert.ToInt32(row[columnName].ToString());
-                        if (id.Equals(currentDocumentId))
+                        var columnName = ViewModel.Documents.Columns[0].ColumnName;
+                        foreach (DataRow row in ViewModel.Documents.Rows)
                         {
-                            ViewModel.CurrentDocumentId = currentDocumentId;
+                            var id = Convert.ToInt32(row[columnName].ToString());
+                            if (id.Equals(currentDocumentId))
+                            {
+                                ViewModel.CurrentDocumentId = currentDocumentId;
+                            }
                         }
                     }
                     ViewModel.RefreshingDocumentsImageVisible = false;