IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Update Slate to 0.47.8 (#18412)

Browse Source 
* Chore: Update Slate to 0.47.8
Closes #17430

* Add slate and immutable to grafana-ui deps

* Fixes some small regressions introduced

* Fix suggestions for multiple query fields

* Pin upgraded dependencies

* Prettier fix

* Remove original slate-react dependency

* Fix tiny-invariant dep

* (Temporarily) comments out source maps for grafana-ui
This commit is contained in:
kay delaney
2019-09-17 12:16:24 +01:00
committed by Dominik Prokop
parent e3a69d8023
commit 601853fc84
51 changed files with 1708 additions and 1321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/prometheus/language_utils.ts
View File

@@ -16,13 +16,13 @@ export const processHistogramLabels = (labels: string[]) => {
return { values: { __name__: result } };
};
export function processLabels(labels: any, withName = false) {
export function processLabels(labels: Array<{ [key: string]: string }>, withName = false) {
const values: { [key: string]: string[] } = {};
labels.forEach((l: any) => {
labels.forEach(l => {
const { __name__, ...rest } = l;
if (withName) {
values['__name__'] = values['__name__'] || [];
if (values['__name__'].indexOf(__name__) === -1) {
if (!values['__name__'].includes(__name__)) {
values['__name__'].push(__name__);
}
}
@@ -31,7 +31,7 @@ export function processLabels(labels: any, withName = false) {
if (!values[key]) {
values[key] = [];
}
if (values[key].indexOf(rest[key]) === -1) {
if (!values[key].includes(rest[key])) {
values[key].push(rest[key]);
}
});