Skip to content

[ENDPOINT] Reintroduced tabs to endpoint management and migrated pages to use common security components #74886

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
merged 16 commits into from
Aug 18, 2020
Merged

[ENDPOINT] Reintroduced tabs to endpoint management and migrated pages to use common security components #74886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5af098c
Reintroduced tabs to endpoint management and migrated pages to use co…
efreeti Aug 12, 2020
820f294
Empty trusted apps tab.
efreeti Aug 13, 2020
bfc62d5
Changed casing in the translations.
efreeti Aug 13, 2020
9ce1421
Switched to using route path generation functions.
efreeti Aug 17, 2020
d4ca664
Added propagation of data-test-subj attribute to Wrapper component.
efreeti Aug 17, 2020
e5f9aed
Fixed CommonProps import.
efreeti Aug 17, 2020
05b9160
Moved out shared component for administration list page.
efreeti Aug 17, 2020
17f5389
Merge branch 'master' of https://github.com/elastic/kibana into btsym…
efreeti Aug 17, 2020
f1a2a3a
Removed unused file.
efreeti Aug 17, 2020
a637c56
Removed unused translation keys.
efreeti Aug 17, 2020
9160aa0
Removed redundant snapshot.
efreeti Aug 17, 2020
fe26693
Added some minimal tests.
efreeti Aug 17, 2020
d14ea15
Attempt to fix functional tests.
efreeti Aug 17, 2020
5831069
Attempt to fix functional tests again.
efreeti Aug 17, 2020
de4a33f
Reverted function declarations back to const.
efreeti Aug 18, 2020
508edb5
Wrapped component in memo.
efreeti Aug 18, 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
802 changes: 0 additions & 802 deletions ...security_solution/public/common/components/endpoint/__snapshots__/page_view.test.tsx.snap
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions x-pack/plugins/security_solution/public/common/components/endpoint/page_view.test.tsx
View file
Open in desktop

This file was deleted.

184 changes: 0 additions & 184 deletions x-pack/plugins/security_solution/public/common/components/endpoint/page_view.tsx
View file
Open in desktop

This file was deleted.

18 changes: 13 additions & 5 deletions x-pack/plugins/security_solution/public/common/components/wrapper_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
import classNames from 'classnames';
import React, { useEffect } from 'react';
import styled from 'styled-components';
import { CommonProps } from '@elastic/eui';

import { useFullScreen } from '../../containers/use_full_screen';
import { gutterTimeline } from '../../lib/helpers';
import { AppGlobalStyle } from '../page/index';

const Wrapper = styled.div`
padding: ${({ theme }) =>
`${theme.eui.paddingSizes.l} ${gutterTimeline} ${theme.eui.paddingSizes.l} ${theme.eui.paddingSizes.l}`};
padding: ${(props) => `${props.theme.eui.paddingSizes.l}`};
&.siemWrapperPage--restrictWidthDefault,
&.siemWrapperPage--restrictWidthCustom {
box-sizing: content-box;
Expand All @@ -29,6 +30,10 @@ const Wrapper = styled.div`
height: 100%;
}
&.siemWrapperPage--withTimeline {
padding-right: ${gutterTimeline};
}
&.siemWrapperPage--noPadding {
padding: 0;
}
Expand All @@ -38,18 +43,20 @@ Wrapper.displayName = 'Wrapper';

interface WrapperPageProps {
children: React.ReactNode;
className?: string;
restrictWidth?: boolean | number | string;
style?: Record<string, string>;
noPadding?: boolean;
noTimeline?: boolean;
}

