Skip to content

Commit

Permalink
Moved filter options from search bar into filter bar
Browse files Browse the repository at this point in the history
  • Loading branch information
Liza Katz committed Apr 21, 2019
1 parent bc61931 commit 57b9aab
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/

import { SearchBar } from './components/search_bar';
import { FilterOptions } from './components/filter_options';

// @ts-ignore
import { setupDirective } from './directive';
Expand All @@ -33,7 +32,6 @@ export class SearchBarService {
setupDirective();
return {
SearchBar,
FilterOptions,
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';

import { DashboardViewportProvider } from './viewport/dashboard_viewport_provider';

// import 'plugins/data';
import 'plugins/data';

const app = uiModules.get('app/dashboard', [
'elasticsearch',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../breadcrumbs';
import { buildVislibDimensions } from 'ui/visualize/loader/pipeline_helpers/build_pipeline';
import 'ui/capabilities/route_setup';

// import { data } from 'plugins/data';
import 'plugins/data';


const fetchStatuses = {
UNINITIALIZED: 'uninitialized',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
import { getEditBreadcrumbs, getCreateBreadcrumbs } from '../breadcrumbs';

// import 'plugins/data';
import 'plugins/data';

uiRoutes
.when(VisualizeConstants.CREATE_PATH, {
Expand Down
6 changes: 1 addition & 5 deletions src/legacy/ui/public/filter_bar/filter_bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@ import chrome from 'ui/chrome';
import { IndexPattern } from 'ui/index_patterns';
import { FilterEditor } from './filter_editor';
import { FilterItem } from './filter_item';

// TODO: how the unpacking should go?
import { data } from 'plugins/data';
console.log(data);
const { FilterOptions } = data ;
import { FilterOptions } from './filter_options';

const config = chrome.getUiSettingsClient();

Expand Down

0 comments on commit 57b9aab

Please sign in to comment.