feat: Refactor EventCard, EventGrid, ServiceItem, Home, SLA, and TransformerV2 to utilize IsIncident for improved event handling and update version to 0.2.0

Author: Aloento

src/Components/Event/EventCard.tsx

@@ -3,15 +3,15 @@ import { Dic } from "~/Helpers/Entities";
 import { Models } from "~/Services/Status.Models";
 import { Authorized } from "../Auth/With";
 import { Indicator } from "../Home/Indicator";
-import { EventStatus, EventType } from "./Enums";
+import { EventStatus, IsIncident } from "./Enums";
 import { EventAffected } from "./EventAffected";
 import { EventEditor } from "./EventEditor";
 import { EventExtract } from "./EventExtract";
 
 /**
  * @author Aloento
  * @since 1.0.0
- * @version 0.1.0
+ * @version 0.2.0
  */
 export function EventCard({ Event }: { Event: Models.IEvent }) {
   return (
@@ -51,12 +51,12 @@ export function EventCard({ Event }: { Event: Models.IEvent }) {
           </label>
 
           <label className="text-xl font-medium text-slate-600 whitespace-nowrap">
-            {Event.Type === EventType.Maintenance &&
+            {!IsIncident(Event.Type) &&
               Event.Status !== EventStatus.Completed &&
               "(Plan)"} End At:
           </label>
 
-          {Event.Type === EventType.Maintenance && Event.Description &&
+          {!IsIncident(Event.Type) && Event.Description &&
             <label className="text-xl font-medium text-slate-600">
               Description:
             </label>}
@@ -79,7 +79,7 @@ export function EventCard({ Event }: { Event: Models.IEvent }) {
             {Event.End ? dayjs(Event.End).tz(Dic.TZ).format(Dic.TimeTZ) : "Still Ongoing"}
           </label>
 
-          {Event.Type === EventType.Maintenance && Event.Description &&
+          {!IsIncident(Event.Type) && Event.Description &&
             <label className="text-xl font-medium text-slate-700 break-all">
               {Event.Description}
             </label>}

src/Components/Home/EventGrid.tsx

@@ -5,7 +5,7 @@ import { chain } from "lodash";
 import { useEffect, useRef } from "react";
 import { Dic } from "~/Helpers/Entities";
 import { useStatus } from "~/Services/Status";
-import { EventType, IsOpenStatus } from "../Event/Enums";
+import { EventType, IsIncident, IsOpenStatus } from "../Event/Enums";
 
 /**
  * @author Aloento
@@ -87,7 +87,7 @@ export function EventGrid() {
         }
       })
       .filter(x => {
-        if (x.Type !== EventType.Maintenance && x.End) {
+        if (IsIncident(x.Type) && x.End) {
           return false;
         }
 

src/Components/Home/ServiceItem.tsx

@@ -4,7 +4,7 @@ import { chain } from "lodash";
 import { useEffect, useState } from "react";
 import { useStatus } from "~/Services/Status";
 import { Models } from "~/Services/Status.Models";
-import { EventType, IsOpenStatus } from "../Event/Enums";
+import { EventType, IsIncident, IsOpenStatus } from "../Event/Enums";
 import { Indicator } from "./Indicator";
 import "./ServiceItem.css";
 
@@ -15,7 +15,7 @@ interface IServiceItem {
 /**
  * @author Aloento
  * @since 1.0.0
- * @version 0.1.0
+ * @version 0.2.0
  */
 export function ServiceItem({ RegionService }: IServiceItem) {
   const { DB } = useStatus();
@@ -27,7 +27,7 @@ export function ServiceItem({ RegionService }: IServiceItem) {
   useEffect(() => {
     const res = chain([...RegionService.Events])
       .filter(x => {
-        if (x.Type !== EventType.Maintenance && x.End) {
+        if (IsIncident(x.Type) && x.End) {
           return false;
         }
 

src/Helpers/SLA.ts

@@ -1,6 +1,6 @@
 import dayjs from 'dayjs';
 import { chain } from 'lodash';
-import { EventType } from '~/Components/Event/Enums';
+import { IsIncident } from '~/Components/Event/Enums';
 import { Models } from "~/Services/Status.Models";
 
 /**
@@ -14,8 +14,7 @@ export function Calc6Months(service: Models.IRegionService) {
 
   const events = chain(Array.from(service.Events))
     .filter(e =>
-      dayjs(e.Start).isAfter(sixMonth) &&
-      e.Type !== EventType.Maintenance)
+      dayjs(e.Start).isAfter(sixMonth) && IsIncident(e.Type))
     .value();
 
   const results = [];

src/Pages/Home.tsx

@@ -6,7 +6,7 @@ import { chain } from "lodash";
 import { useEffect, useMemo, useState } from "react";
 import { Helmet } from "react-helmet";
 import { BehaviorSubject, Subject } from "rxjs";
-import { EventType, IsOpenStatus } from "~/Components/Event/Enums";
+import { EventType, IsIncident, IsOpenStatus } from "~/Components/Event/Enums";
 import { EventGrid } from "~/Components/Home/EventGrid";
 import "~/Components/Home/Home.css";
 import { Indicator } from "~/Components/Home/Indicator";
@@ -21,7 +21,7 @@ const log = new Logger("Home");
 /**
  * @author Aloento
  * @since 1.0.0
- * @version 0.1.0
+ * @version 0.2.0
  */
 export function Home() {
   const { DB } = useStatus();
@@ -60,7 +60,7 @@ export function Home() {
   const abnormalCount = useMemo(() => {
     const service = chain(DB.Events)
       .filter(e => !e.End)
-      .filter(e => e.Type !== EventType.Maintenance)
+      .filter(e => IsIncident(e.Type))
       .filter(e => IsOpenStatus(e.Status))
       .flatMap(e => [...e.RegionServices])
       .map(rs => rs.Service)

src/Services/Status.Trans.V2.ts

@@ -1,6 +1,6 @@
 import dayjs from "dayjs";
 import { orderBy } from "lodash";
-import { EventStatus, EventType, GetEventType } from "~/Components/Event/Enums";
+import { EventStatus, GetEventType, IsIncident } from "~/Components/Event/Enums";
 import { Logger } from "~/Helpers/Logger";
 import { EmptyDB } from "./Status";
 import { IncidentEntityV2, NameEnum, StatusEntityV2, StatusEnum } from "./Status.Entities";
@@ -11,7 +11,7 @@ const log = new Logger("Service", "Status", "TransformerV2");
 /**
  * @author Aloento
  * @since 1.0.0
- * @version 0.1.0
+ * @version 0.2.0
  */
 export function TransformerV2({ Components, Events }: { Components: StatusEntityV2[], Events: IncidentEntityV2[] }): IStatusContext {
   let id = 0;
@@ -111,7 +111,7 @@ export function TransformerV2({ Components, Events }: { Components: StatusEntity
       Title: event.title,
       Start: dayjs(event.start_date).toDate(),
       Type: type,
-      Status: type === EventType.Maintenance ? EventStatus.Planned : EventStatus.Analysing,
+      Status: IsIncident(type) ? EventStatus.Analysing : EventStatus.Planned,
       Histories: new Set(),
       RegionServices: new Set(),
     };
@@ -144,7 +144,7 @@ export function TransformerV2({ Components, Events }: { Components: StatusEntity
           switch (update.status) {
             case StatusEnum.System:
               return event.end_date
-                ? type === EventType.Maintenance ? EventStatus.Completed : EventStatus.Resolved
+                ? IsIncident(type) ? EventStatus.Resolved : EventStatus.Completed
                 : prev;
 
             case StatusEnum.Analyzing:
@@ -210,7 +210,7 @@ export function TransformerV2({ Components, Events }: { Components: StatusEntity
     }
 
     if (dbEvent.End &&
-      type === EventType.Maintenance &&
+      !IsIncident(type) &&
       dayjs(dbEvent.End).isBefore(dayjs())) {
       dbEvent.Status = EventStatus.Completed;
     }