mirrors/oneuptime
1
0
Fork 0
mirror of https://github.com/OneUptime/oneuptime synced 2024-11-21 22:59:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

add sections to announcments

Browse Source
This commit is contained in:
Simon Larsen 2023-11-02 18:50:18 +00:00
parent 80dd33cd7f
commit bd587b210e
No known key found for this signature in database
GPG Key ID: AB45983AA9C81CDE
1 changed files with 61 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
StatusPage/src/Pages/Announcement/List.tsx
View File

@ -34,6 +34,7 @@ import API from '../../Utils/API';
import StatusPageUtil from '../../Utils/StatusPage';
import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse';
import { STATUS_PAGE_API_URL } from '../../Utils/Config';
import Section from '../../Components/Section/Section';
const Overview: FunctionComponent<PageComponentProps> = (
props: PageComponentProps
@ -43,7 +44,10 @@ const Overview: FunctionComponent<PageComponentProps> = (
const [announcements, setAnnouncements] = useState<
Array<StatusPageAnnouncement>
>([]);
const [parsedData, setParsedData] =
const [activeAnnounementsParsedData, setActiveAnnouncementsParsedData] =
useState<EventHistoryListComponentProps | null>(null);
const [pastAnnouncementsParsedData, setPastAnnouncementsParsedData] =
useState<EventHistoryListComponentProps | null>(null);
StatusPageUtil.checkIfUserHasLoggedIn();
@ -96,13 +100,9 @@ const Overview: FunctionComponent<PageComponentProps> = (
}
}, []);
useEffect(() => {
if (isLoading) {
// parse data;
setParsedData(null);
return;
}
const getAnouncementsParsedData: Function = (
announcements: Array<StatusPageAnnouncement>
): EventHistoryListComponentProps => {
const eventHistoryListComponentProps: EventHistoryListComponentProps = {
items: [],
};
@ -135,8 +135,39 @@ const Overview: FunctionComponent<PageComponentProps> = (
days[key] as EventHistoryDayListComponentProps
);
}
return eventHistoryListComponentProps;
};
setParsedData(eventHistoryListComponentProps);
useEffect(() => {
if (isLoading) {
// parse data;
setActiveAnnouncementsParsedData(null);
setPastAnnouncementsParsedData(null);
return;
}
const activeAnnouncement: Array<StatusPageAnnouncement> =
announcements.filter((announcement: StatusPageAnnouncement) => {
return OneUptimeDate.isBefore(
OneUptimeDate.getCurrentDate(),
announcement.endAnnouncementAt!
);
});
const pastAnnouncement: Array<StatusPageAnnouncement> =
announcements.filter((announcement: StatusPageAnnouncement) => {
return OneUptimeDate.isAfter(
OneUptimeDate.getCurrentDate(),
announcement.endAnnouncementAt!
);
});
setActiveAnnouncementsParsedData(
getAnouncementsParsedData(activeAnnouncement)
);
setPastAnnouncementsParsedData(
getAnouncementsParsedData(pastAnnouncement)
);
}, [isLoading]);
if (isLoading) {
@ -147,10 +178,6 @@ const Overview: FunctionComponent<PageComponentProps> = (
return <ErrorMessage error={error} />;
}
if (!parsedData) {
return <PageLoader isVisible={true} />;
}
return (
<Page
title="Announcements"
@ -175,8 +202,27 @@ const Overview: FunctionComponent<PageComponentProps> = (
},
]}
>
{announcements && announcements.length > 0 ? (
<EventHistoryList {...parsedData} />
{activeAnnounementsParsedData?.items &&
activeAnnounementsParsedData?.items.length > 0 ? (
<div>
<Section title="Active Announcements" />
<EventHistoryList
items={activeAnnounementsParsedData?.items || []}
/>
</div>
) : (
<></>
)}
{pastAnnouncementsParsedData?.items &&
pastAnnouncementsParsedData?.items.length > 0 ? (
<div>
<Section title="Past Announcements" />
<EventHistoryList
items={pastAnnouncementsParsedData?.items || []}
/>
</div>
) : (
<></>
)}