mirror of
https://github.com/grafana/grafana.git
synced 2025-02-13 00:55:47 -06:00
cf2cc71393
* 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>
61 lines
1.7 KiB
TypeScript
61 lines
1.7 KiB
TypeScript
import { getBackendSrv } from '@grafana/runtime';
|
|
import { NavModelSrv } from 'app/core/core';
|
|
import { promiseToDigest } from 'app/core/utils/promiseToDigest';
|
|
|
|
export default class AdminEditOrgCtrl {
|
|
/** @ngInject */
|
|
constructor($scope: any, $routeParams: any, $location: any, navModelSrv: NavModelSrv) {
|
|
$scope.init = () => {
|
|
$scope.navModel = navModelSrv.getNav('admin', 'global-orgs', 0);
|
|
|
|
if ($routeParams.id) {
|
|
promiseToDigest($scope)(Promise.all([$scope.getOrg($routeParams.id), $scope.getOrgUsers($routeParams.id)]));
|
|
}
|
|
};
|
|
|
|
$scope.getOrg = (id: number) => {
|
|
return getBackendSrv()
|
|
.get('/api/orgs/' + id)
|
|
.then((org: any) => {
|
|
$scope.org = org;
|
|
});
|
|
};
|
|
|
|
$scope.getOrgUsers = (id: number) => {
|
|
return getBackendSrv()
|
|
.get('/api/orgs/' + id + '/users')
|
|
.then((orgUsers: any) => {
|
|
$scope.orgUsers = orgUsers;
|
|
});
|
|
};
|
|
|
|
$scope.update = () => {
|
|
if (!$scope.orgDetailsForm.$valid) {
|
|
return;
|
|
}
|
|
|
|
promiseToDigest($scope)(
|
|
getBackendSrv()
|
|
.put('/api/orgs/' + $scope.org.id, $scope.org)
|
|
.then(() => {
|
|
$location.path('/admin/orgs');
|
|
})
|
|
);
|
|
};
|
|
|
|
$scope.updateOrgUser = (orgUser: any) => {
|
|
getBackendSrv().patch('/api/orgs/' + orgUser.orgId + '/users/' + orgUser.userId, orgUser);
|
|
};
|
|
|
|
$scope.removeOrgUser = (orgUser: any) => {
|
|
promiseToDigest($scope)(
|
|
getBackendSrv()
|
|
.delete('/api/orgs/' + orgUser.orgId + '/users/' + orgUser.userId)
|
|
.then(() => $scope.getOrgUsers($scope.org.id))
|
|
);
|
|
};
|
|
|
|
$scope.init();
|
|
}
|
|
}
|