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: Remove angular dependency from backendSrv (#20999)

Browse Source 
* Chore: Remove angular dependency from backendSrv

* Refactor: Naive soultion for logging out unauthorized users

* Refactor: Restructures to different streams

* Refactor: Restructures datasourceRequest

* Refactor: Flipped back if statement

* Refactor: Extracted getFromFetchStream

* Refactor: Extracts toFailureStream operation

* Refactor: Fixes issue when options.params contains arrays

* Refactor: Fixes broken test (but we need a lot more)

* Refactor: Adds explaining comments

* Refactor: Adds latest RxJs version so cancellations work

* Refactor: Cleans up the takeUntil code

* Refactor: Adds tests for request function

* Refactor: Separates into smaller functions

* Refactor: Adds last error tests

* Started to changed so we require getBackendSrv from the @grafana-runtime when applicable.

* Using the getBackendSrv from @grafana/runtime.

* Changed so we use the getBackendSrv from the @grafana-runtime when possible.

* Fixed so Server Admin -> Orgs works again.

* Removed unused dependency.

* Fixed digest issues on the Server Admin -> Users page.

* Fix: Fixes digest problems in Playlists

* Fix: Fixes digest issues in VersionHistory

* Tests: Fixes broken tests

* Fix: Fixes digest issues in Alerting => Notification channels

* Fixed digest issues on the Intive page.

* Fixed so we run digest after password reset email sent.

* Fixed digest issue when trying to sign up account.

* Fixed so the Server Admin -> Edit Org works with backendSrv

* Fixed so Server Admin -> Users works with backend srv.

* Fixed digest issues in Server Admin -> Orgs

* Fix: Fixes digest issues in DashList plugin

* Fixed digest issues on Server Admin -> users.

* Fix: Fixes digest issues with Snapshots

* Fixed digest issue when deleting a user.

* Fix: Fixes digest issues with dashLink

* Chore: Changes RxJs version to 6.5.4 which includes the same cancellation fix

* Fix: Fixes digest issue when toggling folder in manage dashboards

* Fix: Fixes bug in executeInOrder

* Fix: Fixes digest issue with CreateFolderCtrl and FolderDashboardsCtrl

* Fix: Fixes tslint error in test

* Refactor: Changes default behaviour for emitted messages as before migration

* Fix: Fixes various digest issues when saving, starring or deleting dashboards

* Fix: Fixes digest issues with FolderPickerCtrl

* Fixed digest issue.

* Fixed digest issues.

* Fixed issues with angular digest.

* Removed the this.digest pattern.

Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
Co-authored-by: Marcus Andersson <systemvetaren@gmail.com>
This commit is contained in:
kay delaney
2020-01-21 09:08:07 +00:00
committed by Hugo Häggmark
parent 6ff315a299
commit cf2cc71393
122 changed files with 2856 additions and 2016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/plugins/datasource/mysql/datasource.ts
View File

@@ -1,7 +1,7 @@
import _ from 'lodash';
import ResponseParser from './response_parser';
import MysqlQuery from 'app/plugins/datasource/mysql/mysql_query';
import { BackendSrv } from 'app/core/services/backend_srv';
import { getBackendSrv } from '@grafana/runtime';
import { TemplateSrv } from 'app/features/templating/template_srv';
import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
//Types
@@ -16,12 +16,7 @@ export class MysqlDatasource {
interval: string;
/** @ngInject */
constructor(
instanceSettings: any,
private backendSrv: BackendSrv,
private templateSrv: TemplateSrv,
private timeSrv: TimeSrv
) {
constructor(instanceSettings: any, private templateSrv: TemplateSrv, private timeSrv: TimeSrv) {
this.name = instanceSettings.name;
this.id = instanceSettings.id;
this.responseParser = new ResponseParser();
@@ -83,7 +78,7 @@ export class MysqlDatasource {
return Promise.resolve({ data: [] });
}
return this.backendSrv
return getBackendSrv()
.datasourceRequest({
url: '/api/tsdb/query',
method: 'POST',
@@ -110,7 +105,7 @@ export class MysqlDatasource {
format: 'table',
};
return this.backendSrv
return getBackendSrv()
.datasourceRequest({
url: '/api/tsdb/query',
method: 'POST',
@@ -156,7 +151,7 @@ export class MysqlDatasource {
data['to'] = optionalOptions.range.to.valueOf().toString();
}
return this.backendSrv
return getBackendSrv()
.datasourceRequest({
url: '/api/tsdb/query',
method: 'POST',
@@ -166,7 +161,7 @@ export class MysqlDatasource {
}
testDatasource() {
return this.backendSrv
return getBackendSrv()
.datasourceRequest({
url: '/api/tsdb/query',
method: 'POST',

42
public/app/plugins/datasource/mysql/specs/datasource.test.ts
View File

@@ -1,20 +1,28 @@
import { MysqlDatasource } from '../datasource';
import { CustomVariable } from 'app/features/templating/custom_variable';
import { dateTime, toUtc } from '@grafana/data';
import { BackendSrv } from 'app/core/services/backend_srv';
import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
import { TemplateSrv } from 'app/features/templating/template_srv';
jest.mock('@grafana/runtime', () => ({
...jest.requireActual('@grafana/runtime'),
getBackendSrv: () => backendSrv,
}));
describe('MySQLDatasource', () => {
const instanceSettings = { name: 'mysql' };
const backendSrv = {};
const templateSrv: TemplateSrv = new TemplateSrv();
const datasourceRequestMock = jest.spyOn(backendSrv, 'datasourceRequest');
beforeEach(() => {
jest.clearAllMocks();
});
const raw = {
from: toUtc('2018-04-25 10:00'),
to: toUtc('2018-04-25 11:00'),
};
const ctx = {
backendSrv,
timeSrvMock: {
timeRange: () => ({
from: raw.from,
@@ -25,7 +33,7 @@ describe('MySQLDatasource', () => {
} as any;
beforeEach(() => {
ctx.ds = new MysqlDatasource(instanceSettings, backendSrv as BackendSrv, templateSrv, ctx.timeSrvMock);
ctx.ds = new MysqlDatasource(instanceSettings, templateSrv, ctx.timeSrvMock);
});
describe('When performing annotationQuery', () => {
@@ -63,9 +71,8 @@ describe('MySQLDatasource', () => {
};
beforeEach(() => {
ctx.backendSrv.datasourceRequest = jest.fn(options => {
return Promise.resolve({ data: response, status: 200 });
});
datasourceRequestMock.mockImplementation(options => Promise.resolve({ data: response, status: 200 }));
ctx.ds.annotationQuery(options).then((data: any) => {
results = data;
});
@@ -110,9 +117,8 @@ describe('MySQLDatasource', () => {
};
beforeEach(() => {
ctx.backendSrv.datasourceRequest = jest.fn(options => {
return Promise.resolve({ data: response, status: 200 });
});
datasourceRequestMock.mockImplementation(options => Promise.resolve({ data: response, status: 200 }));
ctx.ds.metricFindQuery(query).then((data: any) => {
results = data;
});
@@ -151,7 +157,7 @@ describe('MySQLDatasource', () => {
};
beforeEach(() => {
ctx.backendSrv.datasourceRequest = jest.fn(options => {
datasourceRequestMock.mockImplementation(options => {
calledWith = options;
return Promise.resolve({ data: response, status: 200 });
});
@@ -161,7 +167,7 @@ describe('MySQLDatasource', () => {
});
it('should return list of all column values', () => {
expect(ctx.backendSrv.datasourceRequest).toBeCalledTimes(1);
expect(datasourceRequestMock).toBeCalledTimes(1);
expect(calledWith.data.queries[0].rawSql).toBe("select title from atable where title LIKE 'aTit%'");
expect(results.length).toBe(6);
});
@@ -193,7 +199,7 @@ describe('MySQLDatasource', () => {
};
beforeEach(() => {
ctx.backendSrv.datasourceRequest = jest.fn(options => {
datasourceRequestMock.mockImplementation(options => {
calledWith = options;
return Promise.resolve({ data: response, status: 200 });
});
@@ -203,7 +209,7 @@ describe('MySQLDatasource', () => {
});
it('should return list of all column values', () => {
expect(ctx.backendSrv.datasourceRequest).toBeCalledTimes(1);
expect(datasourceRequestMock).toBeCalledTimes(1);
expect(calledWith.data.queries[0].rawSql).toBe("select title from atable where title LIKE '%'");
expect(results.length).toBe(6);
});
@@ -234,9 +240,7 @@ describe('MySQLDatasource', () => {
};
beforeEach(() => {
ctx.backendSrv.datasourceRequest = jest.fn(options => {
return Promise.resolve({ data: response, status: 200 });
});
datasourceRequestMock.mockImplementation(() => Promise.resolve({ data: response, status: 200 }));
ctx.ds.metricFindQuery(query).then((data: any) => {
results = data;
});
@@ -276,9 +280,7 @@ describe('MySQLDatasource', () => {
};
beforeEach(() => {
ctx.backendSrv.datasourceRequest = jest.fn(options => {
return Promise.resolve({ data: response, status: 200 });
});
datasourceRequestMock.mockImplementation(() => Promise.resolve({ data: response, status: 200 }));
ctx.ds.metricFindQuery(query).then((data: any) => {
results = data;
});