@@ -611,38 +611,45 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
611
611
'alertType' ,
612
612
] . includes ( name )
613
613
) {
614
- this . setState ( ( { dataset : _dataset , aggregate, alertType} ) => {
615
- const dataset = this . checkOnDemandMetricsDataset (
616
- name === 'dataset' ? ( value as Dataset ) : _dataset ,
617
- this . state . query
618
- ) ;
614
+ this . setState (
615
+ ( { dataset : _dataset , aggregate, alertType, eventTypes : _eventTypes } ) => {
616
+ const dataset = this . checkOnDemandMetricsDataset (
617
+ name === 'dataset' ? ( value as Dataset ) : _dataset ,
618
+ this . state . query
619
+ ) ;
620
+
621
+ const eventTypes =
622
+ name === 'eventTypes' ? ( value as EventTypes [ ] ) : _eventTypes ;
623
+
624
+ if ( deprecateTransactionAlerts ( organization ) ) {
625
+ const newAlertType = getAlertTypeFromAggregateDataset ( {
626
+ aggregate : name === 'aggregate' ? ( value as string ) : aggregate ,
627
+ dataset,
628
+ organization,
629
+ eventTypes,
630
+ } ) ;
631
+
632
+ return {
633
+ [ name ] : value ,
634
+ alertType : newAlertType ,
635
+ dataset,
636
+ } ;
637
+ }
619
638
620
- if ( deprecateTransactionAlerts ( organization ) ) {
621
639
const newAlertType = getAlertTypeFromAggregateDataset ( {
622
- aggregate : name === 'aggregate' ? ( value as string ) : aggregate ,
640
+ aggregate,
623
641
dataset,
642
+ eventTypes,
624
643
organization,
625
644
} ) ;
626
645
627
646
return {
628
647
[ name ] : value ,
629
- alertType : newAlertType ,
648
+ alertType : alertType === newAlertType ? alertType : 'custom_transactions' ,
630
649
dataset,
631
650
} ;
632
651
}
633
-
634
- const newAlertType = getAlertTypeFromAggregateDataset ( {
635
- aggregate,
636
- dataset,
637
- organization,
638
- } ) ;
639
-
640
- return {
641
- [ name ] : value ,
642
- alertType : alertType === newAlertType ? alertType : 'custom_transactions' ,
643
- dataset,
644
- } ;
645
- } ) ;
652
+ ) ;
646
653
}
647
654
} ;
648
655
0 commit comments