Skip to content

N
nexpie-grafana-theme
Commit b64115e5 by Erik Sundell
Options

access scope directly from this. update tests

parent 6a2f5eb6
Showing with 53 additions and 53 deletions
public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
...@@ -30,15 +30,23 @@ export class StackdriverFilterCtrl { ...@@ -30,15 +30,23 @@ export class StackdriverFilterCtrl {
groupBySegments: any[]; groupBySegments: any[];
filterSegments: FilterSegments; filterSegments: FilterSegments;
removeSegment: any; removeSegment: any;
filters: string[];
groupBys: string[];
hideGroupBys: boolean;
labelData: any;
loading: Promise<any>;
filtersChanged: (filters) => void;
groupBysChanged: (groupBys) => void;
/** @ngInject */ /** @ngInject */
constructor(private $scope, private uiSegmentSrv, private templateSrv) { constructor(private $scope, private uiSegmentSrv, private templateSrv) {
this.initSegments(this.$scope.ctrl.hideGroupBys); this.$scope.ctrl = this;
this.initSegments(this.hideGroupBys);
} }
initSegments(hideGroupBys: boolean) { initSegments(hideGroupBys: boolean) {
if (!hideGroupBys) { if (!hideGroupBys) {
this.groupBySegments = this.$scope.ctrl.groupBys.map(groupBy => { this.groupBySegments = this.groupBys.map(groupBy => {
return this.uiSegmentSrv.getSegmentForValue(groupBy); return this.uiSegmentSrv.getSegmentForValue(groupBy);
}); });
this.ensurePlusButton(this.groupBySegments); this.ensurePlusButton(this.groupBySegments);
...@@ -48,7 +56,7 @@ export class StackdriverFilterCtrl { ...@@ -48,7 +56,7 @@ export class StackdriverFilterCtrl {
this.filterSegments = new FilterSegments( this.filterSegments = new FilterSegments(
this.uiSegmentSrv, this.uiSegmentSrv,
this.$scope.ctrl.filters, this.filters,
this.getFilterKeys.bind(this), this.getFilterKeys.bind(this),
this.getFilterValues.bind(this) this.getFilterValues.bind(this)
); );
...@@ -56,9 +64,9 @@ export class StackdriverFilterCtrl { ...@@ -56,9 +64,9 @@ export class StackdriverFilterCtrl {
} }
async createLabelKeyElements() { async createLabelKeyElements() {
await this.$scope.ctrl.loading; await this.loading;
let elements = Object.keys(this.$scope.ctrl.labelData.metricLabels || {}).map(l => { let elements = Object.keys(this.labelData.metricLabels || {}).map(l => {
return this.uiSegmentSrv.newSegment({ return this.uiSegmentSrv.newSegment({
value: `metric.label.${l}`, value: `metric.label.${l}`,
expandable: false, expandable: false,
...@@ -67,7 +75,7 @@ export class StackdriverFilterCtrl { ...@@ -67,7 +75,7 @@ export class StackdriverFilterCtrl {
elements = [ elements = [
...elements, ...elements,
...Object.keys(this.$scope.ctrl.labelData.resourceLabels || {}).map(l => { ...Object.keys(this.labelData.resourceLabels || {}).map(l => {
return this.uiSegmentSrv.newSegment({ return this.uiSegmentSrv.newSegment({
value: `resource.label.${l}`, value: `resource.label.${l}`,
expandable: false, expandable: false,
...@@ -75,7 +83,7 @@ export class StackdriverFilterCtrl { ...@@ -75,7 +83,7 @@ export class StackdriverFilterCtrl {
}), }),
]; ];
if (this.$scope.ctrl.labelData.resourceTypes && this.$scope.ctrl.labelData.resourceTypes.length > 0) { if (this.labelData.resourceTypes && this.labelData.resourceTypes.length > 0) {
elements = [ elements = [
...elements, ...elements,
this.uiSegmentSrv.newSegment({ this.uiSegmentSrv.newSegment({
...@@ -91,7 +99,7 @@ export class StackdriverFilterCtrl { ...@@ -91,7 +99,7 @@ export class StackdriverFilterCtrl {
async getFilterKeys(segment, removeText: string) { async getFilterKeys(segment, removeText: string) {
let elements = await this.createLabelKeyElements(); let elements = await this.createLabelKeyElements();
if (this.$scope.ctrl.filters.indexOf(this.resourceTypeValue) !== -1) { if (this.filters.indexOf(this.resourceTypeValue) !== -1) {
elements = elements.filter(e => e.value !== this.resourceTypeValue); elements = elements.filter(e => e.value !== this.resourceTypeValue);
} }
...@@ -110,8 +118,7 @@ export class StackdriverFilterCtrl { ...@@ -110,8 +118,7 @@ export class StackdriverFilterCtrl {
async getGroupBys(segment) { async getGroupBys(segment) {
let elements = await this.createLabelKeyElements(); let elements = await this.createLabelKeyElements();
console.log('elements', elements); elements = elements.filter(e => this.groupBys.indexOf(e.value) === -1);
elements = elements.filter(e => this.$scope.ctrl.groupBys.indexOf(e.value) === -1);
const noValueOrPlusButton = !segment || segment.type === 'plus-button'; const noValueOrPlusButton = !segment || segment.type === 'plus-button';
if (noValueOrPlusButton && elements.length === 0) { if (noValueOrPlusButton && elements.length === 0) {
return []; return [];
...@@ -136,39 +143,34 @@ export class StackdriverFilterCtrl { ...@@ -136,39 +143,34 @@ export class StackdriverFilterCtrl {
}; };
const groupBys = this.groupBySegments.reduce(reducer, []); const groupBys = this.groupBySegments.reduce(reducer, []);
this.$scope.ctrl.groupBysChanged({ groupBys }); this.groupBysChanged({ groupBys });
this.ensurePlusButton(this.groupBySegments); this.ensurePlusButton(this.groupBySegments);
} }
async getFilters(segment, index) { async getFilters(segment, index) {
await this.$scope.ctrl.loading; await this.loading;
const hasNoFilterKeys = const hasNoFilterKeys = this.labelData.metricLabels && Object.keys(this.labelData.metricLabels).length === 0;
this.$scope.ctrl.labelData.metricLabels && Object.keys(this.$scope.ctrl.labelData.metricLabels).length === 0;
return this.filterSegments.getFilters(segment, index, hasNoFilterKeys); return this.filterSegments.getFilters(segment, index, hasNoFilterKeys);
} }
getFilterValues(index) { getFilterValues(index) {
const filterKey = this.templateSrv.replace(this.filterSegments.filterSegments[index - 2].value); const filterKey = this.templateSrv.replace(this.filterSegments.filterSegments[index - 2].value);
if ( if (!filterKey || !this.labelData.metricLabels || Object.keys(this.labelData.metricLabels).length === 0) {
!filterKey ||
!this.$scope.ctrl.labelData.metricLabels ||
Object.keys(this.$scope.ctrl.labelData.metricLabels).length === 0
) {
return []; return [];
} }
const shortKey = filterKey.substring(filterKey.indexOf('.label.') + 7); const shortKey = filterKey.substring(filterKey.indexOf('.label.') + 7);
if (filterKey.startsWith('metric.label.') && this.$scope.ctrl.labelData.metricLabels.hasOwnProperty(shortKey)) { if (filterKey.startsWith('metric.label.') && this.labelData.metricLabels.hasOwnProperty(shortKey)) {
return this.$scope.ctrl.labelData.metricLabels[shortKey]; return this.labelData.metricLabels[shortKey];
} }
if (filterKey.startsWith('resource.label.') && this.$scope.ctrl.labelData.resourceLabels.hasOwnProperty(shortKey)) { if (filterKey.startsWith('resource.label.') && this.labelData.resourceLabels.hasOwnProperty(shortKey)) {
return this.$scope.ctrl.labelData.resourceLabels[shortKey]; return this.labelData.resourceLabels[shortKey];
} }
if (filterKey === this.resourceTypeValue) { if (filterKey === this.resourceTypeValue) {
return this.$scope.ctrl.labelData.resourceTypes; return this.labelData.resourceTypes;
} }
return []; return [];
...@@ -177,7 +179,7 @@ export class StackdriverFilterCtrl { ...@@ -177,7 +179,7 @@ export class StackdriverFilterCtrl {
filterSegmentUpdated(segment, index) { filterSegmentUpdated(segment, index) {
const filters = this.filterSegments.filterSegmentUpdated(segment, index); const filters = this.filterSegments.filterSegmentUpdated(segment, index);
if (!filters.some(f => f === DefaultFilterValue)) { if (!filters.some(f => f === DefaultFilterValue)) {
this.$scope.ctrl.filtersChanged({ filters }); this.filtersChanged({ filters });
} }
} }
......
public/app/plugins/datasource/stackdriver/specs/query_filter_ctrl.test.ts
...@@ -5,7 +5,6 @@ import { DefaultRemoveFilterValue, DefaultFilterValue } from '../filter_segments ...@@ -5,7 +5,6 @@ import { DefaultRemoveFilterValue, DefaultFilterValue } from '../filter_segments
describe('StackdriverQueryFilterCtrl', () => { describe('StackdriverQueryFilterCtrl', () => {
let ctrl; let ctrl;
let result; let result;
// let filterChangedMock;
let groupByChangedMock; let groupByChangedMock;
describe('when initializing query editor', () => { describe('when initializing query editor', () => {
...@@ -34,8 +33,8 @@ describe('StackdriverQueryFilterCtrl', () => { ...@@ -34,8 +33,8 @@ describe('StackdriverQueryFilterCtrl', () => {
describe('when labels are fetched', () => { describe('when labels are fetched', () => {
beforeEach(async () => { beforeEach(async () => {
ctrl.$scope.ctrl.labelData.metricLabels = { 'metric-key-1': ['metric-value-1'] }; ctrl.labelData.metricLabels = { 'metric-key-1': ['metric-value-1'] };
ctrl.$scope.ctrl.labelData.resourceLabels = { 'resource-key-1': ['resource-value-1'] }; ctrl.labelData.resourceLabels = { 'resource-key-1': ['resource-value-1'] };
result = await ctrl.getGroupBys({ type: '' }); result = await ctrl.getGroupBys({ type: '' });
}); });
...@@ -50,15 +49,15 @@ describe('StackdriverQueryFilterCtrl', () => { ...@@ -50,15 +49,15 @@ describe('StackdriverQueryFilterCtrl', () => {
describe('when a group by label is selected', () => { describe('when a group by label is selected', () => {
beforeEach(async () => { beforeEach(async () => {
ctrl.$scope.ctrl.labelData.metricLabels = { ctrl.labelData.metricLabels = {
'metric-key-1': ['metric-value-1'], 'metric-key-1': ['metric-value-1'],
'metric-key-2': ['metric-value-2'], 'metric-key-2': ['metric-value-2'],
}; };
ctrl.$scope.ctrl.labelData.resourceLabels = { ctrl.labelData.resourceLabels = {
'resource-key-1': ['resource-value-1'], 'resource-key-1': ['resource-value-1'],
'resource-key-2': ['resource-value-2'], 'resource-key-2': ['resource-value-2'],
}; };
ctrl.$scope.ctrl.groupBys = ['metric.label.metric-key-1', 'resource.label.resource-key-1']; ctrl.groupBys = ['metric.label.metric-key-1', 'resource.label.resource-key-1'];
result = await ctrl.getGroupBys({ type: '' }); result = await ctrl.getGroupBys({ type: '' });
}); });
...@@ -74,7 +73,7 @@ describe('StackdriverQueryFilterCtrl', () => { ...@@ -74,7 +73,7 @@ describe('StackdriverQueryFilterCtrl', () => {
describe('when a group by is selected', () => { describe('when a group by is selected', () => {
beforeEach(() => { beforeEach(() => {
groupByChangedMock = jest.fn(); groupByChangedMock = jest.fn();
ctrl.$scope.ctrl.groupBysChanged = groupByChangedMock; ctrl.groupBysChanged = groupByChangedMock;
const removeSegment = { fake: true, value: '-- remove group by --' }; const removeSegment = { fake: true, value: '-- remove group by --' };
const segment = { value: 'groupby1' }; const segment = { value: 'groupby1' };
ctrl.groupBySegments = [segment, removeSegment]; ctrl.groupBySegments = [segment, removeSegment];
...@@ -89,7 +88,7 @@ describe('StackdriverQueryFilterCtrl', () => { ...@@ -89,7 +88,7 @@ describe('StackdriverQueryFilterCtrl', () => {
describe('when a selected group by is removed', () => { describe('when a selected group by is removed', () => {
beforeEach(() => { beforeEach(() => {
groupByChangedMock = jest.fn(); groupByChangedMock = jest.fn();
ctrl.$scope.ctrl.groupBysChanged = groupByChangedMock; ctrl.groupBysChanged = groupByChangedMock;
const removeSegment = { fake: true, value: '-- remove group by --' }; const removeSegment = { fake: true, value: '-- remove group by --' };
const segment = { value: 'groupby1' }; const segment = { value: 'groupby1' };
ctrl.groupBySegments = [segment, removeSegment]; ctrl.groupBySegments = [segment, removeSegment];
...@@ -136,11 +135,11 @@ describe('StackdriverQueryFilterCtrl', () => { ...@@ -136,11 +135,11 @@ describe('StackdriverQueryFilterCtrl', () => {
describe('when values for a key filter part are fetched', () => { describe('when values for a key filter part are fetched', () => {
beforeEach(async () => { beforeEach(async () => {
ctrl.$scope.ctrl.labelData.metricLabels = { ctrl.labelData.metricLabels = {
'metric-key-1': ['metric-value-1'], 'metric-key-1': ['metric-value-1'],
'metric-key-2': ['metric-value-2'], 'metric-key-2': ['metric-value-2'],
}; };
ctrl.$scope.ctrl.labelData.resourceLabels = { ctrl.labelData.resourceLabels = {
'resource-key-1': ['resource-value-1'], 'resource-key-1': ['resource-value-1'],
'resource-key-2': ['resource-value-2'], 'resource-key-2': ['resource-value-2'],
}; };
...@@ -161,11 +160,11 @@ describe('StackdriverQueryFilterCtrl', () => { ...@@ -161,11 +160,11 @@ describe('StackdriverQueryFilterCtrl', () => {
describe('when values for a value filter part are fetched', () => { describe('when values for a value filter part are fetched', () => {
beforeEach(async () => { beforeEach(async () => {
ctrl.$scope.ctrl.labelData.metricLabels = { ctrl.labelData.metricLabels = {
'metric-key-1': ['metric-value-1'], 'metric-key-1': ['metric-value-1'],
'metric-key-2': ['metric-value-2'], 'metric-key-2': ['metric-value-2'],
}; };
ctrl.$scope.ctrl.labelData.resourceLabels = { ctrl.labelData.resourceLabels = {
'resource-key-1': ['resource-value-1'], 'resource-key-1': ['resource-value-1'],
'resource-key-2': ['resource-value-2'], 'resource-key-2': ['resource-value-2'],
}; };
...@@ -392,25 +391,24 @@ function createCtrlWithFakes(existingFilters?: string[]) { ...@@ -392,25 +391,24 @@ function createCtrlWithFakes(existingFilters?: string[]) {
}, },
}; };
const scope = { const scope = {
ctrl: { hideGroupBys: false,
hideGroupBys: false, groupBys: [],
groupBys: [], filters: existingFilters || [],
filters: existingFilters || [], labelData: {
labelData: { metricLabels: {},
metricLabels: {}, resourceLabels: {},
resourceLabels: {}, resourceTypes: [],
resourceTypes: [], },
}, filtersChanged: () => {},
filtersChanged: () => {}, groupBysChanged: () => {},
groupBysChanged: () => {}, datasource: {
datasource: { getDefaultProject: () => {
getDefaultProject: () => { return 'project';
return 'project';
},
}, },
refresh: () => {},
}, },
refresh: () => {},
}; };
Object.assign(StackdriverFilterCtrl.prototype, scope);
return new StackdriverFilterCtrl(scope, fakeSegmentServer, new TemplateSrvStub()); return new StackdriverFilterCtrl(scope, fakeSegmentServer, new TemplateSrvStub());
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment