@@ -291,6 +291,16 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked {
291291 return this . eventTrigger . case_fields ;
292292 }
293293
294+ private getCaseFieldsFromCurrentAndPreviousPages ( ) : CaseField [ ] {
295+ const result : CaseField [ ] = [ ]
296+ this . wizard . pages . forEach ( page => {
297+ if ( page . order <= this . currentPage . order ) {
298+ page . case_fields . forEach ( field => result . push ( field ) ) ;
299+ }
300+ } )
301+ return result ;
302+ }
303+
294304 private buildCaseEventData ( ) : CaseEventData {
295305 // Get hold of the fields specific to the current page that we're going to submit.
296306 const pageFormFields = this . formValueService . filterCurrentPageFields ( this . currentPage . case_fields , this . editForm . value ) ;
@@ -305,7 +315,8 @@ export class CaseEditPageComponent implements OnInit, AfterViewChecked {
305315 // Now add the remaining bits and pieces to the CaseEventData,
306316 // The event_data should be the full context of the event, including values from previous pages, but not labels
307317 caseEventData . event_data = this . editForm . value . data ;
308- this . formValueService . removeUnnecessaryFields ( caseEventData . event_data , this . getCaseFields ( ) , false , true ) ;
318+ this . formValueService . removeUnnecessaryFields ( caseEventData . event_data , this . getCaseFieldsFromCurrentAndPreviousPages ( ) ,
319+ false , true ) ;
309320 caseEventData . event_token = this . eventTrigger . event_token ;
310321 caseEventData . ignore_warning = this . ignoreWarning ;
311322
0 commit comments