From 11446511c14cd20ef24ac9b8f3476fd16e72e7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 2 May 2023 16:24:59 +0200 Subject: [PATCH] Scenes: Minor fix to monitoring app (#67635) --- .../scenes/apps/GrafanaMonitoringApp.tsx | 46 +------------------ public/app/features/scenes/apps/scenes.ts | 15 +----- 2 files changed, 2 insertions(+), 59 deletions(-) diff --git a/public/app/features/scenes/apps/GrafanaMonitoringApp.tsx b/public/app/features/scenes/apps/GrafanaMonitoringApp.tsx index 5a68485a863..b1aa3b7471f 100644 --- a/public/app/features/scenes/apps/GrafanaMonitoringApp.tsx +++ b/public/app/features/scenes/apps/GrafanaMonitoringApp.tsx @@ -1,16 +1,7 @@ // Libraries import React, { useMemo, useState } from 'react'; -import { - SceneCanvasText, - SceneFlexLayout, - SceneApp, - SceneAppPage, - SceneRouteMatch, - EmbeddedScene, - SceneAppPageLike, - SceneFlexItem, -} from '@grafana/scenes'; +import { SceneApp, SceneAppPage, SceneRouteMatch, SceneAppPageLike } from '@grafana/scenes'; import { usePageNav } from 'app/core/components/Page/usePageNav'; import { PluginPageContext, PluginPageContextType } from 'app/features/plugins/components/PluginPageContext'; @@ -104,44 +95,9 @@ export function getHandlerDrilldownPage( routePath: '/scenes/grafana-monitoring/handlers/:handler/logs', getScene: () => getHandlerLogsScene(handler), preserveUrlKeys: ['from', 'to', 'var-instance'], - drilldowns: [ - { - routePath: '/scenes/grafana-monitoring/handlers/:handler/logs/:secondLevel', - getPage: getSecondLevelDrilldown, - }, - ], }), ], }); } -export function getSecondLevelDrilldown( - match: SceneRouteMatch<{ handler: string; secondLevel: string }>, - parent: SceneAppPageLike -) { - const handler = decodeURIComponent(match.params.handler); - const secondLevel = decodeURIComponent(match.params.secondLevel); - const baseUrl = `/scenes/grafana-monitoring/handlers/${encodeURIComponent(handler)}/logs/${secondLevel}`; - - return new SceneAppPage({ - title: secondLevel, - subTitle: 'Second level dynamic drilldown', - url: baseUrl, - getParentPage: () => parent, - getScene: () => { - return new EmbeddedScene({ - body: new SceneFlexLayout({ - children: [ - new SceneFlexItem({ - body: new SceneCanvasText({ - text: 'Drilldown: ' + secondLevel, - }), - }), - ], - }), - }); - }, - }); -} - export default GrafanaMonitoringApp; diff --git a/public/app/features/scenes/apps/scenes.ts b/public/app/features/scenes/apps/scenes.ts index 95316b54c7f..1f3fbe47808 100644 --- a/public/app/features/scenes/apps/scenes.ts +++ b/public/app/features/scenes/apps/scenes.ts @@ -164,7 +164,7 @@ export function getHttpHandlerListScene(): EmbeddedScene { // }, title: getFrameDisplayName(frame), options: { - legend: { displayMode: 'hidden' }, + legend: { showLegend: false }, }, }), }), @@ -481,19 +481,6 @@ export function getHandlerLogsScene(handler: string): EmbeddedScene { body: new SceneFlexLayout({ direction: 'column', children: [ - new SceneFlexItem({ - body: new VizPanel({ - pluginId: 'text', - title: '', - options: { - mode: 'markdown', - content: ` - [mupp](/scenes/grafana-monitoring/handlers/${encodeURIComponent(handler)}/logs/mupp) - [mapp](/scenes/grafana-monitoring/handlers/${encodeURIComponent(handler)}/logs/mapp) - `, - }, - }), - }), new SceneFlexItem({ body: new VizPanel({ $data: logsQuery,