From a9e3faa6a6d13c49b667c8c87df99a3846554317 Mon Sep 17 00:00:00 2001
From: Aloento <11802769+Aloento@users.noreply.github.com>
Date: Fri, 16 May 2025 17:41:24 +0200
Subject: [PATCH 1/3] Adds Planned and Cancelled statuses to EventStatus
Introduces new statuses "Planned" and "Cancelled" to the EventStatus enum for better event management.
Updates the IsOpenStatus function to consider "Cancelled" as a closed status.
Enhances the TransformerV2 function to handle the new statuses appropriately in event transformations.
This change improves clarity in event state tracking and extends functionality for future event handling.
---
src/Components/Event/Enums.ts | 8 +++++++-
src/Services/Status.Entities.ts | 2 ++
src/Services/Status.Trans.V2.ts | 6 +++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/Components/Event/Enums.ts b/src/Components/Event/Enums.ts
index 3e4e777..33c39d0 100644
--- a/src/Components/Event/Enums.ts
+++ b/src/Components/Event/Enums.ts
@@ -60,9 +60,11 @@ export enum EventStatus {
Observing = "Observing",
Resolved = "Resolved",
+ Planned = "Planned",
Modified = "Modified",
InProgress = "InProgress",
Completed = "Completed",
+ Cancelled = "Cancelled",
Reopened = "Reopened",
Changed = "Changed",
@@ -74,7 +76,7 @@ export enum EventStatus {
* @version 0.1.0
*/
export function IsOpenStatus(status: EventStatus): boolean {
- return ![EventStatus.Completed, EventStatus.Resolved].includes(status);
+ return ![EventStatus.Completed, EventStatus.Resolved, EventStatus.Cancelled].includes(status);
}
/**
@@ -102,5 +104,9 @@ export function GetStatusString(status: EventStatus): string {
return StatusEnum.Reopened;
case EventStatus.Changed:
return StatusEnum.Changed;
+ case EventStatus.Planned:
+ return StatusEnum.Planned;
+ case EventStatus.Cancelled:
+ return StatusEnum.Cancelled;
}
}
diff --git a/src/Services/Status.Entities.ts b/src/Services/Status.Entities.ts
index 71fa136..9a5eb91 100644
--- a/src/Services/Status.Entities.ts
+++ b/src/Services/Status.Entities.ts
@@ -63,4 +63,6 @@ export const enum StatusEnum {
Resolved = "resolved",
Scheduled = "scheduled",
System = "SYSTEM",
+ Planned = "planned",
+ Cancelled = "cancelled",
}
diff --git a/src/Services/Status.Trans.V2.ts b/src/Services/Status.Trans.V2.ts
index b29406c..df4b2b2 100644
--- a/src/Services/Status.Trans.V2.ts
+++ b/src/Services/Status.Trans.V2.ts
@@ -133,7 +133,7 @@ export function TransformerV2({ Components, Events }: { Components: StatusEntity
Title: event.title,
Start: dayjs(event.start_date).toDate(),
Type: type,
- Status: type === EventType.Maintenance ? EventStatus.Modified : EventStatus.Analysing,
+ Status: type === EventType.Maintenance ? EventStatus.Planned : EventStatus.Analysing,
Histories: new Set(),
RegionServices: new Set(),
};
@@ -186,12 +186,16 @@ export function TransformerV2({ Components, Events }: { Components: StatusEntity
break;
case StatusEnum.Scheduled:
+ case StatusEnum.Planned:
+ return EventStatus.Planned;
case StatusEnum.Modified:
return EventStatus.Modified;
case StatusEnum.InProgress:
return EventStatus.InProgress;
case StatusEnum.Completed:
return EventStatus.Completed;
+ case StatusEnum.Cancelled:
+ return EventStatus.Cancelled;
case StatusEnum.Changed:
case StatusEnum.ImpactChanged:
From aa88e93962834d0c7456d2605227864ba23db0cd Mon Sep 17 00:00:00 2001
From: Aloento <11802769+Aloento@users.noreply.github.com>
Date: Fri, 16 May 2025 17:41:30 +0200
Subject: [PATCH 2/3] Refactors EventCard and EventEditor to simplify status
display
Removes conditional rendering for the Current Status and Event Status labels in the EventCard component, ensuring they are always displayed.
Updates EventEditor to adjust the range of statuses available for selection during maintenance events, enhancing user experience.
Improves code readability and maintains consistent UI behavior across event types.
---
src/Components/Event/EventCard.tsx | 14 ++++++--------
src/Components/Event/EventEditor.tsx | 2 +-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/Components/Event/EventCard.tsx b/src/Components/Event/EventCard.tsx
index 5e53786..1c1fb77 100644
--- a/src/Components/Event/EventCard.tsx
+++ b/src/Components/Event/EventCard.tsx
@@ -47,10 +47,9 @@ export function EventCard({ Event }: { Event: Models.IEvent }) {
Impact Type:
- {Event.Type !== EventType.Maintenance &&
- }
+
- {Event.Type !== EventType.Maintenance &&
- }
+