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

[Logs UI][Metrics UI] Move actions to the kibana header #84648

Merged
merged 6 commits into from
Dec 9, 2020
Merged

[Logs UI][Metrics UI] Move actions to the kibana header #84648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf816d9
Expose `setHeaderActionMenu` to the infra plugin
afgomez Dec 1, 2020
1f13227
Move the Logs' actions to the kibana header
afgomez Dec 1, 2020
c5375ef
Move the Metrics' actions to the kibana header
afgomez Dec 1, 2020
04c97be
Merge branch 'master' into 82823-infra-header-actions
afgomez Dec 2, 2020
a506be2
Fix actions in small screens
afgomez Dec 2, 2020
1d26457
Merge branch 'master' into 82823-infra-header-actions
kibanamachine Dec 8, 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
10 changes: 7 additions & 3 deletions x-pack/plugins/infra/public/apps/common_providers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,32 @@
*/

import { ApolloClient } from 'apollo-client';
import { CoreStart } from 'kibana/public';
import { AppMountParameters, CoreStart } from 'kibana/public';
import React, { useMemo } from 'react';
import { useUiSetting$ } from '../../../../../src/plugins/kibana_react/public';
import { EuiThemeProvider } from '../../../observability/public';
import { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions_ui/public';
import { createKibanaContextForPlugin } from '../hooks/use_kibana';
import { InfraClientStartDeps } from '../types';
import { ApolloClientContext } from '../utils/apollo_context';
import { HeaderActionMenuProvider } from '../utils/header_action_menu_provider';
import { NavigationWarningPromptProvider } from '../utils/navigation_warning_prompt';
import { TriggersActionsProvider } from '../utils/triggers_actions_context';

export const CommonInfraProviders: React.FC<{
apolloClient: ApolloClient<{}>;
triggersActionsUI: TriggersAndActionsUIPublicPluginStart;
}> = ({ apolloClient, children, triggersActionsUI }) => {
setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
}> = ({ apolloClient, children, triggersActionsUI, setHeaderActionMenu }) => {
const [darkMode] = useUiSetting$<boolean>('theme:darkMode');

return (
<TriggersActionsProvider triggersActionsUI={triggersActionsUI}>
<ApolloClientContext.Provider value={apolloClient}>
<EuiThemeProvider darkMode={darkMode}>
<NavigationWarningPromptProvider>{children}</NavigationWarningPromptProvider>
<HeaderActionMenuProvider setHeaderActionMenu={setHeaderActionMenu}>
<NavigationWarningPromptProvider>{children}</NavigationWarningPromptProvider>
</HeaderActionMenuProvider>
</EuiThemeProvider>
</ApolloClientContext.Provider>
</TriggersActionsProvider>
Expand Down
14 changes: 11 additions & 3 deletions x-pack/plugins/infra/public/apps/logs_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,20 @@ import { prepareMountElement } from './common_styles';
export const renderApp = (
core: CoreStart,
plugins: InfraClientStartDeps,
{ element, history }: AppMountParameters
{ element, history, setHeaderActionMenu }: AppMountParameters
) => {
const apolloClient = createApolloClient(core.http.fetch);

prepareMountElement(element);

ReactDOM.render(
<LogsApp apolloClient={apolloClient} core={core} history={history} plugins={plugins} />,
<LogsApp
apolloClient={apolloClient}
core={core}
history={history}
plugins={plugins}
setHeaderActionMenu={setHeaderActionMenu}
/>,
element
);

Expand All @@ -44,14 +50,16 @@ const LogsApp: React.FC<{
core: CoreStart;
history: History<unknown>;
plugins: InfraClientStartDeps;
}> = ({ apolloClient, core, history, plugins }) => {
setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
}> = ({ apolloClient, core, history, plugins, setHeaderActionMenu }) => {
const uiCapabilities = core.application.capabilities;

return (
<CoreProviders core={core} plugins={plugins}>
<CommonInfraProviders
apolloClient={apolloClient}
triggersActionsUI={plugins.triggersActionsUi}
setHeaderActionMenu={setHeaderActionMenu}
>
<Router history={history}>
<Switch>
Expand Down
14 changes: 11 additions & 3 deletions x-pack/plugins/infra/public/apps/metrics_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,20 @@ import { prepareMountElement } from './common_styles';
export const renderApp = (
core: CoreStart,
plugins: InfraClientStartDeps,
{ element, history }: AppMountParameters
{ element, history, setHeaderActionMenu }: AppMountParameters
) => {
const apolloClient = createApolloClient(core.http.fetch);

prepareMountElement(element);

ReactDOM.render(
<MetricsApp apolloClient={apolloClient} core={core} history={history} plugins={plugins} />,
<MetricsApp
apolloClient={apolloClient}
core={core}
history={history}
plugins={plugins}
setHeaderActionMenu={setHeaderActionMenu}
/>,
element
);

Expand All @@ -46,14 +52,16 @@ const MetricsApp: React.FC<{
core: CoreStart;
history: History<unknown>;
plugins: InfraClientStartDeps;
}> = ({ apolloClient, core, history, plugins }) => {
setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
}> = ({ apolloClient, core, history, plugins, setHeaderActionMenu }) => {
const uiCapabilities = core.application.capabilities;

return (
<CoreProviders core={core} plugins={plugins}>
<CommonInfraProviders
apolloClient={apolloClient}
triggersActionsUI={plugins.triggersActionsUi}
setHeaderActionMenu={setHeaderActionMenu}
>
<Router history={history}>
<Switch>
Expand Down
40 changes: 26 additions & 14 deletions x-pack/plugins/infra/public/pages/logs/page_content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React from 'react';
import React, { useContext } from 'react';
import { Route, Switch } from 'react-router-dom';
import useMount from 'react-use/lib/useMount';

Expand All @@ -24,9 +24,12 @@ import { LogEntryCategoriesPage } from './log_entry_categories';
import { LogEntryRatePage } from './log_entry_rate';
import { LogsSettingsPage } from './settings';
import { StreamPage } from './stream';
import { HeaderMenuPortal } from '../../../../observability/public';
import { HeaderActionMenuContext } from '../../utils/header_action_menu_provider';

export const LogsPageContent: React.FunctionComponent = () => {
const uiCapabilities = useKibana().services.application?.capabilities;
const { setHeaderActionMenu } = useContext(HeaderActionMenuContext);

const { initialize } = useLogSourceContext();

Expand Down Expand Up @@ -66,6 +69,28 @@ export const LogsPageContent: React.FunctionComponent = () => {

<HelpCenterContent feedbackLink={feedbackLinkUrl} appName={pageTitle} />

{setHeaderActionMenu && (
<HeaderMenuPortal setHeaderActionMenu={setHeaderActionMenu}>
<EuiFlexGroup gutterSize={'none'} alignItems={'center'} responsive={false}>
<EuiFlexItem grow={false}>
<AlertDropdown />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonEmpty
href={kibana.services?.application?.getUrlForApp(
'/home#/tutorial_directory/logging'
)}
size="s"
color="primary"
iconType="plusInCircle"
>
{ADD_DATA_LABEL}
</EuiButtonEmpty>
</EuiFlexItem>
</EuiFlexGroup>
</HeaderMenuPortal>
)}

<Header
breadcrumbs={[
{
Expand All @@ -79,19 +104,6 @@ export const LogsPageContent: React.FunctionComponent = () => {
<EuiFlexItem>
<RoutedTabs tabs={[streamTab, anomaliesTab, logCategoriesTab, settingsTab]} />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<AlertDropdown />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonEmpty
href={kibana.services?.application?.getUrlForApp('/home#/tutorial_directory/logging')}
size="s"
color="primary"
iconType="plusInCircle"
>
{ADD_DATA_LABEL}
</EuiButtonEmpty>
</EuiFlexItem>
</EuiFlexGroup>
</AppNavigation>
<Switch>
Expand Down
53 changes: 29 additions & 24 deletions x-pack/plugins/infra/public/pages/metrics/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,16 @@ import { SourceConfigurationFields } from '../../graphql/types';
import { AlertPrefillProvider } from '../../alerting/use_alert_prefill';
import { InfraMLCapabilitiesProvider } from '../../containers/ml/infra_ml_capabilities';
import { AnomalyDetectionFlyout } from './inventory_view/components/ml/anomaly_detection/anomoly_detection_flyout';
import { HeaderMenuPortal } from '../../../../observability/public';
import { HeaderActionMenuContext } from '../../utils/header_action_menu_provider';

const ADD_DATA_LABEL = i18n.translate('xpack.infra.metricsHeaderAddDataButtonLabel', {
defaultMessage: 'Add data',
});

export const InfrastructurePage = ({ match }: RouteComponentProps) => {
const uiCapabilities = useKibana().services.application?.capabilities;
const { setHeaderActionMenu } = useContext(HeaderActionMenuContext);

const kibana = useKibana();

Expand All @@ -72,6 +75,32 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => {
})}
/>

{setHeaderActionMenu && (
<HeaderMenuPortal setHeaderActionMenu={setHeaderActionMenu}>
<EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
<EuiFlexItem grow={false}>
<Route path={'/inventory'} component={AnomalyDetectionFlyout} />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<Route path={'/explorer'} component={MetricsAlertDropdown} />
<Route path={'/inventory'} component={InventoryAlertDropdown} />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonEmpty
href={kibana.services?.application?.getUrlForApp(
'/home#/tutorial_directory/metrics'
)}
size="s"
color="primary"
iconType="plusInCircle"
>
{ADD_DATA_LABEL}
</EuiButtonEmpty>
</EuiFlexItem>
</EuiFlexGroup>
</HeaderMenuPortal>
)}

<Header
breadcrumbs={[
{
Expand Down Expand Up @@ -121,30 +150,6 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => {
]}
/>
</EuiFlexItem>
<EuiFlexItem
grow={false}
style={{ flexDirection: 'row', alignItems: 'center' }}
>
<EuiFlexItem grow={false}>
<Route path={'/inventory'} component={AnomalyDetectionFlyout} />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<Route path={'/explorer'} component={MetricsAlertDropdown} />
<Route path={'/inventory'} component={InventoryAlertDropdown} />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonEmpty
href={kibana.services?.application?.getUrlForApp(
'/home#/tutorial_directory/metrics'
)}
size="s"
color="primary"
iconType="plusInCircle"
>
{ADD_DATA_LABEL}
</EuiButtonEmpty>
</EuiFlexItem>
</EuiFlexItem>
</EuiFlexGroup>
</AppNavigation>

Expand Down
25 changes: 25 additions & 0 deletions x-pack/plugins/infra/public/utils/header_action_menu_provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* 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 from 'react';
import { AppMountParameters } from 'kibana/public';

interface ContextProps {
setHeaderActionMenu?: AppMountParameters['setHeaderActionMenu'];
}

export const HeaderActionMenuContext = React.createContext<ContextProps>({});

export const HeaderActionMenuProvider: React.FC<Required<ContextProps>> = ({
setHeaderActionMenu,
children,
}) => {
return (
<HeaderActionMenuContext.Provider value={{ setHeaderActionMenu }}>
{children}
</HeaderActionMenuContext.Provider>
);
};
Comment on lines +16 to +25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the purpose of wrapping the provider in another component? Could <HeaderActionMenuContext.Provider just be used directly?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a way to abstract the value away into a meaningful name.

I think moving forward it would be interesting to add an InfraContext that holds all of these little things instead of having 3-4 wrappers, but that's a story for another PR.