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

Jump to bottom

[Uptime] Remove custom handling of license enabling #82019

Merged
merged 2 commits into from
Nov 2, 2020
Merged

[Uptime] Remove custom handling of license enabling #82019

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
3a43796
Remove custom handling of license enabling
shahzad31 Oct 29, 2020
c1688cf
Merge branch 'master' into update-ml-flyout
kibanamachine Nov 2, 2020
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
42 changes: 16 additions & 26 deletions ...ns/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 11 additions & 14 deletions ...ugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 8 additions & 38 deletions x-pack/plugins/uptime/public/components/monitor/ml/license_info.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,22 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import React, { useContext, useState, useEffect } from 'react';
import React, { useContext, useEffect } from 'react';
import { EuiCallOut, EuiButton, EuiSpacer } from '@elastic/eui';
import { useDispatch, useSelector } from 'react-redux';
import { useDispatch } from 'react-redux';
import { UptimeSettingsContext } from '../../../contexts';
import * as labels from './translations';
import { getMLCapabilitiesAction } from '../../../state/actions';
import { hasMLFeatureSelector } from '../../../state/selectors';

export const ShowLicenseInfo = () => {
const { basePath } = useContext(UptimeSettingsContext);
const [loading, setLoading] = useState<boolean>(false);
const hasMlFeature = useSelector(hasMLFeatureSelector);

const dispatch = useDispatch();

useEffect(() => {
dispatch(getMLCapabilitiesAction.get());
}, [dispatch]);

useEffect(() => {
let retryInterval: any;
if (loading) {
retryInterval = setInterval(() => {
dispatch(getMLCapabilitiesAction.get());
}, 5000);
} else {
clearInterval(retryInterval);
}

return () => {
clearInterval(retryInterval);
};
}, [dispatch, loading]);

useEffect(() => {
setLoading(false);
}, [hasMlFeature]);

const startLicenseTrial = () => {
setLoading(true);
};

return (
<>
<EuiCallOut
Expand All @@ -55,16 +29,12 @@ export const ShowLicenseInfo = () => {
iconType="help"
>
<p>{labels.START_TRAIL_DESC}</p>
<span onClick={startLicenseTrial} onKeyDown={() => {}}>
<EuiButton
color="primary"
isLoading={loading}
target="_blank"
href={basePath + `/app/management/stack/license_management/home`}
>
{labels.START_TRAIL}
</EuiButton>
</span>
<EuiButton
color="primary"
href={basePath + `/app/management/stack/license_management/home`}
>
{labels.START_TRAIL}
</EuiButton>
</EuiCallOut>
<EuiSpacer />
</>
Expand Down