github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

fix subscribe page .

Browse Source
This commit is contained in:
Simon Larsen
2022-12-15 13:07:11 +05:30
parent 7746312048
commit 862aefa20d
2 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
StatusPage/src/Pages/Overview/Overview.tsx
View File

@@ -115,7 +115,7 @@ const Overview: FunctionComponent<PageComponentProps> = (
const activeScheduledMaintenanceEvents: Array<ScheduledMaintenance> =
BaseModel.fromJSONArray(
(data['activeScheduledMaintenanceEvents'] as JSONArray) ||
[],
[],
ScheduledMaintenance
);
const activeAnnouncements: Array<StatusPageAnnouncement> =
@@ -160,7 +160,7 @@ const Overview: FunctionComponent<PageComponentProps> = (
const scheduledMaintenanceStateTimelines: Array<ScheduledMaintenanceStateTimeline> =
BaseModel.fromJSONArray(
(data['scheduledMaintenanceStateTimelines'] as JSONArray) ||
[],
[],
ScheduledMaintenanceStateTimeline
);
@@ -194,7 +194,7 @@ const Overview: FunctionComponent<PageComponentProps> = (
try {
setError(
(err as HTTPErrorResponse).message ||
'Server Error. Please try again'
'Server Error. Please try again'
);
} catch (e) {
setError('Server Error. Please try again');
@@ -218,7 +218,7 @@ const Overview: FunctionComponent<PageComponentProps> = (
if (
!Object.keys(dict).includes(
resource.monitor?.currentMonitorStatusId.toString() ||
''
''
)
) {
dict[
@@ -259,7 +259,7 @@ const Overview: FunctionComponent<PageComponentProps> = (
group &&
group._id?.toString() &&
group._id?.toString() ===
resource.statusPageGroupId.toString()) ||
resource.statusPageGroupId.toString()) ||
(!resource.statusPageGroupId && !group)
) {
let currentStatus: MonitorStatus | undefined =
@@ -419,7 +419,7 @@ const Overview: FunctionComponent<PageComponentProps> = (
group &&
group._id?.toString() &&
group._id?.toString() ===
resource.statusPageGroupId.toString()) ||
resource.statusPageGroupId.toString()) ||
(!resource.statusPageGroupId && !group)
) {
hasReosurce = true;
@@ -436,7 +436,7 @@ const Overview: FunctionComponent<PageComponentProps> = (
currentStatus.priority &&
currentMonitorStatus?.priority &&
currentMonitorStatus?.priority >
currentStatus.priority) ||
currentStatus.priority) ||
!currentStatus.priority
) {
currentStatus = currentMonitorStatus!;
@@ -575,12 +575,12 @@ const Overview: FunctionComponent<PageComponentProps> = (
eventViewRoute={RouteUtil.populateRouteParams(
props.isPreviewPage
? (RouteMap[
PageMap
.PREVIEW_INCIDENT_DETAIL
] as Route)
PageMap
.PREVIEW_INCIDENT_DETAIL
] as Route)
: (RouteMap[
PageMap.INCIDENT_DETAIL
] as Route),
PageMap.INCIDENT_DETAIL
] as Route),
incidentGroup.incident.id!
)}
/>
@@ -621,12 +621,12 @@ const Overview: FunctionComponent<PageComponentProps> = (
eventViewRoute={RouteUtil.populateRouteParams(
props.isPreviewPage
? (RouteMap[
PageMap
.PREVIEW_SCHEDULED_EVENT_DETAIL
] as Route)
PageMap
.PREVIEW_SCHEDULED_EVENT_DETAIL
] as Route)
: (RouteMap[
PageMap.SCHEDULED_EVENT_DETAIL
] as Route),
PageMap.SCHEDULED_EVENT_DETAIL
] as Route),
scheduledEventGroup.scheduledMaintenance
.id!
)}
@@ -638,11 +638,10 @@ const Overview: FunctionComponent<PageComponentProps> = (
<div>
{currentStatus && statusPageResources.length > 0 && (
<Alert
title={`${
currentStatus.isOperationalState
title={`${currentStatus.isOperationalState
? `All`
: 'Some'
} Resources are ${currentStatus.name}`}
} Resources are ${currentStatus.name}`}
color={currentStatus.color}
doNotShowIcon={true}
size={AlertSize.Large}
@@ -693,7 +692,7 @@ const Overview: FunctionComponent<PageComponentProps> = (
}
isLastElement={
resourceGroups.length -
1 ===
1 ===
i
}
title={
@@ -713,11 +712,8 @@ const Overview: FunctionComponent<PageComponentProps> = (
)}
{statusPageResources.length === 0 && (
<p>
{' '}
No resources added to this Status Page, please add
some resources from OneUptime dashboard.
</p>
<ErrorMessage error=" No resources added to this status page. Please add
some resources from OneUptime Dashboard."/>
)}
</div>
) : (

17
StatusPage/src/Pages/Subscribe/Subscribe.tsx
View File

@@ -13,12 +13,19 @@ const PageNotFound: FunctionComponent<PageComponentProps> = (
_props: PageComponentProps
): ReactElement => {
const [currentTab, _setCurrentTab] = useState<string>('Email');
const [isSuccess, setIsSuccess] = useState<boolean>(false);
return (
<Page>
<div className="justify-center">
<div>
<p>Subscribe.</p>
{!isSuccess && <h5>Subscribe to this page.</h5>}
{isSuccess && <p
className="text-center color-light-grey"
style={{
marginTop: '50px',
marginBottom: '50px',
}}
> You have been subscribed successfully.</p>}
{/* <Tabs
tabs={['Email', 'SMS', 'Webhook']}
@@ -27,7 +34,7 @@ const PageNotFound: FunctionComponent<PageComponentProps> = (
}}
/> */}
{currentTab === 'Email' ? (
{currentTab === 'Email' && !isSuccess ? (
<ModelForm<StatusPageSubscriber>
modelType={StatusPageSubscriber}
id="email-form"
@@ -36,7 +43,7 @@ const PageNotFound: FunctionComponent<PageComponentProps> = (
field: {
subscriberEmail: true,
},
title: 'Email',
title: 'Please enter your Email',
description:
'Status page updates will be sent to this email.',
fieldType: FormFieldSchemaType.Email,
@@ -62,7 +69,7 @@ const PageNotFound: FunctionComponent<PageComponentProps> = (
return item;
}}
onSuccess={(_value: JSONObject) => {
//LoginUtil.login(value);
setIsSuccess(true);
}}
maxPrimaryButtonWidth={true}
/>