Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 1 addition & 12 deletions src/core_plugins/kibana/public/discover/controllers/discover.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import _ from 'lodash';
import angular from 'angular';
import moment from 'moment';
import { getSort } from 'ui/doc_table/lib/get_sort';
import * as columnActions from 'ui/doc_table/actions/columns';
import dateMath from '@elastic/datemath';
Expand All @@ -18,7 +17,6 @@ import 'ui/share';
import { VisProvider } from 'ui/vis';
import { BasicResponseHandlerProvider } from 'ui/vis/response_handlers/basic';
import { DocTitleProvider } from 'ui/doc_title';
import { UtilsBrushEventProvider } from 'ui/utils/brush_event';
import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn';
import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
import { FilterManagerProvider } from 'ui/filter_manager';
Expand Down Expand Up @@ -115,7 +113,6 @@ function discoverController(

const Vis = Private(VisProvider);
const docTitle = Private(DocTitleProvider);
const brushEvent = Private(UtilsBrushEventProvider);
const HitSortFn = Private(PluginsKibanaDiscoverHitSortFnProvider);
const queryFilter = Private(FilterBarQueryFilterProvider);
const filterManager = Private(FilterManagerProvider);
Expand Down Expand Up @@ -510,6 +507,7 @@ function discoverController(
$scope.mergedEsResp = merged;

if ($scope.opts.timefield) {
$scope.searchSource.rawResponse = merged;
responseHandler($scope.vis, merged).then(resp => {
$scope.visData = resp;
});
Expand Down Expand Up @@ -655,15 +653,6 @@ function discoverController(
addLegend: false,
addTimeMarker: true
},
listeners: {
click: function (e) {
notify.log(e);
timefilter.time.from = moment(e.point.x);
timefilter.time.to = moment(e.point.x + e.data.ordered.interval);
timefilter.time.mode = 'absolute';
},
brush: brushEvent($scope.state)
},
aggs: visStateAggs
});

Expand Down
2 changes: 2 additions & 0 deletions src/core_plugins/kibana/public/discover/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ <h2>Searching</h2>
vis="vis"
ui-state="uiState"
vis-data="visData"
show-spy-panel="true"
search-source="searchSource"
style="height: 200px"
>
</visualization>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/vis/editors/default/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
</div>

<div class="vis-editor-canvas">
<visualization vis="vis" vis-data="visData" ui-state="uiState" search-source="searchSource" />
<visualization vis="vis" vis-data="visData" ui-state="uiState" search-source="searchSource" show-spy-panel="true" />
</div>
4 changes: 1 addition & 3 deletions src/ui/public/visualize/visualization.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ uiModules
restrict: 'E',
require: '?renderCounter',
scope : {
showSpyPanel: '=?',
vis: '=',
visData: '=',
uiState: '=?',
Expand All @@ -27,9 +28,6 @@ uiModules
const minVisChartHeight = 180;
const resizeChecker = new ResizeChecker($el);

$scope.showSpyPanel = $scope.vis && $scope.vis.showSpyPanel || false;


//todo: lets make this a simple function call.
const getVisEl = jQueryGetter('.visualize-chart');
const getVisContainer = jQueryGetter('.vis-container');
Expand Down
2 changes: 2 additions & 0 deletions src/ui/public/visualize/visualize.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
ui-state="uiState"
class="vis-editor-content"
search-source="savedObj.searchSource"
show-spy-panel="showSpyPanel"
/>
<visualization
ng-if="editorMode==false"
vis="vis"
vis-data="visData"
ui-state="uiState"
search-source="savedObj.searchSource"
show-spy-panel="showSpyPanel"
/>

1 change: 0 additions & 1 deletion src/ui/public/visualize/visualize.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ uiModules

$scope.vis = $scope.savedObj.vis;
$scope.editorMode = $scope.editorMode || false;
$scope.vis.showSpyPanel = $scope.showSpyPanel || false;
$scope.vis.editorMode = $scope.editorMode;
$scope.vis.visualizeScope = true;

Expand Down