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: move overlay out from each edit view (#81852)

Browse Source
This commit is contained in:
Torkel Ödegaard 2024-02-05 11:17:33 +01:00 committed by GitHub
parent ddf124de9d
commit 6e3048c6fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx
View File

@ -22,7 +22,12 @@ export function DashboardSceneRenderer({ model }: SceneComponentProps<DashboardS
const navModel = getNavModel(navIndex, 'dashboards/browse'); const navModel = getNavModel(navIndex, 'dashboards/browse');
if (editview) { if (editview) {
return <editview.Component model={editview} />; return (
<>
<editview.Component model={editview} />
{overlay && <overlay.Component model={overlay} />}
</>
);
} }
return ( return (

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

@ -124,7 +124,6 @@ interface EditLinkViewProps {
function EditLinkView({ pageNav, link, navModel, dashboard, onChange, onGoBack }: EditLinkViewProps) { function EditLinkView({ pageNav, link, navModel, dashboard, onChange, onGoBack }: EditLinkViewProps) {
const parentTab = pageNav.children!.find((p) => p.active)!; const parentTab = pageNav.children!.find((p) => p.active)!;
parentTab.parentItem = pageNav; parentTab.parentItem = pageNav;
const { overlay } = dashboard.useState();
const editLinkPageNav = { const editLinkPageNav = {
text: 'Edit link', text: 'Edit link',
@ -135,7 +134,6 @@ function EditLinkView({ pageNav, link, navModel, dashboard, onChange, onGoBack }
<Page navModel={navModel} pageNav={editLinkPageNav} layout={PageLayoutType.Standard}> <Page navModel={navModel} pageNav={editLinkPageNav} layout={PageLayoutType.Standard}>
<NavToolbarActions dashboard={dashboard} /> <NavToolbarActions dashboard={dashboard} />
<DashboardLinkForm link={link!} onUpdate={onChange} onGoBack={onGoBack} /> <DashboardLinkForm link={link!} onUpdate={onChange} onGoBack={onGoBack} />
{overlay && <overlay.Component model={overlay} />}
</Page> </Page>
); );
} }

3
public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx
View File

@ -148,7 +148,7 @@ export class GeneralSettingsEditView
static Component = ({ model }: SceneComponentProps<GeneralSettingsEditView>) => { static Component = ({ model }: SceneComponentProps<GeneralSettingsEditView>) => {
const { navModel, pageNav } = useDashboardEditPageNav(model.getDashboard(), model.getUrlKey()); const { navModel, pageNav } = useDashboardEditPageNav(model.getDashboard(), model.getUrlKey());
const { title, description, tags, meta, editable, overlay } = model.getDashboard().useState(); const { title, description, tags, meta, editable } = model.getDashboard().useState();
const { sync: graphTooltip } = model.getCursorSync()?.useState() || {}; const { sync: graphTooltip } = model.getCursorSync()?.useState() || {};
const { timeZone, weekStart, UNSAFE_nowDelay: nowDelay } = model.getTimeRange().useState(); const { timeZone, weekStart, UNSAFE_nowDelay: nowDelay } = model.getTimeRange().useState();
const { intervals } = model.getRefreshPicker()?.useState() || {}; const { intervals } = model.getRefreshPicker()?.useState() || {};
@ -260,7 +260,6 @@ export class GeneralSettingsEditView
<Box marginTop={3}>{meta.canDelete && <DeleteDashboardButton />}</Box> <Box marginTop={3}>{meta.canDelete && <DeleteDashboardButton />}</Box>
</div> </div>
{overlay && <overlay.Component model={overlay} />}
</Page> </Page>
); );
}; };