IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

DashboardScene: Fix access to dashboard settings views (#85289)

Browse Source 
* DashboardScene: Fix access to dashboard settings views

* Review
This commit is contained in:
Dominik Prokop 2024-03-28 16:40:39 +01:00 committed by GitHub
parent 233f119037
commit 63a941472e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
View File

@ -432,7 +432,7 @@ export function ToolbarActions({ dashboard }: Props) {
}
// If we only can save as copy
if (canSaveAs && !meta.canSave) {
if (canSaveAs && !meta.canSave && !meta.canMakeEditable) {
return (
<Button
onClick={() => {

94
public/app/features/dashboard-scene/settings/utils.ts
View File

@ -2,9 +2,10 @@ import { useLocation } from 'react-router-dom';
import { locationUtil, NavModelItem } from '@grafana/data';
import { SceneObject, SceneObjectState } from '@grafana/scenes';
import { contextSrv } from 'app/core/core';
import { t } from 'app/core/internationalization';
import { getNavModel } from 'app/core/selectors/navModel';
import { useSelector } from 'app/types';
import { AccessControlAction, useSelector } from 'app/types';
import { DashboardScene } from '../scene/DashboardScene';
@ -36,45 +37,64 @@ export function useDashboardEditPageNav(dashboard: DashboardScene, currentEditVi
const pageNav: NavModelItem = {
text: 'Settings',
url: locationUtil.getUrlForPartial(location, { editview: 'settings', editIndex: null }),
children: [
{
text: t('dashboard-settings.general.title', 'General'),
url: locationUtil.getUrlForPartial(location, { editview: 'settings', editIndex: null }),
active: currentEditView === 'settings',
},
{
text: t('dashboard-settings.annotations.title', 'Annotations'),
url: locationUtil.getUrlForPartial(location, { editview: 'annotations', editIndex: null }),
active: currentEditView === 'annotations',
},
{
text: t('dashboard-settings.variables.title', 'Variables'),
url: locationUtil.getUrlForPartial(location, { editview: 'variables', editIndex: null }),
active: currentEditView === 'variables',
},
{
text: t('dashboard-settings.links.title', 'Links'),
url: locationUtil.getUrlForPartial(location, { editview: 'links', editIndex: null }),
active: currentEditView === 'links',
},
{
text: t('dashboard-settings.versions.title', 'Versions'),
url: locationUtil.getUrlForPartial(location, { editview: 'versions', editIndex: null }),
active: currentEditView === 'versions',
},
{
children: [],
parentItem: dashboardPageNav,
};
if (dashboard.state.meta.canEdit) {
pageNav.children!.push({
text: t('dashboard-settings.general.title', 'General'),
url: locationUtil.getUrlForPartial(location, { editview: 'settings', editIndex: null }),
active: currentEditView === 'settings',
});
pageNav.children!.push({
text: t('dashboard-settings.annotations.title', 'Annotations'),
url: locationUtil.getUrlForPartial(location, { editview: 'annotations', editIndex: null }),
active: currentEditView === 'annotations',
});
pageNav.children!.push({
text: t('dashboard-settings.variables.title', 'Variables'),
url: locationUtil.getUrlForPartial(location, { editview: 'variables', editIndex: null }),
active: currentEditView === 'variables',
});
pageNav.children!.push({
text: t('dashboard-settings.links.title', 'Links'),
url: locationUtil.getUrlForPartial(location, { editview: 'links', editIndex: null }),
active: currentEditView === 'links',
});
}
if (dashboard.state.meta.canMakeEditable) {
pageNav.children!.push({
text: t('dashboard-settings.general.title', 'General'),
url: locationUtil.getUrlForPartial(location, { editview: 'settings', editIndex: null }),
active: currentEditView === 'settings',
});
}
if (dashboard.state.id && dashboard.state.meta.canSave) {
pageNav.children!.push({
text: t('dashboard-settings.versions.title', 'Versions'),
url: locationUtil.getUrlForPartial(location, { editview: 'versions', editIndex: null }),
active: currentEditView === 'versions',
});
}
if (dashboard.state.id && dashboard.state.meta.canAdmin) {
if (contextSrv.hasPermission(AccessControlAction.DashboardsPermissionsRead)) {
pageNav.children!.push({
text: t('dashboard-settings.permissions.title', 'Permissions'),
url: locationUtil.getUrlForPartial(location, { editview: 'permissions', editIndex: null }),
active: currentEditView === 'permissions',
},
{
text: t('dashboard-settings.json-editor.title', 'JSON Model'),
url: locationUtil.getUrlForPartial(location, { editview: 'json-model', editIndex: null }),
active: currentEditView === 'json-model',
},
],
parentItem: dashboardPageNav,
};
});
}
}
pageNav.children!.push({
text: t('dashboard-settings.json-editor.title', 'JSON Model'),
url: locationUtil.getUrlForPartial(location, { editview: 'json-model', editIndex: null }),
active: currentEditView === 'json-model',
});
return { navModel, pageNav };
}