IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-24 09:50:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Dashboards: Fix 'Make Editable' button not working in Dashboard Settings (#60306)

Browse Source 
* Dashboards: Fix 'Make Editable' button not working in Dashboard Settings

* comment
This commit is contained in:
Josh Hunt 2022-12-14 14:24:09 +00:00 committed by GitHub
parent ac93c5321b
commit 258696409d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
View File

@ -1,5 +1,5 @@
import * as H from 'history';
import React, { useMemo } from 'react';
import React, { useEffect, useMemo, useState } from 'react';
import { useLocation } from 'react-router-dom';
import { locationUtil, NavModel, NavModelItem } from '@grafana/data';
@ -10,6 +10,7 @@ import { Page } from 'app/core/components/PageNew/Page';
import config from 'app/core/config';
import { contextSrv } from 'app/core/services/context_srv';
import { AccessControlAction } from 'app/types';
import { DashboardMetaChangedEvent } from 'app/types/events';
import { VariableEditorContainer } from '../../../variables/editor/VariableEditorContainer';
import { DashboardModel } from '../../state/DashboardModel';
@ -34,7 +35,14 @@ export interface Props {
const onClose = () => locationService.partial({ editview: null, editIndex: null });
export function DashboardSettings({ dashboard, editview, pageNav, sectionNav }: Props) {
const pages = useMemo(() => getSettingsPages(dashboard), [dashboard]);
const [updateId, setUpdateId] = useState(0);
useEffect(() => {
dashboard.events.subscribe(DashboardMetaChangedEvent, () => setUpdateId((v) => v + 1));
}, [dashboard]);
// updateId in deps so we can revaluate when dashboard is mutated
// eslint-disable-next-line react-hooks/exhaustive-deps
const pages = useMemo(() => getSettingsPages(dashboard), [dashboard, updateId]);
const onPostSave = () => {
dashboard.meta.hasUnsavedFolderChange = false;
@ -206,18 +214,10 @@ function getSectionNav(
}
function MakeEditable({ dashboard, sectionNav }: SettingsPageProps) {
const onMakeEditable = () => {
dashboard.editable = true;
dashboard.meta.canMakeEditable = false;
dashboard.meta.canEdit = true;
dashboard.meta.canSave = true;
// TODO add some kind of reload
};
return (
<Page navModel={sectionNav}>
<div className="dashboard-settings__header">Dashboard not editable</div>
<Button type="submit" onClick={onMakeEditable}>
<Button type="submit" onClick={() => dashboard.makeEditable()}>
Make editable
</Button>
</Page>

9
public/app/features/dashboard/state/DashboardModel.ts
View File

@ -499,6 +499,15 @@ export class DashboardModel implements TimeModel {
this.events.publish(new DashboardMetaChangedEvent());
}
makeEditable() {
this.editable = true;
this.updateMeta({
canMakeEditable: false,
canEdit: true,
canSave: true,
});
}
sortPanelsByGridPos() {
this.panels.sort((panelA, panelB) => {
if (panelA.gridPos.y === panelB.gridPos.y) {