AB#1064 bugfix for adding event to report

NCI-Agency · Oct 8, 2024 · 948880d · 948880d
1 parent 04f4cac
commit 948880d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/client/src/models/Event.js b/client/src/models/Event.js
@@ -371,7 +371,7 @@ export default class Event extends Model {
     super(Model.fillObject(props, Event.yupSchema))
   }
 
-  static FILTERED_CLIENT_SIDE_FIELDS = []
+  static FILTERED_CLIENT_SIDE_FIELDS = ["tasks", "organizations", "people"]
 
   static filterClientSideFields(obj, ...additionalFields) {
     return Model.filterClientSideFields(

diff --git a/client/src/pages/reports/Form.js b/client/src/pages/reports/Form.js
@@ -614,6 +614,7 @@ const ReportForm = ({
                   name="event"
                   component={FieldHelper.SpecialField}
                   onChange={value => {
+                    value = Event.filterClientSideFields(value)
                     // validation will be done by setFieldValue
                     setFieldTouched("event", true, false) // onBlur doesn't work when selecting an option
                     setFieldValue("event", value, true)

diff --git a/client/src/pages/reports/New.js b/client/src/pages/reports/New.js
@@ -84,9 +84,7 @@ const ReportNewConditional = ({
     const event = new Event(data.event)
     const tasks = []
     event.tasks.forEach(task => tasks.push(new Task(task)))
-    // We do not want tasks to go with event Probably there is a better way to do this?
-    event.tasks = []
-    report.event = event
+    report.event = Event.filterClientSideFields(event)
     report.location = event.location
     report.tasks = tasks
   }