Refactor Policy and OrganizationStatus services

client/app/components/dashboards/edit-dashboard-dialog.js

@@ -1,4 +1,5 @@
 import { isEmpty } from 'lodash';
+import policy from '@/services/policy';
 import template from './edit-dashboard-dialog.html';
 
 const EditDashboardDialog = {
@@ -8,11 +9,11 @@ const EditDashboardDialog = {
     dismiss: '&',
   },
   template,
-  controller($location, $http, Policy, Events) {
+  controller($location, $http, Events) {
     'ngInject';
 
     this.dashboard = this.resolve.dashboard;
-    this.policy = Policy;
+    this.policy = policy;
 
     this.isFormValid = () => !isEmpty(this.dashboard.name);
 

client/app/components/empty-state/empty-state.js

@@ -1,3 +1,4 @@
+import organizationStatus from '@/services/organizationStatus';
 import './empty-state.less';
 import template from './empty-state.html';
 
@@ -15,14 +16,14 @@ const EmptyStateComponent = {
     showInviteStep: '<',
     onboardingMode: '<',
   },
-  controller($uibModal, OrganizationStatus, currentUser) {
+  controller($uibModal, currentUser) {
     this.isAdmin = currentUser.isAdmin;
 
-    this.dataSourceStepCompleted = OrganizationStatus.objectCounters.data_sources > 0;
-    this.queryStepCompleted = OrganizationStatus.objectCounters.queries > 0;
-    this.dashboardStepCompleted = OrganizationStatus.objectCounters.dashboards > 0;
-    this.alertStepCompleted = OrganizationStatus.objectCounters.alerts > 0;
-    this.inviteStepCompleted = OrganizationStatus.objectCounters.users > 1;
+    this.dataSourceStepCompleted = organizationStatus.objectCounters.data_sources > 0;
+    this.queryStepCompleted = organizationStatus.objectCounters.queries > 0;
+    this.dashboardStepCompleted = organizationStatus.objectCounters.dashboards > 0;
+    this.alertStepCompleted = organizationStatus.objectCounters.alerts > 0;
+    this.inviteStepCompleted = organizationStatus.objectCounters.users > 1;
 
     this.shouldShowOnboarding = () => {
       if (!this.onboardingMode) {

client/app/config/index.js

@@ -24,6 +24,8 @@ import { each, isFunction, extend } from 'lodash';
 
 import '@/lib/sortable';
 
+import organizationStatus from '@/services/organizationStatus';
+
 import * as filters from '@/filters';
 import registerDirectives from '@/directives';
 import markdownFilter from '@/filters/markdown';
@@ -110,11 +112,7 @@ function registerPages() {
         route.authenticated = true;
         route.resolve = extend(
           {
-            __organizationStatus: (OrganizationStatus) => {
-              'ngInject';
-
-              return OrganizationStatus.refresh();
-            },
+            __organizationStatus: () => organizationStatus.refresh(),
           },
           route.resolve,
         );

client/app/pages/dashboards/dashboard.js

@@ -1,6 +1,7 @@
 import * as _ from 'lodash';
 import PromiseRejectionError from '@/lib/promise-rejection-error';
 import getTags from '@/services/getTags';
+import policy from '@/services/policy';
 import { durationHumanize } from '@/filters';
 import template from './dashboard.html';
 import shareDashboardTemplate from './share-dashboard.html';
@@ -36,7 +37,6 @@ function DashboardCtrl(
   clientConfig,
   Events,
   toastr,
-  Policy,
 ) {
   this.saveInProgress = false;
 
@@ -83,7 +83,7 @@ function DashboardCtrl(
     enabled: true,
   }));
 
-  const allowedIntervals = Policy.getDashboardRefreshIntervals();
+  const allowedIntervals = policy.getDashboardRefreshIntervals();
   if (_.isArray(allowedIntervals)) {
     _.each(this.refreshRates, (rate) => {
       rate.enabled = allowedIntervals.indexOf(rate.rate) >= 0;

client/app/pages/data-sources/list.js

@@ -1,8 +1,9 @@
 import settingsMenu from '@/services/settingsMenu';
+import policy from '@/services/policy';
 import template from './list.html';
 
-function DataSourcesCtrl(Policy, DataSource) {
-  this.policy = Policy;
+function DataSourcesCtrl(DataSource) {
+  this.policy = policy;
   this.dataSources = DataSource.query();
 }
 

client/app/pages/queries/view.js

@@ -1,6 +1,7 @@
 import { pick, some, find, minBy, map, intersection, isArray, isObject } from 'lodash';
 import { SCHEMA_NOT_SUPPORTED, SCHEMA_LOAD_ERROR } from '@/services/data-source';
 import getTags from '@/services/getTags';
+import policy from '@/services/policy';
 import Notifications from '@/services/notifications';
 import template from './query.html';
 
@@ -21,7 +22,6 @@ function QueryViewCtrl(
   toastr,
   $uibModal,
   currentUser,
-  Policy,
   Query,
   DataSource,
   Visualization,
@@ -451,7 +451,7 @@ function QueryViewCtrl(
     $scope.openVisualizationEditor();
   }
   const intervals = clientConfig.queryRefreshIntervals;
-  const allowedIntervals = Policy.getQueryRefreshIntervals();
+  const allowedIntervals = policy.getQueryRefreshIntervals();
   $scope.refreshOptions = isArray(allowedIntervals) ? intersection(intervals, allowedIntervals) : intervals;
 
   $scope.updateQueryMetadata = changes =>

client/app/pages/users/list.js

@@ -1,12 +1,13 @@
 import { extend } from 'lodash';
+import policy from '@/services/policy';
 import ListCtrl from '@/lib/list-ctrl';
 import settingsMenu from '@/services/settingsMenu';
 import template from './list.html';
 
 class UsersListCtrl extends ListCtrl {
-  constructor($scope, $location, currentUser, clientConfig, Policy, User) {
+  constructor($scope, $location, currentUser, clientConfig, User) {
     super($scope, $location, currentUser, clientConfig);
-    this.policy = Policy;
+    this.policy = policy;
     this.enableUser = user => User.enableUser(user).then(this.update);
     this.disableUser = user => User.disableUser(user).then(this.update);
     this.deleteUser = user => User.deleteUser(user).then(this.update);

client/app/services/ng.js

@@ -1,12 +1,14 @@
 export let $http = null; // eslint-disable-line import/no-mutable-exports
 export let $sanitize = null; // eslint-disable-line import/no-mutable-exports
+export let $q = null; // eslint-disable-line import/no-mutable-exports
 export let $uibModal = null; // eslint-disable-line import/no-mutable-exports
 export let toastr = null; // eslint-disable-line import/no-mutable-exports
 
 export default function init(ngModule) {
   ngModule.run(($injector) => {
     $http = $injector.get('$http');
     $sanitize = $injector.get('$sanitize');
+    $q = $injector.get('$q');
     $uibModal = $injector.get('$uibModal');
     toastr = $injector.get('toastr');
   });

client/app/services/organizationStatus.js

@@ -0,0 +1,17 @@
+import { $http } from '@/services/ng';
+
+class OrganizationStatus {
+  constructor() {
+    this.objectCounters = {};
+  }
+
+  refresh() {
+    return $http.get('api/organization/status').then(({ data }) => {
+      this.objectCounters = data.object_counters;
+      return this;
+    });
+  }
+}
+
+export default new OrganizationStatus();
+

client/app/services/policy/AbstractPolicy.js

@@ -0,0 +1,56 @@
+export default class AbstractPolicy {
+  // eslint-disable-next-line class-methods-use-this
+  _notImplemented() {
+    throw new Error('Not implemented');
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  get user() {
+    return null;
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  get organizationStatus() {
+    return null;
+  }
+
+  refresh() {
+    this._notImplemented();
+  }
+
+  canCreateDataSource() {
+    this._notImplemented();
+  }
+
+  isCreateDataSourceEnabled() {
+    this._notImplemented();
+  }
+
+  canCreateDashboard() {
+    this._notImplemented();
+  }
+
+  isCreateDashboardEnabled() {
+    this._notImplemented();
+  }
+
+  canCreateAlert() {
+    this._notImplemented();
+  }
+
+  canCreateUser() {
+    this._notImplemented();
+  }
+
+  isCreateUserEnabled() {
+    this._notImplemented();
+  }
+
+  getDashboardRefreshIntervals() {
+    this._notImplemented();
+  }
+
+  getQueryRefreshIntervals() {
+    this._notImplemented();
+  }
+}