From 78b56dd528526b36f4ceb9dcb029fb62f052bab2 Mon Sep 17 00:00:00 2001
From: Peter Holmberg <peter.hlmbrg@gmail.com>
Date: Tue, 9 Oct 2018 14:50:46 +0200
Subject: [PATCH] reverted AddPermissions

---
 .../PermissionList/AddPermission.tsx          | 29 ++++++++-----------
 .../permissions/DashboardPermissions.tsx      | 15 ++--------
 .../features/folders/FolderPermissions.tsx    | 15 ++--------
 3 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/public/app/core/components/PermissionList/AddPermission.tsx b/public/app/core/components/PermissionList/AddPermission.tsx
index a754bec1a18..d4e5dbba98d 100644
--- a/public/app/core/components/PermissionList/AddPermission.tsx
+++ b/public/app/core/components/PermissionList/AddPermission.tsx
@@ -4,20 +4,17 @@ import { TeamPicker, Team } from 'app/core/components/Picker/TeamPicker';
 import DescriptionPicker, { OptionWithDescription } from 'app/core/components/Picker/DescriptionPicker';
 import { User } from 'app/types';
 import {
+  dashboardPermissionLevels,
+  dashboardAclTargets,
   AclTarget,
   PermissionLevel,
   NewDashboardAclItem,
   OrgRole,
-  DashboardPermissionInfo,
-  AclTargetInfo,
 } from 'app/types/acl';
 
 export interface Props {
   onAddPermission: (item: NewDashboardAclItem) => void;
   onCancel: () => void;
-  showPermissionLevels?: boolean;
-  dashboardPermissionLevels?: DashboardPermissionInfo[];
-  dashboardAclTargets: AclTargetInfo[];
 }
 
 class AddPermissions extends Component<Props, NewDashboardAclItem> {
@@ -85,7 +82,7 @@ class AddPermissions extends Component<Props, NewDashboardAclItem> {
   }
 
   render() {
-    const { onCancel, showPermissionLevels, dashboardPermissionLevels, dashboardAclTargets } = this.props;
+    const { onCancel } = this.props;
     const newItem = this.state;
     const pickerClassName = 'width-20';
     const isValid = this.isValid();
@@ -132,17 +129,15 @@ class AddPermissions extends Component<Props, NewDashboardAclItem> {
               </div>
             ) : null}
 
-            {showPermissionLevels && (
-              <div className="gf-form">
-                <DescriptionPicker
-                  optionsWithDesc={dashboardPermissionLevels}
-                  onSelected={this.onPermissionChanged}
-                  value={newItem.permission}
-                  disabled={false}
-                  className={'gf-form-input--form-dropdown-right'}
-                />
-              </div>
-            )}
+            <div className="gf-form">
+              <DescriptionPicker
+                optionsWithDesc={dashboardPermissionLevels}
+                onSelected={this.onPermissionChanged}
+                value={newItem.permission}
+                disabled={false}
+                className={'gf-form-input--form-dropdown-right'}
+              />
+            </div>
 
             <div className="gf-form">
               <button data-save-permission className="btn btn-success" type="submit" disabled={!isValid}>
diff --git a/public/app/features/dashboard/permissions/DashboardPermissions.tsx b/public/app/features/dashboard/permissions/DashboardPermissions.tsx
index 01ea106fe79..5651242a485 100644
--- a/public/app/features/dashboard/permissions/DashboardPermissions.tsx
+++ b/public/app/features/dashboard/permissions/DashboardPermissions.tsx
@@ -3,13 +3,7 @@ import { connect } from 'react-redux';
 import Tooltip from 'app/core/components/Tooltip/Tooltip';
 import SlideDown from 'app/core/components/Animations/SlideDown';
 import { StoreState, FolderInfo } from 'app/types';
-import {
-  dashboardAclTargets,
-  dashboardPermissionLevels,
-  DashboardAcl,
-  PermissionLevel,
-  NewDashboardAclItem,
-} from 'app/types/acl';
+import { DashboardAcl, PermissionLevel, NewDashboardAclItem } from 'app/types/acl';
 import {
   getDashboardPermissions,
   addDashboardPermission,
@@ -87,12 +81,7 @@ export class DashboardPermissions extends PureComponent<Props, State> {
           </div>
         </div>
         <SlideDown in={isAdding}>
-          <AddPermission
-            dashboardAclTargets={dashboardAclTargets}
-            dashboardPermissionLevels={dashboardPermissionLevels}
-            onAddPermission={this.onAddPermission}
-            onCancel={this.onCancelAddPermission}
-          />
+          <AddPermission onAddPermission={this.onAddPermission} onCancel={this.onCancelAddPermission} />
         </SlideDown>
         <PermissionList
           items={permissions}
diff --git a/public/app/features/folders/FolderPermissions.tsx b/public/app/features/folders/FolderPermissions.tsx
index 9237e0bbee7..176e270038b 100644
--- a/public/app/features/folders/FolderPermissions.tsx
+++ b/public/app/features/folders/FolderPermissions.tsx
@@ -6,13 +6,7 @@ import Tooltip from 'app/core/components/Tooltip/Tooltip';
 import SlideDown from 'app/core/components/Animations/SlideDown';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { NavModel, StoreState, FolderState } from 'app/types';
-import {
-  dashboardAclTargets,
-  dashboardPermissionLevels,
-  DashboardAcl,
-  PermissionLevel,
-  NewDashboardAclItem,
-} from 'app/types/acl';
+import { DashboardAcl, PermissionLevel, NewDashboardAclItem } from 'app/types/acl';
 import {
   getFolderByUid,
   getFolderPermissions,
@@ -99,12 +93,7 @@ export class FolderPermissions extends PureComponent<Props, State> {
             </button>
           </div>
           <SlideDown in={isAdding}>
-            <AddPermission
-              dashboardAclTargets={dashboardAclTargets}
-              dashboardPermissionLevels={dashboardPermissionLevels}
-              onAddPermission={this.onAddPermission}
-              onCancel={this.onCancelAddPermission}
-            />
+            <AddPermission onAddPermission={this.onAddPermission} onCancel={this.onCancelAddPermission} />
           </SlideDown>
           <PermissionList
             items={folder.permissions}