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

[ML] Converts management app jobs list pages to new layout #103117

Merged
merged 5 commits into from
Jun 25, 2021
Merged

[ML] Converts management app jobs list pages to new layout #103117

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca81c26
[ML] Converts management app jobs list pages to new layout
peteharverson Jun 23, 2021
5151471
i[ML] Fix translations
peteharverson Jun 23, 2021
b958eef
[ML] Set acccessDenied default state back to false
peteharverson Jun 23, 2021
8caf4d9
[ML] Remove headers for error states and text updates following review
peteharverson Jun 24, 2021
6cbe10a
Merge branch 'master' into ml-management-pages-layout
kibanamachine Jun 25, 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
63 changes: 22 additions & 41 deletions x-pack/plugins/ml/public/application/access_denied/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,11 @@
* 2.0.
*/

import React, { Fragment } from 'react';
import React from 'react';

import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
import {
EuiCallOut,
EuiPage,
EuiPageBody,
EuiPageContentBody,
EuiPageContentHeader,
EuiPageContentHeaderSection,
EuiSpacer,
EuiText,
EuiTitle,
} from '@elastic/eui';

import { EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiPageContent, EuiSpacer } from '@elastic/eui';
import { NavigationMenu } from '../components/navigation_menu';
import { HelpMenu } from '../components/help_menu';
import { useMlKibana } from '../contexts/kibana';
Expand All @@ -30,44 +20,35 @@ export const Page = () => {
} = useMlKibana();
const helpLink = docLinks.links.ml.guide;
return (
<Fragment>
<>
<NavigationMenu tabId="access-denied" />
<EuiPage>
<EuiPageBody>
<EuiPageContentHeader>
<EuiPageContentHeaderSection>
<EuiTitle>
<h1>
<EuiSpacer size="xxl" />
<EuiFlexGroup justifyContent="spaceAround">
<EuiFlexItem grow={false}>
<EuiPageContent verticalPosition="center" horizontalPosition="center" color="danger">
<EuiEmptyPrompt
iconType="alert"
title={
<h2>
<FormattedMessage
id="xpack.ml.management.jobsList.accessDeniedTitle"
defaultMessage="Access denied"
/>
</h1>
</EuiTitle>
</EuiPageContentHeaderSection>
</EuiPageContentHeader>
<EuiPageContentBody>
<EuiSpacer size="m" />
<EuiCallOut
title={i18n.translate('xpack.ml.accessDenied.label', {
defaultMessage: 'Insufficient permissions',
})}
color="danger"
iconType="cross"
>
<EuiText size="s">
</h2>
}
body={
<p>
<FormattedMessage
id="xpack.ml.accessDenied.description"
defaultMessage="You don’t have permission to access the ML plugin"
defaultMessage="You don’t have permission to view the Machine Learning plugin. Access to the plugin requires the Machine Learning feature to be visible in this space."
/>
</p>
</EuiText>
</EuiCallOut>
</EuiPageContentBody>
</EuiPageBody>
</EuiPage>
}
/>
</EuiPageContent>
</EuiFlexItem>
</EuiFlexGroup>
<HelpMenu docLink={helpLink} />
</Fragment>
</>
);
};
80 changes: 30 additions & 50 deletions x-pack/plugins/ml/public/application/management/jobs_list/components/access_denied_page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,59 +5,39 @@
* 2.0.
*/

import React, { Fragment } from 'react';
import React from 'react';

import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';

import {
EuiCallOut,
EuiPage,
EuiPageBody,
EuiPageContentBody,
EuiPageContentHeader,
EuiPageContentHeaderSection,
EuiSpacer,
EuiText,
EuiTitle,
} from '@elastic/eui';
import { EuiEmptyPrompt, EuiPageContent } from '@elastic/eui';

