Skip to content

[SECURITY] Redirect app/security to app/security/overview #70005

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 4 commits into from
Jun 26, 2020
Merged

[SECURITY] Redirect app/security to app/security/overview #70005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7337ca
redirect app/security to app/security/overview
XavierM Jun 25, 2020
4b1dee7
missing re-naming initialization
XavierM Jun 25, 2020
ed8d96c
add unit test for intialization value of indicesExists
XavierM Jun 25, 2020
6750dfb
Merge branch 'master' into app-security-redirect
elasticmachine Jun 25, 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
18 changes: 18 additions & 0 deletions x-pack/plugins/security_solution/public/common/containers/source/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,24 @@ jest.mock('../../utils/apollo_context', () => ({
}));

describe('Index Fields & Browser Fields', () => {
test('At initialization the value of indicesExists should be true', async () => {
const { result, waitForNextUpdate } = renderHook(() => useWithSource());
const initialResult = result.current;

await waitForNextUpdate();

return expect(initialResult).toEqual({
browserFields: {},
errorMessage: null,
indexPattern: {
fields: [],
title: 'apm-*-transaction*,auditbeat-*,endgame-*,filebeat-*,packetbeat-*,winlogbeat-*',
},
indicesExist: true,
loading: true,
});
});

test('returns memoized value', async () => {
const { result, waitForNextUpdate, rerender } = renderHook(() => useWithSource());
await waitForNextUpdate();
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/public/common/containers/source/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export const useWithSource = (sourceId = 'default', indexToAdd?: string[] | null
browserFields: EMPTY_BROWSER_FIELDS,
errorMessage: null,
indexPattern: getIndexFields(defaultIndex.join(), []),
indicesExist: undefined,
indicesExist: indicesExistOrDataTemporarilyUnavailable(undefined),
Copy link
Contributor Author

@XavierM XavierM Jun 25, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

we need to use this function, or we will always show that you need to set up your data for the app at initialization

loading: false,
});

Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security_solution/public/common/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
import { i18n } from '@kbn/i18n';

export const EMPTY_TITLE = i18n.translate('xpack.securitySolution.pages.common.emptyTitle', {
defaultMessage: 'Welcome to SIEM. Let’s get you started.',
defaultMessage: 'Welcome to Security Solution. Let’s get you started.',
});

export const EMPTY_MESSAGE = i18n.translate('xpack.securitySolution.pages.common.emptyMessage', {
defaultMessage:
'To begin using security information and event management (SIEM), you’ll need to add SIEM-related data, in Elastic Common Schema (ECS) format, to the Elastic Stack. An easy way to get started is by installing and configuring our data shippers, called Beats. Let’s do that now!',
'To begin using security information and event management (Security Solution), you’ll need to add security solution related data, in Elastic Common Schema (ECS) format, to the Elastic Stack. An easy way to get started is by installing and configuring our data shippers, called Beats. Let’s do that now!',
});

export const EMPTY_ACTION_PRIMARY = i18n.translate(
Expand Down
26 changes: 14 additions & 12 deletions x-pack/plugins/security_solution/public/plugin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
PluginInitializerContext,
Plugin as IPlugin,
DEFAULT_APP_CATEGORIES,
AppNavLinkStatus,
} from '../../../../src/core/public';
import { Storage } from '../../../../src/plugins/kibana_utils/public';
import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
Expand All @@ -35,6 +36,7 @@ import {
APP_CASES_PATH,
SHOW_ENDPOINT_ALERTS_NAV,
APP_ENDPOINT_ALERTS_PATH,
APP_PATH,
} from '../common/constants';
import { ConfigureEndpointDatasource } from './management/pages/policy/view/ingest_manager_integration/configure_datasource';

Expand Down Expand Up @@ -86,18 +88,18 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
return { coreStart, startPlugins, services, store: this.store, storage };
};

// Waiting for https://github.com/elastic/kibana/issues/69110
// core.application.register({
// id: APP_ID,
// title: 'Security',
// appRoute: APP_PATH,
// navLinkStatus: AppNavLinkStatus.hidden,
// mount: async (params: AppMountParameters) => {
// const [{ application }] = await core.getStartServices();
// application.navigateToApp(`${APP_ID}:${SecurityPageName.overview}`, { replace: true });
// return () => true;
// },
// });
core.application.register({
exactRoute: true,
id: APP_ID,
title: 'Security',
appRoute: APP_PATH,
navLinkStatus: AppNavLinkStatus.hidden,
mount: async (params: AppMountParameters) => {
const [{ application }] = await core.getStartServices();
application.navigateToApp(`${APP_ID}:${SecurityPageName.overview}`, { replace: true });
return () => true;
},
});

core.application.register({
id: `${APP_ID}:${SecurityPageName.overview}`,
Expand Down