refactor: update event type cases in NotificationRuleConditionUtil fo…

…r consistency
OneUptime · Feb 7, 2025 · 978ac91 · 978ac91
1 parent cf9b4f0
commit 978ac91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/Common/Types/ServiceProvider/NotificationRules/NotificationRuleCondition.ts b/Common/Types/ServiceProvider/NotificationRules/NotificationRuleCondition.ts
@@ -199,7 +199,7 @@ export class NotificationRuleConditionUtil {
     eventType: NotificationRuleEventType,
   ): Array<NotificationRuleConditionCheckOn> {
     switch (eventType) {
-      case NotificationRuleEventType.IncidentCreatedOrUpdated:
+      case NotificationRuleEventType.Incident:
         return [
           NotificationRuleConditionCheckOn.IncidentName,
           NotificationRuleConditionCheckOn.IncidentDescription,
@@ -208,7 +208,7 @@ export class NotificationRuleConditionUtil {
           NotificationRuleConditionCheckOn.Labels,
           NotificationRuleConditionCheckOn.Monitors,
         ];
-      case NotificationRuleEventType.AlertCreatedOrUpdated:
+      case NotificationRuleEventType.Alert:
         return [
           NotificationRuleConditionCheckOn.AlertName,
           NotificationRuleConditionCheckOn.AlertDescription,
@@ -217,14 +217,14 @@ export class NotificationRuleConditionUtil {
           NotificationRuleConditionCheckOn.Labels,
           NotificationRuleConditionCheckOn.Monitors,
         ];
-      case NotificationRuleEventType.MonitorStatusChanged:
+      case NotificationRuleEventType.MonitorStatus:
         return [
           NotificationRuleConditionCheckOn.MonitorName,
           NotificationRuleConditionCheckOn.MonitorStatus,
           NotificationRuleConditionCheckOn.MonitorType,
           NotificationRuleConditionCheckOn.Monitors,
         ];
-      case NotificationRuleEventType.ScheduledMaintenanceCreatedOrUpdated:
+      case NotificationRuleEventType.ScheduledMaintenance:
         return [
           NotificationRuleConditionCheckOn.ScheduledMaintenanceName,
           NotificationRuleConditionCheckOn.ScheduledMaintenanceDescription,

diff --git a/...Components/ServiceProvider/NotificationRuleViewElement/NotificationRuleViewConditions.tsx b/...Components/ServiceProvider/NotificationRuleViewElement/NotificationRuleViewConditions.tsx
@@ -50,9 +50,6 @@ const NotificationRuleConditions: FunctionComponent<ComponentProps> = (
                   {...props}
                   key={index}
                   notificationRuleCondition={i}
-                  filterCondition={
-                    !isLastItem ? props.filterCondition : undefined
-                  }
                 />{" "}
               </li>
             );