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

[Vis] TableVis uses local angular #50759

Merged
merged 34 commits into from
Dec 2, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
f79531f
TableVis uses local angular
maryia-lapata Nov 14, 2019
8e5f09b
Clean up
maryia-lapata Nov 15, 2019
652bc54
Fix TS
maryia-lapata Nov 15, 2019
3dcf983
Update angular_config
maryia-lapata Nov 15, 2019
ca87855
Fix export
maryia-lapata Nov 15, 2019
4647e26
Merge branch 'master' into table-vis-local-angular
maryia-lapata Nov 18, 2019
197b583
Update render_app.ts
maryia-lapata Nov 18, 2019
ffc151c
Cetralize ui deps
maryia-lapata Nov 18, 2019
bbbc3f6
Fix loading KbnTableVisController in Dashboard
maryia-lapata Nov 18, 2019
f17f3b7
Fix graph
maryia-lapata Nov 18, 2019
9186322
Rename const
maryia-lapata Nov 18, 2019
916bf18
Add table vis mocks
maryia-lapata Nov 18, 2019
656637d
Fix kbn_top_nav
maryia-lapata Nov 19, 2019
d38db79
Add TS for test
maryia-lapata Nov 21, 2019
d524e5b
Merge remote-tracking branch 'kibana/master' into table-vis-local-ang…
maryia-lapata Nov 22, 2019
edb1638
Complete conversion paginated_table test to Jest
maryia-lapata Nov 22, 2019
270978e
Convert table_vis_controller test to Jest
maryia-lapata Nov 22, 2019
e208fb8
Convert table_vis_controller test to Jest
maryia-lapata Nov 22, 2019
ac8a13f
Fix ESlint
maryia-lapata Nov 22, 2019
351abe4
Create agg_table.test.ts
maryia-lapata Nov 25, 2019
882babe
Merge remote-tracking branch 'kibana/master' into table-vis-local-ang…
maryia-lapata Nov 26, 2019
5446c8e
Fix mocha tests
maryia-lapata Nov 26, 2019
a04d80c
Refactoring
maryia-lapata Nov 26, 2019
d689135
Remove module dep
maryia-lapata Nov 26, 2019
a7f1368
Merge remote-tracking branch 'kibana/master' into table-vis-local-ang…
maryia-lapata Nov 27, 2019
c3e0499
Remove LegacyDependenciesPlugin
maryia-lapata Nov 27, 2019
e12997a
Move file
maryia-lapata Nov 27, 2019
c4448f7
Fix path
maryia-lapata Nov 27, 2019
1ae50ed
Fix path
maryia-lapata Nov 27, 2019
e9d12c6
Merge remote-tracking branch 'kibana/master' into table-vis-local-ang…
maryia-lapata Nov 29, 2019
e631da5
Merge remote-tracking branch 'kibana/master' into table-vis-local-ang…
maryia-lapata Nov 29, 2019
71cf712
Merge remote-tracking branch 'kibana/master' into table-vis-local-ang…
maryia-lapata Dec 2, 2019
e0f3fb2
Fix TS
maryia-lapata Dec 2, 2019
c07fad3
Fix Jest test
maryia-lapata Dec 2, 2019
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
Prev Previous commit
Next Next commit
Remove LegacyDependenciesPlugin
  • Loading branch information
maryia-lapata committed Nov 27, 2019
commit c3e049991881a1b6750078ce25532bd9f8aa0fc4
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { Vis } from '../../../../visualizations/public';
import { tableVisTypeDefinition } from '../../table_vis_type';
import { setup as visualizationsSetup } from '../../../../visualizations/public/np_ready/public/legacy';
import { getAngularModule } from '../../get_inner_angular';
import { initTableVisLegacyModule } from '../../shim/table_vis_legacy_module';
import { initTableVisLegacyModule } from '../../angular/table_vis_legacy_module';

describe('Table Vis - AggTable Directive', function () {
let $rootScope;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { legacyResponseHandlerProvider, tabifyAggResponse, npStart } from '../..
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import { Vis } from '../../../../visualizations/public';
import { getAngularModule } from '../../get_inner_angular';
import { initTableVisLegacyModule } from '../../shim/table_vis_legacy_module';
import { initTableVisLegacyModule } from '../../angular/table_vis_legacy_module';

describe('Table Vis - AggTableGroup Directive', function () {
let $rootScope;
Expand Down
5 changes: 0 additions & 5 deletions src/legacy/core_plugins/vis_type_table/public/legacy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,10 @@ import { plugin } from '.';

import { TablePluginSetupDependencies } from './plugin';
import { setup as visualizationsSetup } from '../../visualizations/public/np_ready/public/legacy';
import { LegacyDependenciesPlugin } from './shim';

const plugins: Readonly<TablePluginSetupDependencies> = {
expressions: npSetup.plugins.expressions,
visualizations: visualizationsSetup,

// Temporary solution
// It will be removed when all dependent services are migrated to the new platform.
__LEGACY: new LegacyDependenciesPlugin(),
};

const pluginInstance = plugin({} as PluginInitializerContext);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import 'angular-mocks';
import '../table_vis.mock';

import { getAngularModule } from '../get_inner_angular';
import { initTableVisLegacyModule } from '../shim/table_vis_legacy_module';
import { initTableVisLegacyModule } from '../angular/table_vis_legacy_module';
import { npStart } from '../legacy_imports';

interface Sort {
Expand Down
6 changes: 1 addition & 5 deletions src/legacy/core_plugins/vis_type_table/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,13 @@ import { VisualizationsSetup } from '../../visualizations/public';

import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../../core/public';

import { LegacyDependenciesPlugin } from './shim';

import { createTableVisFn } from './table_vis_fn';
import { tableVisTypeDefinition } from './table_vis_type';

/** @internal */
export interface TablePluginSetupDependencies {
expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
visualizations: VisualizationsSetup;
__LEGACY: LegacyDependenciesPlugin;
}

/** @internal */
Expand All @@ -43,9 +40,8 @@ export class TableVisPlugin implements Plugin<Promise<void>, void> {

public async setup(
core: CoreSetup,
{ expressions, visualizations, __LEGACY }: TablePluginSetupDependencies
{ expressions, visualizations }: TablePluginSetupDependencies
) {
__LEGACY.setup();
expressions.registerFunction(createTableVisFn);

visualizations.types.createBaseVisualization(tableVisTypeDefinition);
Expand Down
20 changes: 0 additions & 20 deletions src/legacy/core_plugins/vis_type_table/public/shim/index.ts

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import './table_vis.mock';
// @ts-ignore
import StubIndexPattern from 'test_utils/stub_index_pattern';
import { getAngularModule } from './get_inner_angular';
import { initTableVisLegacyModule } from './shim/table_vis_legacy_module';
import { initTableVisLegacyModule } from './angular/table_vis_legacy_module';
import {
npStart,
legacyResponseHandlerProvider,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import $ from 'jquery';
import { Vis, VisParams } from '../../visualizations/public';
import { npStart } from './legacy_imports';
import { getAngularModule } from './get_inner_angular';
import { initTableVisLegacyModule } from './shim/table_vis_legacy_module';
import { initTableVisLegacyModule } from './angular/table_vis_legacy_module';

const innerAngularName = 'kibana/table_vis';

Expand Down