Fix for issue 2136 (#2137)

* Fixes issue #2136

* Small fixes

Author: JanKallman

src/EPPlus/Table/PivotTable/PivotTableCacheInternal.cs

@@ -265,7 +265,7 @@ internal void RefreshFields(bool checkSourceValid)
                 else
                 {
                     var ws = r.Worksheet;
-                    var name = ws.GetValue(r._fromRow, col)?.ToString().Trim();
+                    var name = ws.GetValue(r._fromRow, col)?.ToString();
                     ExcelPivotTableCacheField field;
                     if (_fields==null || ix >= _fields?.Count || _fields[ix].Name != name)
                     {
@@ -469,23 +469,41 @@ private void UpdateFieldReferences(List<ExcelPivotTableCacheField> fields, List<
                     pt.DeleteNode("d:dataFields");
                 }
 
+                var rmFields=new List<ExcelPivotTableField>();
                 //Update column field index
                 foreach (var cf in pt.ColumnFields)
                 {
                     UpdateRowColPathFieldXml(oldIndex, pt, cf, "d:colFields/d:field[@x={0}]", "x");
+                    if (!pt.Fields.Any(x => x.Name.Equals(cf.Name, StringComparison.CurrentCultureIgnoreCase)))
+                    {
+                        rmFields.Add(cf);
+                    }
                 }
+                rmFields.ForEach(f=>pt.ColumnFields.Remove(f));
+                rmFields.Clear();
 
                 //Update row field index
                 foreach (var rf in pt.RowFields)
                 {
                     UpdateRowColPathFieldXml(oldIndex, pt, rf, "d:rowFields/d:field[@x={0}]", "x");
+                    if (!pt.Fields.Any(x=>x.Name.Equals(rf.Name, StringComparison.CurrentCultureIgnoreCase)))
+                    {
+                        rmFields.Add(rf);
+                    }
                 }
+                rmFields.ForEach(f => pt.RowFields.Remove(f));
+                rmFields.Clear();
 
                 //Update page field index
                 foreach (var pf in pt.PageFields)
                 {
                     UpdateRowColPathFieldXml(oldIndex, pt, pf, "d:pageFields/d:pageField[@fld={0}]", "fld");
+                    if (!pt.Fields.Any(x => x.Name.Equals(pf.Name, StringComparison.CurrentCultureIgnoreCase)))
+                    {
+                        rmFields.Add(pf);
+                    }
                 }
+                rmFields.ForEach(f => pt.PageFields.Remove(f));
 
                 //Update styles
                 var newIndex = movedFields.Where(x => x >= 0).ToDictionary(x => x, x => movedFields.IndexOf(x));

src/EPPlus/Table/PivotTable/PivotTableCacheRecords.cs

@@ -153,7 +153,7 @@ internal void CreateRecords()
 							f._fieldRecordIndex[ix].Add(ciIx);
 						}
 						else
-						{
+						{   
 							f._fieldRecordIndex.Add(ix, new List<int> { ciIx });
 						}
 					}

src/EPPlusTest/Issues/LegacyTests/Issues.cs

@@ -4284,7 +4284,7 @@ public void s803()
                 SaveAndCleanup(p);
             }
         }
-        [TestMethod]
+        [TestMethod, Ignore]
         public void s431()
         {
             using (var package = OpenTemplatePackage("template-not-working.xlsx"))

src/EPPlusTest/Issues/PivotTableIssues.cs

@@ -620,5 +620,29 @@ public void s993()
                 Assert.AreEqual("60000", cell1);
             }
         }
+        [TestMethod]
+        public void TestPivot()
+        {
+            var package = OpenTemplatePackage("TestTemplate3.xlsx");
+            var pivotTableCollections = package.Workbook.Worksheets.Select(x => x.PivotTables).ToList();
+            // Iterate through each collection of pivot tables and refresh them
+            foreach (var pivotTables in pivotTableCollections)
+            {
+                foreach (var pivotTable in pivotTables)
+                {
+                    var pivotData = pivotTable.CalculatedData;
+
+                    if (pivotTable.CacheDefinition != null)
+                    {
+                        pivotTable.CacheDefinition.Refresh();
+                        pivotTable.CacheDefinition.SaveData = true;
+                    }
+
+                    pivotTable.Calculate(false);
+                }
+            }
+            SaveAndCleanup(package);
+        }
+
     }
 }