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

stackdriver: broadcasting through $scope doesnt work anymore since query_filter_ctrl is now a sibling directive to query_aggregation_ctrl, so broadcasting is now done using $rootScope

Browse Source
This commit is contained in:
Erik Sundell 2018-09-28 11:25:32 +02:00
parent a63877bd4f
commit 5bc6d857a7
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
View File

@ -32,7 +32,11 @@ export class StackdriverAggregationCtrl {
this.alignOptions = options.alignOptions; this.alignOptions = options.alignOptions;
this.setAggOptions(); this.setAggOptions();
this.setAlignOptions(); this.setAlignOptions();
$scope.$on('metricTypeChanged', this.setAlignOptions.bind(this)); const self = this;
$scope.$on('metricTypeChanged', () => {
self.setAggOptions();
self.setAlignOptions();
});
} }
setAlignOptions() { setAlignOptions() {

4
public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
View File

@ -41,7 +41,7 @@ export class StackdriverFilterCtrl {
datasource: any; datasource: any;
/** @ngInject */ /** @ngInject */
constructor(private $scope, private uiSegmentSrv, private templateSrv) { constructor(private $scope, private uiSegmentSrv, private templateSrv, private $rootScope) {
this.datasource = $scope.datasource; this.datasource = $scope.datasource;
this.target = $scope.target; this.target = $scope.target;
this.metricType = $scope.defaultDropdownValue; this.metricType = $scope.defaultDropdownValue;
@ -180,7 +180,7 @@ export class StackdriverFilterCtrl {
this.target.unit = unit; this.target.unit = unit;
this.target.valueType = valueType; this.target.valueType = valueType;
this.target.metricKind = metricKind; this.target.metricKind = metricKind;
this.$scope.$broadcast('metricTypeChanged'); this.$rootScope.$broadcast('metricTypeChanged');
} }
async getGroupBys(segment, index, removeText?: string, removeUsed = true) { async getGroupBys(segment, index, removeText?: string, removeUsed = true) {

2
public/app/plugins/datasource/stackdriver/specs/query_filter_ctrl.test.ts
View File

@ -420,7 +420,7 @@ function createCtrlWithFakes(existingFilters?: string[]) {
refresh: () => {}, refresh: () => {},
}; };
return new StackdriverFilterCtrl(scope, fakeSegmentServer, new TemplateSrvStub()); return new StackdriverFilterCtrl(scope, fakeSegmentServer, new TemplateSrvStub(), { $broadcast: param => {} });
} }
function createTarget(existingFilters?: string[]) { function createTarget(existingFilters?: string[]) {