export const AccessDeniedPage = () => (
<Fragment>
<EuiPage data-test-subj="mlPageAccessDenied">
<EuiPageBody>
<EuiPageContentHeader>
<EuiPageContentHeaderSection>
<EuiTitle>
<h1>
<FormattedMessage
id="xpack.ml.management.jobsList.insufficientLicenseTitle"
defaultMessage="Machine Learning"
/>
</h1>
</EuiTitle>
</EuiPageContentHeaderSection>
</EuiPageContentHeader>
<EuiPageContentBody>
<EuiSpacer size="m" />
<EuiCallOut
title={i18n.translate('xpack.ml.management.jobsList.noPermissionToAccessLabel', {
defaultMessage: 'Access denied',
})}
color="danger"
iconType="cross"
>
<EuiText size="s">
<p>
<FormattedMessage
id="xpack.ml.management.jobsList.noGrantedPrivilegesDescription"
defaultMessage="You don’t have permission to manage ML jobs"
/>
</p>
</EuiText>
</EuiCallOut>
</EuiPageContentBody>
</EuiPageBody>
</EuiPage>
</Fragment>
<>
<EuiPageContent
verticalPosition="center"
horizontalPosition="center"
color="danger"
data-test-subj="mlPageAccessDenied"
>
<EuiEmptyPrompt
iconType="alert"
title={
<h2>
<FormattedMessage
id="xpack.ml.management.jobsList.noPermissionToAccessLabel"
defaultMessage="Access denied"
/>
</h2>
}
body={
<p>
<FormattedMessage
id="xpack.ml.management.jobsList.noGrantedPrivilegesDescription"
defaultMessage="You don’t have permission to manage Machine Learning jobs. Access to the plugin requires the Machine Learning feature to be visible in this space."
/>
</p>
}
/>
</EuiPageContent>
</>
);
104 changes: 40 additions & 64 deletions ...ugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,78 +5,54 @@
* 2.0.
*/

import React, { FC, Fragment } from 'react';
import React, { FC } from 'react';

import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
import { CoreStart } from 'kibana/public';

import {
EuiCallOut,
EuiPage,
EuiPageBody,
EuiPageContentBody,
EuiPageContentHeader,
EuiPageContentHeaderSection,
EuiSpacer,
EuiText,
EuiTitle,
EuiLink,
} from '@elastic/eui';
import { EuiEmptyPrompt, EuiLink, EuiPageContent } from '@elastic/eui';

interface Props {
basePath: CoreStart['http']['basePath'];
}

export const InsufficientLicensePage: FC<Props> = ({ basePath }) => (
<Fragment>
<EuiPage data-test-subj="mlPageInsufficientLicense">
<EuiPageBody>
<EuiPageContentHeader>
<EuiPageContentHeaderSection>
<EuiTitle>
<h1>
<FormattedMessage
id="xpack.ml.management.jobsList.insufficientLicenseTitle"
defaultMessage="Machine Learning"
/>
</h1>
</EuiTitle>
</EuiPageContentHeaderSection>
</EuiPageContentHeader>
<EuiPageContentBody>
<EuiSpacer size="m" />
<EuiCallOut
title={i18n.translate('xpack.ml.management.jobsList.insufficientLicenseLabel', {
defaultMessage:
'Machine Learning is only available on a trial, platinum or enterprise license',
})}
color="danger"
iconType="cross"
>
<EuiText size="s">
<p>
<FormattedMessage
id="xpack.ml.management.jobsList.insufficientLicenseDescription"
defaultMessage="Please {link} to use Machine Learning features"
values={{
link: (
<EuiLink
href={`${basePath.get()}/app/management/stack/license_management/home`}
>
<FormattedMessage
id="xpack.ml.management.jobsList.insufficientLicenseDescription.link"
defaultMessage="upgrade your license or start a trial"
/>
</EuiLink>
),
}}
/>
</p>
</EuiText>
</EuiCallOut>
</EuiPageContentBody>
</EuiPageBody>
</EuiPage>
</Fragment>
<>
<EuiPageContent
verticalPosition="center"
horizontalPosition="center"
color="danger"
data-test-subj="mlPageInsufficientLicense"
>
<EuiEmptyPrompt
iconType="alert"
title={
<h2>
<FormattedMessage
id="xpack.ml.management.jobsList.insufficientLicenseLabel"
defaultMessage="Insufficient license"
/>
</h2>
}
body={
<p>
<FormattedMessage
id="xpack.ml.management.jobsList.insufficientLicenseDescription"
defaultMessage="Machine Learning is available only with trial, platinum or enterprise licenses. Please {link} to use Machine Learning features."
values={{
link: (
<EuiLink href={`${basePath.get()}/app/management/stack/license_management/home`}>
<FormattedMessage
id="xpack.ml.management.jobsList.insufficientLicenseDescription.link"
defaultMessage="upgrade your license or start a trial"
/>
</EuiLink>
),
}}
/>
</p>
}
/>
</EuiPageContent>
</>
);
Loading