From 6210b05c1dd84e54d000bc84105f7118768e58e7 Mon Sep 17 00:00:00 2001 From: Brandon Farmer Date: Wed, 2 May 2018 12:35:53 -0700 Subject: [PATCH] Use isUserAuthorized helper --- ui/src/dashboards/components/TemplateControlBar.tsx | 4 ++-- ui/src/dashboards/components/TemplateControlDropdown.tsx | 4 ++-- ui/test/dashboards/components/TemplateControlBar.test.tsx | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/src/dashboards/components/TemplateControlBar.tsx b/ui/src/dashboards/components/TemplateControlBar.tsx index 319543b4e8..1b40f86482 100644 --- a/ui/src/dashboards/components/TemplateControlBar.tsx +++ b/ui/src/dashboards/components/TemplateControlBar.tsx @@ -8,12 +8,12 @@ import TemplateControlDropdown from 'src/dashboards/components/TemplateControlDr import {Template} from 'src/types/dashboard' interface Props { + meRole: string + isUsingAuth: boolean templates: Template[] isOpen: boolean onOpenTemplateManager: () => void onSelectTemplate: (id: string) => void - meRole: string - isUsingAuth: boolean } const TemplateControlBar: SFC = ({ diff --git a/ui/src/dashboards/components/TemplateControlDropdown.tsx b/ui/src/dashboards/components/TemplateControlDropdown.tsx index 863031e7e9..f7011bd0f1 100644 --- a/ui/src/dashboards/components/TemplateControlDropdown.tsx +++ b/ui/src/dashboards/components/TemplateControlDropdown.tsx @@ -2,9 +2,9 @@ import React, {SFC} from 'react' import Dropdown from 'src/shared/components/Dropdown' import {calculateDropdownWidth} from 'src/dashboards/constants/templateControlBar' +import {isUserAuthorized, EDITOR_ROLE} from 'src/auth/Authorized' import {Template} from 'src/types/dashboard' -export const VIEWER_ROLE = 'viewer' interface Props { template: Template meRole: string @@ -42,7 +42,7 @@ const TemplateControlDropdown: SFC = ({ menuClass="dropdown-astronaut" useAutoComplete={true} selected={selectedItem.text} - disabled={isUsingAuth && (!meRole || meRole === VIEWER_ROLE)} + disabled={!isUsingAuth || !isUserAuthorized(meRole, EDITOR_ROLE)} onChoose={onSelectTemplate(template.id)} /> diff --git a/ui/test/dashboards/components/TemplateControlBar.test.tsx b/ui/test/dashboards/components/TemplateControlBar.test.tsx index 65a52dc286..0c14188849 100644 --- a/ui/test/dashboards/components/TemplateControlBar.test.tsx +++ b/ui/test/dashboards/components/TemplateControlBar.test.tsx @@ -13,6 +13,8 @@ const defaultProps = { values: [{value: 'firstValue'}, {value: 'secondValue'}], }, ], + meRole: 'EDITOR', + isUsingAuth: true, onOpenTemplateManager: () => {}, onSelectTemplate: () => {}, }