Skip to content

Commit b638d21

Browse files
spalgerspalger
committed
Merge branch 'master' of github.com:elastic/kibana into implement/stream-utils
2 parents a2f437f + b444a40 commit b638d21

67 files changed

Lines changed: 1072 additions & 262 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎STYLEGUIDE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ recommended for the development of all Kibana plugins.
88
- [CSS](style_guides/css_style_guide.md)
99
- [HTML](style_guides/html_style_guide.md)
1010
- [API](style_guides/api_style_guide.md)
11+
- [Architecture](style_guides/architecture.md)
1112

1213
## Filenames
1314

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"@bigfunger/decompress-zip": "0.2.0-stripfix3",
7474
"@bigfunger/jsondiffpatch": "0.1.38-webpack",
7575
"@elastic/datemath": "2.3.0",
76+
"@elastic/httpolyglot": "0.1.2-elasticpatch1",
7677
"@elastic/kibana-ui-framework": "0.0.13",
7778
"@elastic/webpack-directory-name-as-main": "2.0.2",
7879
"@spalger/filesaver": "1.1.2",
@@ -123,7 +124,6 @@
123124
"gridster": "0.5.6",
124125
"h2o2": "5.1.1",
125126
"hapi": "14.2.0",
126-
"httpolyglot": "0.1.1",
127127
"imports-loader": "0.6.4",
128128
"inert": "4.0.2",
129129
"jade": "1.11.0",

‎src/core_plugins/console/public/css/sense.light.less‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
.ace_multi_string {
2626
color: #166555;
27+
font-style: italic;
2728
}
2829

2930
.ace_start_triple_quote, .ace_end_triple_quote {

‎src/core_plugins/console/public/src/es.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,17 @@ module.exports.send = function (method, path, data, server, disable_auth_alert)
2323
try {
2424
JSON.parse(data);
2525
contentType = 'application/json';
26-
} catch (e) {
27-
contentType = 'text/plain';
26+
}
27+
catch (e) {
28+
try {
29+
data.split('\n').forEach(line => {
30+
if (!line) return;
31+
JSON.parse(line);
32+
});
33+
contentType = 'application/x-ndjson';
34+
} catch (e){
35+
contentType = 'text/plain';
36+
}
2837
}
2938
}
3039

‎src/core_plugins/console/public/src/sense_editor/editor.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ function SenseEditor($el) {
546546

547547
var ret = 'curl -X' + es_method + ' "' + url + '"';
548548
if (es_data && es_data.length) {
549-
ret += " -d'\n";
549+
ret += " -H 'Content-Type: application/json' -d'\n";
550550
var data_as_string = utils.collapseLiteralStrings(es_data.join("\n"))
551551
// since Sense doesn't allow single quote json string any single qoute is within a string.
552552
ret += data_as_string.replace(/'/g, '\\"');

‎src/core_plugins/console/public/tests/src/editor_tests.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ curl -XGET "http://localhost:9200/_stats?level=shards"
386386
387387
#in between comment
388388
389-
curl -XPUT "http://localhost:9200/index_1/type1/1" -d'
389+
curl -XPUT "http://localhost:9200/index_1/type1/1" -H 'Content-Type: application/json' -d'
390390
{
391391
"f": 1
392392
}'`.trim()

‎src/core_plugins/kibana/public/dashboard/dashboard.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ <h2>This dashboard is empty. Let's fill it up!</h2>
6161
</div>
6262

6363
<dashboard-grid
64-
ng-if="!hasExpandedPanel()"
64+
ng-show="!hasExpandedPanel()"
6565
on-panel-removed="onPanelRemoved"
6666
panels="state.panels"
6767
get-vis-click-handler="filterBarClickHandler(state)"
@@ -81,4 +81,6 @@ <h2>This dashboard is empty. Let's fill it up!</h2>
8181
save-state="saveState"
8282
create-child-ui-state="createChildUiState"
8383
toggle-expand="toggleExpandPanel(expandedPanel.panelIndex)">
84+
</dashboard-panel>
85+
8486
</dashboard-app>

‎src/core_plugins/kibana/public/dashboard/dashboard_constants.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
export const DashboardConstants = {
33
ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM: 'addToDashboard',
44
NEW_VISUALIZATION_ID_PARAM: 'addVisualization',
5-
LANDING_PAGE_URL: '/dashboard'
5+
LANDING_PAGE_PATH: '/dashboard'
66
};

‎src/core_plugins/kibana/public/dashboard/grid.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,10 @@ app.directive('dashboardGrid', function ($compile, Notifier) {
209209
// then tell gridster to "reflow" -- which is definitely not supported.
210210
// we may need to consider using a different library
211211
function reflowGridster() {
212+
if ($container.hasClass('ng-hide')) {
213+
return;
214+
}
215+
212216
// https://github.com/gcphost/gridster-responsive/blob/97fe43d4b312b409696b1d702e1afb6fbd3bba71/jquery.gridster.js#L1208-L1235
213217
const g = gridster;
214218

‎src/core_plugins/kibana/public/dashboard/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ uiRoutes
1414
.defaults(/dashboard/, {
1515
requireDefaultIndex: true
1616
})
17-
.when(DashboardConstants.LANDING_PAGE_URL, {
17+
.when(DashboardConstants.LANDING_PAGE_PATH, {
1818
template: dashboardListingTemplate,
1919
controller: DashboardListingController,
2020
controllerAs: 'listingController'

0 commit comments

Comments
 (0)