Fix extra fields on findings not saving

The extra field was being set in the wrong place in the gql query
data.

Author: aparrill-specterops

javascript/src/collab_server/handlers/finding.ts

@@ -85,6 +85,7 @@ const FindingHandler = simpleModelHandler(
     (doc, id) => {
         const plainFields = doc.get("plain_fields", Y.Map<any>);
         const extraFields = extraFieldsFromYdoc(doc);
+        console.log("DEBUG", extraFields);
         return {
             id,
             set: {
@@ -110,9 +111,9 @@ const FindingHandler = simpleModelHandler(
                 findingGuidance: yjsToHtml(
                     doc.get("findingGuidance", Y.XmlFragment)
                 ),
+                extraFields,
             },
             tags: yjsToTags(doc.get("tags", Y.Map<boolean>)),
-            extraFields,
         };
     }
 );

javascript/src/collab_server/handlers/report_finding_link.ts

@@ -118,9 +118,9 @@ const ReportFindingLinkHandler = simpleModelHandler(
                 affectedEntities: yjsToHtml(
                     doc.get("affectedEntities", Y.XmlFragment)
                 ),
+                extraFields,
             },
             tags: yjsToTags(doc.get("tags", Y.Map<boolean>)),
-            extraFields,
         };
     }
 );