diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html index 085e2eef920..ea8eb21d6d6 100644 --- a/public/app/core/components/navbar/navbar.html +++ b/public/app/core/components/navbar/navbar.html @@ -8,9 +8,9 @@ - - - + + +
diff --git a/public/app/core/directives/dash_edit_link.js b/public/app/core/directives/dash_edit_link.js index a4c1ad53b3c..21e8940200c 100644 --- a/public/app/core/directives/dash_edit_link.js +++ b/public/app/core/directives/dash_edit_link.js @@ -2,8 +2,9 @@ define([ 'jquery', 'angular', '../core_module', + 'lodash', ], -function ($, angular, coreModule) { +function ($, angular, coreModule, _) { 'use strict'; var editViewMap = { @@ -12,7 +13,8 @@ function ($, angular, coreModule) { 'templating': { src: 'public/app/features/templating/partials/editor.html'}, 'history': { html: ''}, 'timepicker': { src: 'public/app/features/dashboard/timepicker/dropdown.html' }, - 'import': { html: '' } + 'import': { html: '', isModal: true }, + 'permissions': { html: '', isModal: true } }; coreModule.default.directive('dashEditorView', function($compile, $location, $rootScope) { @@ -31,8 +33,7 @@ function ($, angular, coreModule) { function showEditorPane(evt, options) { if (options.editview) { - options.src = editViewMap[options.editview].src; - options.html = editViewMap[options.editview].html; + _.defaults(options, editViewMap[options.editview]); } if (lastEditView && lastEditView === options.editview) { @@ -61,19 +62,24 @@ function ($, angular, coreModule) { var urlParams = $location.search(); if (options.editview === urlParams.editview) { delete urlParams.editview; - $location.search(urlParams); + // hack for consistently updating url + setTimeout(function() { + $rootScope.$apply(function() { + $location.search(urlParams); + }); + }); } } }; - if (options.editview === 'import') { + if (options.isModal) { var modalScope = $rootScope.$new(); modalScope.$on("$destroy", function() { editorScope.dismiss(); }); $rootScope.appEvent('show-modal', { - templateHtml: '', + templateHtml: options.html, scope: modalScope, backdrop: 'static' }); diff --git a/public/app/core/nav_model_srv.ts b/public/app/core/nav_model_srv.ts index 058247b7fd8..cdd0ef04350 100644 --- a/public/app/core/nav_model_srv.ts +++ b/public/app/core/nav_model_srv.ts @@ -168,6 +168,12 @@ export class NavModelSrv { clickHandler: () => dashNavCtrl.openEditView('annotations') }); + menu.push({ + title: 'Permissions...', + icon: 'fa fa-fw fa-lock', + clickHandler: () => dashNavCtrl.openEditView('permissions') + }); + if (!dashboard.meta.isHome) { menu.push({ title: 'Version history', @@ -199,7 +205,7 @@ export class NavModelSrv { if (this.contextSrv.isEditor && !dashboard.meta.isFolder) { menu.push({ - title: 'Save As ...', + title: 'Save As...', icon: 'fa fa-fw fa-save', clickHandler: () => dashNavCtrl.saveDashboardAs() }); diff --git a/public/app/features/dashboard/acl/acl.html b/public/app/features/dashboard/acl/acl.html index d31b2ce6999..97018f4e2ad 100644 --- a/public/app/features/dashboard/acl/acl.html +++ b/public/app/features/dashboard/acl/acl.html @@ -1,74 +1,135 @@ -
-
Add New Permission
-
-
-
- Type - -
-
- User - -
-
- User Group - -
-
- Permission - -
-
- -
-
-
+
+
+

+ + Permissions +

-
-
-
-
Permissions
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NamePermission
{{permission.userLogin}} - - - -
{{permission.userGroup}} - - - -
{{role.name}} - -
-
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
Groups & Users
+
+ + + {{acl.userLogin}} + +
+ +
+ +
+
+ +
+
+
+
Built-in roles
+
+ + {{roleAcl.name}} + +
+ +
+
+
+
+ +
+ +
+ + Close +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/app/features/dashboard/acl/acl.ts b/public/app/features/dashboard/acl/acl.ts index 002eb31ed29..19ed66a4526 100644 --- a/public/app/features/dashboard/acl/acl.ts +++ b/public/app/features/dashboard/acl/acl.ts @@ -5,21 +5,20 @@ import appEvents from 'app/core/app_events'; import _ from 'lodash'; export class AclCtrl { - tabIndex: any; dashboard: any; - userPermissions: Permission[]; - userGroupPermissions: Permission[]; + userAcl: DashboardAcl[]; + groupAcl: DashboardAcl[]; permissionTypeOptions = [ {value: 1, text: 'View'}, - {value: 2, text: 'Read-only Edit'}, - {value: 4, text: 'Edit'} + {value: 2, text: 'Edit'}, + {value: 4, text: 'Admin'} ]; roleOptions = [ - {value: 0, text: 'None'}, + {value: 0, text: 'No Access'}, {value: 1, text: 'View'}, - {value: 2, text: 'Read-only Edit'}, - {value: 4, text: 'Edit'} + {value: 2, text: 'Edit'}, + {value: 4, text: 'Admin'} ]; roles = []; @@ -30,28 +29,27 @@ export class AclCtrl { userGroupId: number; /** @ngInject */ - constructor(private backendSrv, private $scope) { - this.tabIndex = 0; - this.userPermissions = []; - this.userGroupPermissions = []; + constructor(private backendSrv, private dashboardSrv) { + this.userAcl = []; + this.groupAcl = []; + this.dashboard = dashboardSrv.getCurrent(); this.get(this.dashboard.id); } get(dashboardId: number) { return this.backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`) .then(result => { - this.userPermissions = _.filter(result, p => { return p.userId > 0;}); - this.userGroupPermissions = _.filter(result, p => { return p.userGroupId > 0;}); + this.userAcl = _.filter(result, p => { return p.userId > 0;}); + this.groupAcl = _.filter(result, p => { return p.userGroupId > 0;}); this.roles = this.setRoles(result); }); } setRoles(result: any) { return [ - {name: 'Org Viewer', permissions: 1}, - {name: 'Org Read Only Editor', permissions: 2}, - {name: 'Org Editor', permissions: 4}, - {name: 'Org Admin', permissions: 4} + {name: 'Viewer', permissions: 1}, + {name: 'Editor', permissions: 2}, + {name: 'Admin', permissions: 4} ]; } @@ -76,21 +74,21 @@ export class AclCtrl { } } - addOrUpdateUserPermission(userId: number, permissionType: number) { + addOrUpdateUserPermission(userId: number, permissions: number) { return this.backendSrv.post(`/api/dashboards/id/${this.dashboard.id}/acl`, { userId: userId, - permissions: permissionType + permissions: permissions }); } - addOrUpdateUserGroupPermission(userGroupId: number, permissionType: number) { + addOrUpdateUserGroupPermission(userGroupId: number, permissions: number) { return this.backendSrv.post(`/api/dashboards/id/${this.dashboard.id}/acl`, { userGroupId: userGroupId, - permissions: permissionType + permissions: permissions }); } - updatePermission(permission: any) { + updatePermission(permission: DashboardAcl) { if (permission.userId > 0) { return this.addOrUpdateUserPermission(permission.userId, permission.permissions); } else { @@ -101,21 +99,23 @@ export class AclCtrl { } } - removePermission(permission: Permission) { + removePermission(permission: DashboardAcl) { return this.backendSrv.delete(`/api/dashboards/id/${permission.dashboardId}/acl/${permission.id}`).then(() => { return this.get(permission.dashboardId); }); } } -export function aclSettings() { +export function dashAclModal() { return { restrict: 'E', templateUrl: 'public/app/features/dashboard/acl/acl.html', controller: AclCtrl, bindToController: true, controllerAs: 'ctrl', - scope: { dashboard: "=" } + scope: { + dismiss: "&" + } }; } @@ -126,7 +126,7 @@ export interface FormModel { PermissionType: number; } -export interface Permission { +export interface DashboardAcl { id: number; orgId: number; dashboardId: number; @@ -137,8 +137,8 @@ export interface Permission { userEmail: string; userGroupId: number; userGroup: string; - permissions: string[]; - permissionType: number[]; + permissions: number; + permissionName: string; } -coreModule.directive('aclSettings', aclSettings); +coreModule.directive('dashAclModal', dashAclModal); diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html index bab27289aca..c88af17f8da 100644 --- a/public/app/features/dashboard/dashnav/dashnav.html +++ b/public/app/features/dashboard/dashnav/dashnav.html @@ -1,95 +1,64 @@ -
-
- - - - - - - + + + + +
-
+ +
  • + +
    • +
  • + +
    • + + + + + - diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts index 6bf5b6d563d..cc5f52d2298 100644 --- a/public/app/features/dashboard/dashnav/dashnav.ts +++ b/public/app/features/dashboard/dashnav/dashnav.ts @@ -143,17 +143,6 @@ export class DashNavCtrl { onFolderChange(parentId) { this.dashboard.parentId = parentId; } - - showSearch() { - this.$rootScope.appEvent('show-dash-search'); - } - - navItemClicked(navItem, evt) { - if (navItem.clickHandler) { - navItem.clickHandler(); - evt.preventDefault(); - } - } } export function dashNavDirective() { diff --git a/public/app/features/dashboard/import/dash_import.html b/public/app/features/dashboard/import/dash_import.html index 8a42d64c0c5..6e66d1c3961 100644 --- a/public/app/features/dashboard/import/dash_import.html +++ b/public/app/features/dashboard/import/dash_import.html @@ -1,4 +1,3 @@ -