IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-08 23:23:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Nested folders: Only show edit title button if user has permissions (#71426)

Browse Source 
only show edit title button if user has permissions
This commit is contained in:
Ashley Harrison 2023-07-12 11:07:16 +01:00 committed by GitHub
parent f4f2d40e0d
commit 580345306b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
View File

@ -185,6 +185,12 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
expect(screen.queryByRole('button', { name: 'Folder actions' })).not.toBeInTheDocument();
});
it('does not show an "Edit title" button', async () => {
render(<BrowseDashboardsPage {...props} />);
expect(await screen.findByRole('heading', { name: 'Dashboards' })).toBeInTheDocument();
expect(screen.queryByRole('button', { name: 'Edit title' })).not.toBeInTheDocument();
});
it('does not show any tabs', async () => {
render(<BrowseDashboardsPage {...props} />);
expect(await screen.findByRole('heading', { name: 'Dashboards' })).toBeInTheDocument();
@ -289,6 +295,24 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
expect(screen.queryByRole('button', { name: 'Folder actions' })).not.toBeInTheDocument();
});
it('shows an "Edit title" button', async () => {
render(<BrowseDashboardsPage {...props} />);
expect(await screen.findByRole('button', { name: 'Edit title' })).toBeInTheDocument();
});
it('does not show the "Edit title" button if the user does not have permissions', async () => {
jest.spyOn(permissions, 'getFolderPermissions').mockImplementation(() => {
return {
canEditInFolder: false,
canCreateDashboards: false,
canCreateFolder: false,
};
});
render(<BrowseDashboardsPage {...props} />);
expect(await screen.findByRole('heading', { name: folderA.item.title })).toBeInTheDocument();
expect(screen.queryByRole('button', { name: 'Edit title' })).not.toBeInTheDocument();
});
it('displays all the folder tabs and shows the "Dashboards" tab as selected', async () => {
render(<BrowseDashboardsPage {...props} />);
expect(await screen.findByRole('tab', { name: 'Tab Dashboards' })).toBeInTheDocument();

25
public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
View File

@ -80,25 +80,24 @@ const BrowseDashboardsPage = memo(({ match }: Props) => {
const { canEditInFolder, canCreateDashboards, canCreateFolder } = getFolderPermissions(folderDTO);
const onEditTitle = folderUID
? async (newValue: string) => {
if (folderDTO) {
const result = await saveFolder({
...folderDTO,
title: newValue,
});
if ('error' in result) {
throw result.error;
}
}
const showEditTitle = canEditInFolder && folderUID;
const onEditTitle = async (newValue: string) => {
if (folderDTO) {
const result = await saveFolder({
...folderDTO,
title: newValue,
});
if ('error' in result) {
throw result.error;
}
: undefined;
}
};
return (
<Page
navId="dashboards/browse"
pageNav={navModel}
onEditTitle={onEditTitle}
onEditTitle={showEditTitle ? onEditTitle : undefined}
actions={
<>
{folderDTO && <FolderActionsButton folder={folderDTO} />}