Skip to content

Commit bbb0729

Browse files
committed
[Refactor] Update EventCard and EventGrid components to improve authorization logic and event status handling
1 parent f375e37 commit bbb0729

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/Components/Event/EventCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export function EventCard({ Event }: { Event: Models.IEvent }) {
5858
Event.Status === EventStatus.PendingReview &&
5959
groups.some(g => g === Roles.Creators)
6060
) ||
61-
groups.some(g => g === Roles.Operators || g === Roles.Admins)}>
61+
!groups.some(g => g === Roles.Creators)}>
6262
<EventEditor Event={Event} />
6363
</Authorized>
6464
</div>

src/Components/Home/EventGrid.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useEffect, useRef } from "react";
66
import { useAuth } from "react-oidc-context";
77
import { Dic } from "~/Helpers/Entities";
88
import { useStatus } from "~/Services/Status";
9-
import { EventType, IsIncident, IsOpenStatus } from "../Event/Enums";
9+
import { EventStatus, EventType, IsIncident, IsOpenStatus } from "../Event/Enums";
1010
import { getEventTag } from "../History/EventTag";
1111

1212
/**
@@ -95,7 +95,7 @@ export function EventGrid() {
9595
}
9696
})
9797
.filter(x => {
98-
if (IsIncident(x.Type) && x.End) {
98+
if (x.Status === EventStatus.PendingReview || (IsIncident(x.Type) && x.End)) {
9999
return false;
100100
}
101101

0 commit comments

Comments
 (0)