Skip to content

displaying the backend error message to the Alerting Page #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
riysaxen-amzn wants to merge 2 commits into
base: main
Choose a base branch
from
Open

displaying the backend error message to the Alerting Page #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2743992
displaying the backend error message to the Alerting Page
riysaxen-amzn Jan 19, 2024
0aa1251
Merge branch 'main' into fix-errorResponse
riysaxen-amzn Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions public/pages/Alerts/containers/Alerts/Alerts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ import {
EuiTitle,
EuiToolTip,
EuiEmptyPrompt,
EuiTableSelectionType,
EuiModal,
EuiModalHeader,
EuiModalHeaderTitle,
EuiModalBody,
EuiModalFooter,
EuiIcon,
EuiTableSelectionType
} from '@elastic/eui';
import { FieldValueSelectionFilterConfigType } from '@elastic/eui/src/components/search_bar/filters/field_value_selection_filter';
import dateMath from '@elastic/datemath';
Expand Down Expand Up @@ -86,6 +92,7 @@ export interface AlertsState {
timeUnit: TimeUnit;
dateFormat: string;
widgetEmptyMessage: React.ReactNode | undefined;
isModalVisible: boolean;
}

const groupByOptions = [
Expand Down Expand Up @@ -118,6 +125,7 @@ export class Alerts extends Component<AlertsProps, AlertsState> {
timeUnit: timeUnits.timeUnit,
dateFormat: timeUnits.dateFormat,
widgetEmptyMessage: undefined,
isModalVisible: false,
};
}

Expand Down Expand Up @@ -201,7 +209,38 @@ export class Alerts extends Component<AlertsProps, AlertsState> {
name: 'Status',
sortable: true,
dataType: 'string',
render: (status: string) => (status ? capitalizeFirstLetter(status) : DEFAULT_EMPTY_DATA),
render: (status, alertItem) => {
if (status === 'ERROR') {
const isModalVisible = this.state.isModalVisible;
Comment thread
riysaxen-amzn marked this conversation as resolved.
return (
<React.Fragment>
<EuiLink onClick={() => this.setState({ isModalVisible: true })}>
{capitalizeFirstLetter(status)}
</EuiLink>

{isModalVisible && (
<EuiModal onClose={() => this.setState({ isModalVisible: false })}>
<EuiModalHeader>
<EuiModalHeaderTitle>{capitalizeFirstLetter(status)}</EuiModalHeaderTitle>
</EuiModalHeader>

<EuiModalBody>
<EuiIcon type="alert" size="l" />
<p>{alertItem.error_message || ''}</p>
</EuiModalBody>

<EuiModalFooter>
<EuiButton onClick={() => this.setState({ isModalVisible: false })}>
Close
</EuiButton>
</EuiModalFooter>
</EuiModal>
)}
</React.Fragment>
);
} else {
return <span>{status ? capitalizeFirstLetter(status) : DEFAULT_EMPTY_DATA}</span>;
}
},
{
field: 'severity',
Expand Down
1 change: 1 addition & 0 deletions server/models/interfaces/Alerts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export interface AlertItem {
trigger_name: string;
detector_id: string;
state: string;
error_message: string | null;
Comment thread
amsiglan marked this conversation as resolved.
severity: string;
finding_ids: string[];
last_notification_time: string;
Expand Down
1 change: 1 addition & 0 deletions types/Alert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export interface AlertItem {
trigger_name: string;
detector_id: string;
state: string;
error_message: string | null;
severity: string;
finding_ids: string[];
last_notification_time: string;
Expand Down