Merge pull request #811 from solidify/bugfix/fix-for-removed-labels

Fix for removed or replaced WIFields
solidify · Jul 23, 2023 · ebe3cae · ebe3cae
2 parents a71689a + 868d297
commit ebe3cae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/WorkItemMigrator/WorkItemImport/WitClient/JsonPatchDocUtils.cs b/src/WorkItemMigrator/WorkItemImport/WitClient/JsonPatchDocUtils.cs
@@ -13,11 +13,6 @@ public static JsonPatchOperation CreateJsonFieldPatchOp(Operation op, string key
                 throw new ArgumentException(nameof(key));
             }
 
-            if (value == null)
-            {
-                throw new ArgumentException(nameof(value));
-            }
-
             return new JsonPatchOperation()
             {
                 Operation = op,

diff --git a/src/WorkItemMigrator/WorkItemImport/WitClient/WitClientUtils.cs b/src/WorkItemMigrator/WorkItemImport/WitClient/WitClientUtils.cs
@@ -526,9 +526,18 @@ public void SaveWorkItemFields(WorkItem wi)
 
                 object val = wi.Fields[key];
 
-                patchDocument.Add(
-                    JsonPatchDocUtils.CreateJsonFieldPatchOp(Operation.Add, key, val)
-                );
+                if (val == null || val.ToString() == "")
+                {
+                    patchDocument.Add(
+                        JsonPatchDocUtils.CreateJsonFieldPatchOp(Operation.Remove, key, null)
+                    );
+                }
+                else
+                {
+                    patchDocument.Add(
+                        JsonPatchDocUtils.CreateJsonFieldPatchOp(Operation.Replace, key, val)
+                    );
+                }
             }
 
             try