diff --git a/src/Components/Event/Enums.ts b/src/Components/Event/Enums.ts
index ea59bff..210bcd7 100644
--- a/src/Components/Event/Enums.ts
+++ b/src/Components/Event/Enums.ts
@@ -64,7 +64,7 @@ export function IsIncident(type: EventType): boolean {
/**
* @author Aloento
* @since 1.0.0
- * @version 0.2.1
+ * @version 0.3.1
*/
export enum EventStatus {
Detected = "Detected",
@@ -82,14 +82,21 @@ export enum EventStatus {
Active = "Active",
Reopened = "Reopened",
Changed = "Changed",
+
+ PendingReview = "Pending Review",
+ Reviewed = "Reviewed",
}
/**
* @author Aloento
* @since 1.1.0
- * @version 0.1.1
+ * @version 0.2.0
*/
-export function GetStatusList(type: EventType): EventStatus[] {
+export function GetStatusList(type: EventType, status?: EventStatus, groups?: string[]): EventStatus[] {
+ if (groups && status === EventStatus.PendingReview && groups.some(g => g === "/sd_creators")) {
+ return [EventStatus.PendingReview, EventStatus.Cancelled];
+ }
+
switch (type) {
case EventType.Maintenance:
return Object.values(EventStatus).slice(5, 10);
@@ -112,7 +119,7 @@ export function IsOpenStatus(status: EventStatus): boolean {
/**
* @author Aloento
* @since 1.0.0
- * @version 0.2.0
+ * @version 0.3.0
*/
export function GetStatusString(status: EventStatus): string {
switch (status) {
@@ -142,5 +149,9 @@ export function GetStatusString(status: EventStatus): string {
return StatusEnum.Cancelled;
case EventStatus.Active:
return StatusEnum.Active;
+ case EventStatus.PendingReview:
+ return StatusEnum.PendingReview;
+ case EventStatus.Reviewed:
+ return StatusEnum.Reviewed;
}
}
diff --git a/src/Components/Event/EventApprove.tsx b/src/Components/Event/EventApprove.tsx
new file mode 100644
index 0000000..d961932
--- /dev/null
+++ b/src/Components/Event/EventApprove.tsx
@@ -0,0 +1,75 @@
+import { Toast, ToastBody, ToastTitle, useToastController } from "@fluentui/react-components";
+import { ScaleButton, ScaleIconActionCheckmark } from "@telekom/scale-components-react";
+import { useRequest } from "ahooks";
+import { useAuth } from "react-oidc-context";
+import { useStatus } from "~/Services/Status";
+import { StatusEnum } from "~/Services/Status.Entities";
+import { Models } from "~/Services/Status.Models";
+import { useAccessToken } from "../Auth/useAccessToken";
+import { EventStatus } from "./Enums";
+
+/**
+ * @author Aloento
+ * @since 1.5.0
+ * @version 0.2.2
+ */
+export function EventApprove({ Event }: { Event: Models.IEvent }) {
+ const { Update } = useStatus();
+
+ const getToken = useAccessToken();
+ const { user } = useAuth();
+ const { dispatchToast } = useToastController();
+
+ const { runAsync, loading } = useRequest(async () => {
+ const url = process.env.SD_BACKEND_URL!;
+ const raw = await fetch(`${url}/v2/events/${Event.Id}`, {
+ method: "PATCH",
+ headers: {
+ "Content-Type": "application/json",
+ "Authorization": `Bearer ${getToken()}`,
+ },
+ body: JSON.stringify({
+ status: StatusEnum.Reviewed,
+ version: Event.Version ?? Event.Histories.size + 1,
+ message: `Approved by ${user?.profile.name}`,
+ update_date: new Date().toISOString(),
+ }),
+ });
+
+ if (!raw.ok) {
+ const message = await raw.text();
+ dispatchToast(
+
+ Failed to approve event
+ {message}
+ ,
+ { intent: "warning" }
+ );
+ throw new Error("Failed to approve event: " + message);
+ }
+
+ Event.Status = EventStatus.Reviewed;
+ Event.Histories.add({
+ Id: Event.Histories.size + 1,
+ Created: new Date(),
+ Event,
+ Message: `Approved by ${user?.profile.name}`,
+ Status: EventStatus.Reviewed,
+ });
+ Update();
+ }, {
+ manual: true,
+ });
+
+ return (
+ runAsync()}
+ >
+
+ Approve
+
+ );
+}
diff --git a/src/Components/Event/EventCard.tsx b/src/Components/Event/EventCard.tsx
index 58aac46..b8ee33f 100644
--- a/src/Components/Event/EventCard.tsx
+++ b/src/Components/Event/EventCard.tsx
@@ -5,6 +5,7 @@ import { Authorized } from "../Auth/With";
import { Indicator } from "../Home/Indicator";
import { EventStatus, EventType, IsIncident } from "./Enums";
import { EventAffected } from "./EventAffected";
+import { EventApprove } from "./EventApprove";
import { EventEditor } from "./EventEditor";
import { EventExtract } from "./EventExtract";
@@ -23,7 +24,7 @@ import { EventExtract } from "./EventExtract";
*
* @author Aloento
* @since 1.0.0
- * @version 0.2.0
+ * @version 0.3.0
*/
export function EventCard({ Event }: { Event: Models.IEvent }) {
return (
@@ -39,10 +40,18 @@ export function EventCard({ Event }: { Event: Models.IEvent }) {
+ {
+ return Event.Status === EventStatus.PendingReview &&
+ groups.some(g => g === "/sd_operators" || g === "/sd_admins");
+ }}>
+
+
+
{
Event.RegionServices.size > 1 &&
}
+
@@ -95,6 +111,15 @@ export function EventCard({ Event }: { Event: Models.IEvent }) {
}
+
+
+ {Event.ContactEmail &&
+ }
+
+
+
+
+
@@ -23,9 +25,7 @@ export function ProfileMenu() {
-
- New Event
-
+ You're {((auth.user?.profile as any)?.groups as string[])?.filter(x => x.includes("sd"))}
auth.signoutSilent()}>
diff --git a/src/Components/Layout/TopNavBar.tsx b/src/Components/Layout/TopNavBar.tsx
index 2e4225d..0103b51 100644
--- a/src/Components/Layout/TopNavBar.tsx
+++ b/src/Components/Layout/TopNavBar.tsx
@@ -1,5 +1,9 @@
import { ScaleTelekomHeader, ScaleTelekomNavItem, ScaleTelekomNavList } from "@telekom/scale-components-react";
+import { chain } from "lodash";
+import { useMemo } from "react";
+import { EventStatus } from "~/Components/Event/Enums";
import { Dic } from "~/Helpers/Entities";
+import { useStatus } from "~/Services/Status";
import { Authorized } from "../Auth/With";
import { MobileMenu } from "./MobileMenu";
import { NavItem } from "./NavItem";
@@ -8,9 +12,15 @@ import { ProfileMenu } from "./ProfileMenu";
/**
* @author Aloento
* @since 1.0.0
- * @version 0.1.0
+ * @version 0.3.0
*/
export function TopNavBar() {
+ const { DB } = useStatus();
+
+ const pendingCount = useMemo(() => chain(DB.Events)
+ .filter(e => e.Status === EventStatus.PendingReview)
+ .value().length, [DB]);
+
return (
+
+
+
+
+ {pendingCount > 0 && }
+
diff --git a/src/Components/New/NewForm.tsx b/src/Components/New/NewForm.tsx
index 0767e5d..3f156cc 100644
--- a/src/Components/New/NewForm.tsx
+++ b/src/Components/New/NewForm.tsx
@@ -1,4 +1,4 @@
-import { ScaleButton, ScaleDropdownSelect, ScaleDropdownSelectItem, ScaleHelperText, ScaleTable, ScaleTextarea, ScaleTextField } from "@telekom/scale-components-react";
+import { ScaleButton, ScaleDropdownSelect, ScaleDropdownSelectItem, ScaleHelperText, ScaleModal, ScaleTable, ScaleTextarea, ScaleTextField } from "@telekom/scale-components-react";
import dayjs from "dayjs";
import { orderBy } from "lodash";
import { Dic } from "~/Helpers/Entities";
@@ -21,140 +21,194 @@ import { useNewForm } from "./useNewForm";
*
* @author Aloento
* @since 1.0.0
- * @version 0.1.0
+ * @version 0.3.0
*/
export function NewForm() {
const { DB } = useStatus();
const { State, Actions, Validation, OnSubmit, Loading } = useNewForm();
return (
-
+
+ e.preventDefault()}
>
- Submit
-
-
+
+
+ Maintenance start time is earlier than the recommended 36 hours.
+
+
+ Selected: {dayjs(State.start).format("YYYY-MM-DD HH:mm")}
+
+
+ Recommended after: {dayjs().add(36, "hour").format("YYYY-MM-DD HH:mm")}
+
+
+
+
+ Cancel
+
+
+
+ Confirm Submit
+
+
+ |