const WrapperPageComponent: React.FC<WrapperPageProps> = ({
const WrapperPageComponent: React.FC<WrapperPageProps & CommonProps> = ({
children,
className,
restrictWidth,
style,
noPadding,
noTimeline,
...otherProps
}) => {
const { globalFullScreen, setGlobalFullScreen } = useFullScreen();
useEffect(() => {
Expand All @@ -59,6 +66,7 @@ const WrapperPageComponent: React.FC<WrapperPageProps> = ({
const classes = classNames(className, {
siemWrapperPage: true,
'siemWrapperPage--noPadding': noPadding,
'siemWrapperPage--withTimeline': !noTimeline,
'siemWrapperPage--fullHeight': globalFullScreen,
'siemWrapperPage--restrictWidthDefault':
restrictWidth && typeof restrictWidth === 'boolean' && restrictWidth === true,
Expand All @@ -73,7 +81,7 @@ const WrapperPageComponent: React.FC<WrapperPageProps> = ({
}

return (
<Wrapper className={classes} style={customStyle || style}>
<Wrapper className={classes} style={customStyle || style} {...otherProps}>
{children}
<AppGlobalStyle />
</Wrapper>
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/security_solution/public/management/common/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const MANAGEMENT_ROUTING_ROOT_PATH = '';
export const MANAGEMENT_ROUTING_ENDPOINTS_PATH = `${MANAGEMENT_ROUTING_ROOT_PATH}/:tabName(${AdministrationSubTab.endpoints})`;
export const MANAGEMENT_ROUTING_POLICIES_PATH = `${MANAGEMENT_ROUTING_ROOT_PATH}/:tabName(${AdministrationSubTab.policies})`;
export const MANAGEMENT_ROUTING_POLICY_DETAILS_PATH = `${MANAGEMENT_ROUTING_ROOT_PATH}/:tabName(${AdministrationSubTab.policies})/:policyId`;
export const MANAGEMENT_ROUTING_TRUSTED_APPS_PATH = `${MANAGEMENT_ROUTING_ROOT_PATH}/:tabName(${AdministrationSubTab.trustedApps})`;

// --[ STORE ]---------------------------------------------------------------------------
/** The SIEM global store namespace where the management state will be mounted */
Expand Down
17 changes: 13 additions & 4 deletions x-pack/plugins/security_solution/public/management/common/routing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
MANAGEMENT_ROUTING_ENDPOINTS_PATH,
MANAGEMENT_ROUTING_POLICIES_PATH,
MANAGEMENT_ROUTING_POLICY_DETAILS_PATH,
MANAGEMENT_ROUTING_TRUSTED_APPS_PATH,
} from './constants';
import { AdministrationSubTab } from '../types';
import { appendSearch } from '../../common/components/link_to/helpers';
Expand Down Expand Up @@ -72,13 +73,21 @@ export const getEndpointDetailsPath = (
})}${appendSearch(`${urlQueryParams ? `${urlQueryParams}${urlSearch}` : urlSearch}`)}`;
};

export const getPoliciesPath = (search?: string) =>
`${generatePath(MANAGEMENT_ROUTING_POLICIES_PATH, {
export const getPoliciesPath = (search?: string) => {
return `${generatePath(MANAGEMENT_ROUTING_POLICIES_PATH, {
tabName: AdministrationSubTab.policies,
})}${appendSearch(search)}`;
};

export const getPolicyDetailPath = (policyId: string, search?: string) =>
`${generatePath(MANAGEMENT_ROUTING_POLICY_DETAILS_PATH, {
export const getPolicyDetailPath = (policyId: string, search?: string) => {
return `${generatePath(MANAGEMENT_ROUTING_POLICY_DETAILS_PATH, {
tabName: AdministrationSubTab.policies,
policyId,
})}${appendSearch(search)}`;
};

export const getTrustedAppsListPath = (search?: string) => {
return `${generatePath(MANAGEMENT_ROUTING_TRUSTED_APPS_PATH, {
tabName: AdministrationSubTab.trustedApps,
})}${appendSearch(search)}`;
};
8 changes: 8 additions & 0 deletions x-pack/plugins/security_solution/public/management/common/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,11 @@ export const ENDPOINTS_TAB = i18n.translate('xpack.securitySolution.endpointsTab
export const POLICIES_TAB = i18n.translate('xpack.securitySolution.policiesTab', {
defaultMessage: 'Policies',
});

export const TRUSTED_APPS_TAB = i18n.translate('xpack.securitySolution.trustedAppsTab', {
defaultMessage: 'Trusted applications',
});

export const BETA_BADGE_LABEL = i18n.translate('xpack.securitySolution.administration.list.beta', {
defaultMessage: 'Beta',
});
Loading