Skip to content
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

[Backport 2.x] [BUG] Wrong breadcrumbs after browser reload on edit detectors page #395 #417

Merged
merged 1 commit into from
Feb 17, 2023
Merged

[Backport 2.x] [BUG] Wrong breadcrumbs after browser reload on edit detectors page #395 #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions public/pages/CreateDetector/components/ConfigureAlerts/containers/ConfigureAlerts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,29 +57,45 @@ export default class ConfigureAlerts extends Component<ConfigureAlertsProps, Con
};
}

componentDidMount = async () => {
updateBreadcrumbs = () => {
const {
isEdit,
detector,
detector: { triggers },
detector: { id = '', name },
} = this.props;

isEdit &&
this.context.chrome.setBreadcrumbs([
BREADCRUMBS.SECURITY_ANALYTICS,
BREADCRUMBS.DETECTORS,
BREADCRUMBS.DETECTORS_DETAILS(detector.name, detector.id),
BREADCRUMBS.DETECTORS_DETAILS(name, id),
{
text: 'Edit alert triggers',
},
]);
};

componentDidMount = async () => {
this.updateBreadcrumbs();
const {
isEdit,
detector,
detector: { triggers },
} = this.props;
this.getNotificationChannels();

if (triggers.length === 0) {
this.addCondition();
}
};

componentDidUpdate(
prevProps: Readonly<ConfigureAlertsProps>,
prevState: Readonly<ConfigureAlertsState>,
snapshot?: any
) {
this.updateBreadcrumbs();
}

getNotificationChannels = async () => {
this.setState({ loading: true });
const channels = await getNotificationChannels(this.props.notificationsService);
Expand Down
51 changes: 41 additions & 10 deletions public/pages/Detectors/components/UpdateAlertConditions/UpdateAlertConditions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
import React, { Component } from 'react';
import { RouteComponentProps } from 'react-router-dom';
import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { DetectorHit, RuleSource } from '../../../../../server/models/interfaces';
import {
DetectorHit,
RuleSource,
SearchDetectorsResponse,
} from '../../../../../server/models/interfaces';
import { Detector } from '../../../../../models/interfaces';
import ConfigureAlerts from '../../../CreateDetector/components/ConfigureAlerts';
import {
Expand All @@ -16,14 +20,19 @@ import {
OpenSearchService,
} from '../../../../services';
import { RuleOptions } from '../../../../models/interfaces';
import { ROUTES, OS_NOTIFICATION_PLUGIN } from '../../../../utils/constants';
import {
ROUTES,
OS_NOTIFICATION_PLUGIN,
EMPTY_DEFAULT_DETECTOR,
} from '../../../../utils/constants';
import { NotificationsStart } from 'opensearch-dashboards/public';
import {
errorNotificationToast,
getPlugins,
successNotificationToast,
} from '../../../../utils/helpers';
import { DetectorCreationStep } from '../../../CreateDetector/models/types';
import { ServerResponse } from '../../../../../server/models/types';

export interface UpdateAlertConditionsProps
extends RouteComponentProps<any, any, { detectorHit: DetectorHit }> {
Expand All @@ -49,9 +58,10 @@ export default class UpdateAlertConditions extends Component<
> {
constructor(props: UpdateAlertConditionsProps) {
super(props);

const detector = {
...props.location.state.detectorHit._source,
id: props.location.state.detectorHit._id,
...(props.location.state?.detectorHit?._source || EMPTY_DEFAULT_DETECTOR),
id: props.location.pathname.replace(`${ROUTES.EDIT_DETECTOR_ALERT_TRIGGERS}/`, ''),
};
this.state = {
detector,
Expand All @@ -74,8 +84,24 @@ export default class UpdateAlertConditions extends Component<

getRules = async () => {
try {
const { ruleService } = this.props;
const { ruleService, detectorService } = this.props;
const { detector } = this.state;
if (!detector.name) {
const response = (await detectorService.getDetectors()) as ServerResponse<
SearchDetectorsResponse
>;
if (response.ok) {
const detectorHit = response.response.hits.hits.find(
(detectorHit) => detectorHit._id === detector.id
) as DetectorHit;
this.setState({
detector: {
...detectorHit._source,
id: detectorHit._id,
},
});
}
}
const body = {
from: 0,
size: 5000,
Expand Down Expand Up @@ -159,14 +185,19 @@ export default class UpdateAlertConditions extends Component<

onSave = async () => {
this.setState({ submitting: true });
const { detector } = this.state;
const {
history,
location: {
state: { detectorHit },
},
detectorService,
location: { state },
} = this.props;
const { detector } = this.state;

const {
detectorHit = {
_source: detector,
_id: detector.id || '',
},
} = state || {};

try {
const updateDetectorResponse = await detectorService.updateDetector(
Expand All @@ -189,7 +220,7 @@ export default class UpdateAlertConditions extends Component<

this.setState({ submitting: false });
history.replace({
pathname: `${ROUTES.DETECTOR_DETAILS}/${this.props.location.state?.detectorHit._id}`,
pathname: `${ROUTES.DETECTOR_DETAILS}/${detectorHit._id}`,
state: {
detectorHit: { ...detectorHit, _source: { ...detectorHit._source, ...detector } },
},
Expand Down