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.

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

[NP] Graph migration #59409

Merged
merged 29 commits into from
Mar 16, 2020
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
bd4e263
Merge remote-tracking branch 'upstream/master' into np-graph
maryia-lapata Mar 3, 2020
d94d251
Move graph to NP
maryia-lapata Mar 3, 2020
47e9068
Styles
maryia-lapata Mar 4, 2020
93ae891
Merge remote-tracking branch 'upstream/master' into np-graph
maryia-lapata Mar 4, 2020
d3daf2e
Merge branch 'master' into np-graph
maryia-lapata Mar 5, 2020
ae8e156
Clean up
maryia-lapata Mar 5, 2020
5212a64
Fix eslint
maryia-lapata Mar 5, 2020
d87c2ba
Fix ESlint
maryia-lapata Mar 6, 2020
61c5cca
Fix path
maryia-lapata Mar 6, 2020
d396330
Fix container height
maryia-lapata Mar 6, 2020
fe7e61a
Clean up
maryia-lapata Mar 6, 2020
69f7ed2
Update index.ts
maryia-lapata Mar 6, 2020
0a38c7f
Update graph_client_workspace.js
maryia-lapata Mar 6, 2020
0ea6bae
Merge branch 'master' into np-graph
maryia-lapata Mar 6, 2020
4efe3d1
Refactoring
maryia-lapata Mar 6, 2020
637a8a3
Remove unused methods
maryia-lapata Mar 6, 2020
dd046b7
Update graph_client_workspace.test.js
maryia-lapata Mar 6, 2020
24f36a6
Merge branch 'master' into np-graph
elasticmachine Mar 9, 2020
18bc813
Merge branch 'master' into np-graph
maryia-lapata Mar 11, 2020
e008927
Merge branch 'np-graph' of https://github.com/maryia-lapata/kibana in…
maryia-lapata Mar 11, 2020
6b46f1b
Rename npData to data
maryia-lapata Mar 11, 2020
3fc7d7f
Move Readme
maryia-lapata Mar 11, 2020
a2dd603
Inline parsing discover url
maryia-lapata Mar 11, 2020
74ee0bc
Remove import of legacy styles
maryia-lapata Mar 11, 2020
4fc604f
Update README
maryia-lapata Mar 11, 2020
c626f4f
Merge branch 'master' into np-graph
elasticmachine Mar 11, 2020
dadd1eb
Merge branch 'master' into np-graph
maryia-lapata Mar 13, 2020
c9e874e
Merge branch 'np-graph' of https://github.com/maryia-lapata/kibana in…
maryia-lapata Mar 13, 2020
04e17e1
Merge branch 'master' into np-graph
elasticmachine Mar 16, 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
12 changes: 0 additions & 12 deletions x-pack/legacy/plugins/graph/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,19 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { resolve } from 'path';
import { i18n } from '@kbn/i18n';

// @ts-ignore
import migrations from './migrations';
import mappings from './mappings.json';
import { LegacyPluginInitializer } from '../../../../src/legacy/plugin_discovery/types';
import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/utils';

export const graph: LegacyPluginInitializer = kibana => {
return new kibana.Plugin({
id: 'graph',
configPrefix: 'xpack.graph',
publicDir: resolve(__dirname, 'public'),
require: ['kibana', 'elasticsearch', 'xpack_main'],
uiExports: {
app: {
title: 'Graph',
order: 9000,
icon: 'plugins/graph/icon.png',
euiIconType: 'graphApp',
main: 'plugins/graph/index',
category: DEFAULT_APP_CATEGORIES.analyze,
},
styleSheetPaths: resolve(__dirname, 'public/index.scss'),
mappings,
migrations,
},
Expand Down
Binary file removed x-pack/legacy/plugins/graph/public/icon.png
Binary file not shown.
26 changes: 0 additions & 26 deletions x-pack/legacy/plugins/graph/public/index.ts

This file was deleted.

9 changes: 0 additions & 9 deletions x-pack/legacy/plugins/graph/public/legacy_imports.ts

This file was deleted.

75 changes: 0 additions & 75 deletions x-pack/legacy/plugins/graph/public/plugin.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Graph shows only up in the side bar if your server is running on a platinum or t

* Run tests `node x-pack/scripts/jest.js --watch plugins/graph`
* Run type check `node scripts/type_check.js --project=x-pack/tsconfig.json`
* Run linter `node scripts/eslint.js x-pack/legacy/plugins/graph`
* Run linter `node scripts/eslint.js x-pack/plugins/graph`
* Run functional tests (make sure to stop dev server)
* Server `cd x-pack && node ./scripts/functional_tests_server.js`
* Tests `cd x-pack && node ../scripts/functional_test_runner.js --config ./test/functional/config.js --grep=graph`
Expand All @@ -21,7 +21,6 @@ Currently most of the state handling is done by a central angular controller. Th

* `angular/` contains all code using javascript and angular. Rewriting this code in typescript and react is currently ongoing. When the migration is finished, this folder will go away
* `components/` contains react components for various parts of the interface. Components can hold local UI state (e.g. current form data), everything else should be passed in from the caller. Styles should reside in a component-specific stylesheet
* `hacks/` contains files that need to run before the actual app is started. When moving to the new platform, this folder will go away.
* `services/` contains functions that encapsule other parts of Kibana. Stateful dependencies are passed in from the outside. Components should not rely on services directly but have callbacks passed in. Once the migration to redux/saga is complete, only sagas will use services.
* `helpers/` contains side effect free helper functions that can be imported and used from components and services
* `state_management/` contains reducers, action creators, selectors and sagas. It also exports the central store creator
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/graph/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"kibanaVersion": "kibana",
"server": true,
"ui": true,
"requiredPlugins": ["licensing"],
"requiredPlugins": ["licensing", "data", "navigation"],
"optionalPlugins": ["home"]
}
Loading