Skip to content

[uptime] Fix anomaly alert edit #93025

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

Merged
shahzad31 merged 2 commits into from
Mar 3, 2021
Merged

[uptime] Fix anomaly alert edit #93025

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
9d593e9
fixed side effect
shahzad31 Mar 1, 2021
8a92eb0
updated loading
shahzad31 Mar 1, 2021
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
12 changes: 5 additions & 7 deletions x-pack/plugins/uptime/public/components/common/alerts/uptime_edit_alert_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { useKibana } from '../../../../../../../src/plugins/kibana_react/public'
import {
Alert,
TriggersAndActionsUIPublicPluginStart,
} from '../../../../../../plugins/triggers_actions_ui/public';
} from '../../../../../triggers_actions_ui/public';

interface Props {
alertFlyoutVisible: boolean;
Expand All @@ -27,19 +27,17 @@ export const UptimeEditAlertFlyoutComponent = ({
initialAlert,
setAlertFlyoutVisibility,
}: Props) => {
const onClose = () => {
setAlertFlyoutVisibility(false);
};
const { triggersActionsUi } = useKibana<KibanaDeps>().services;

const EditAlertFlyout = useMemo(
() =>
triggersActionsUi.getEditAlertFlyout({
initialAlert,
onClose,
onClose: () => {
setAlertFlyoutVisibility(false);
},
}),
// eslint-disable-next-line react-hooks/exhaustive-deps
[]
[initialAlert, setAlertFlyoutVisibility, triggersActionsUi]
);
return <>{alertFlyoutVisible && EditAlertFlyout}</>;
};
26 changes: 16 additions & 10 deletions x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import React, { useContext, useState } from 'react';
import React, { useCallback, useContext, useState } from 'react';

import { EuiButton, EuiContextMenu, EuiIcon, EuiPopover } from '@elastic/eui';
import { useSelector, useDispatch } from 'react-redux';
Expand All @@ -14,6 +14,7 @@ import {
canDeleteMLJobSelector,
hasMLJobSelector,
isMLJobCreatingSelector,
mlCapabilitiesSelector,
} from '../../../state/selectors';
import { UptimeSettingsContext } from '../../../contexts';
import * as labels from './translations';
Expand Down Expand Up @@ -49,6 +50,7 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
const isAlertDeleting = useSelector(isAnomalyAlertDeleting);

const { loading: isMLJobLoading } = useSelector(hasMLJobSelector);
const { loading: isCapbilityLoading } = useSelector(mlCapabilitiesSelector);

const { dateRangeStart, dateRangeEnd } = useGetUrlParams();

Expand All @@ -63,7 +65,7 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
const deleteAnomalyAlert = () =>
dispatch(deleteAnomalyAlertAction.get({ alertId: anomalyAlert?.id as string }));

const showLoading = isMLJobCreating || isMLJobLoading || isAlertDeleting;
const showLoading = isMLJobCreating || isMLJobLoading || isAlertDeleting || isCapbilityLoading;

const btnText = hasMLJob ? labels.ANOMALY_DETECTION : labels.ENABLE_ANOMALY_DETECTION;

Expand Down Expand Up @@ -149,6 +151,11 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
},
];

const onCloseFlyout = useCallback(() => {
setIsFlyoutOpen(false);
dispatch(getAnomalyAlertAction.get({ monitorId }));
}, [dispatch, monitorId]);

return (
<>
<EuiPopover
Expand All @@ -174,14 +181,13 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
}}
/>
)}
<UptimeEditAlertFlyoutComponent
initialAlert={anomalyAlert!}
alertFlyoutVisible={isFlyoutOpen}
setAlertFlyoutVisibility={() => {
setIsFlyoutOpen(false);
dispatch(getAnomalyAlertAction.get({ monitorId }));
}}
/>
{isFlyoutOpen && (
<UptimeEditAlertFlyoutComponent
initialAlert={anomalyAlert!}
alertFlyoutVisible={isFlyoutOpen}
setAlertFlyoutVisibility={onCloseFlyout}
/>
)}
</>
);
};
8 changes: 4 additions & 4 deletions x-pack/plugins/uptime/public/state/selectors/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,22 @@ export const selectPingList = ({ pingList }: AppState) => pingList;

export const snapshotDataSelector = ({ snapshot }: AppState) => snapshot;

const mlCapabilitiesSelector = (state: AppState) => state.ml.mlCapabilities.data;
export const mlCapabilitiesSelector = (state: AppState) => state.ml.mlCapabilities;

export const hasMLFeatureSelector = createSelector(
mlCapabilitiesSelector,
(mlCapabilities) =>
mlCapabilities?.isPlatinumOrTrialLicense && mlCapabilities?.mlFeatureEnabledInSpace
mlCapabilities?.data?.isPlatinumOrTrialLicense && mlCapabilities?.data?.mlFeatureEnabledInSpace
);

export const canCreateMLJobSelector = createSelector(
mlCapabilitiesSelector,
(mlCapabilities) => mlCapabilities?.capabilities.canCreateJob
(mlCapabilities) => mlCapabilities?.data?.capabilities?.canCreateJob
);

export const canDeleteMLJobSelector = createSelector(
mlCapabilitiesSelector,
(mlCapabilities) => mlCapabilities?.capabilities.canDeleteJob
(mlCapabilities) => mlCapabilities?.data?.capabilities?.canDeleteJob
);

export const hasMLJobSelector = ({ ml }: AppState) => ml.mlJob;
Expand Down