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

ExploreMetrics: unexpected rolling behavior (#98360)

Browse Source
This commit is contained in:
jackyin 2024-12-25 14:29:07 +08:00 committed by GitHub
parent 287f3a75eb
commit 967c13f5b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/trails/DataTrail.tsx
View File

@ -622,10 +622,10 @@ export class DataTrail extends SceneObjectBase<DataTrailState> implements SceneO
} }
static Component = ({ model }: SceneComponentProps<DataTrail>) => { static Component = ({ model }: SceneComponentProps<DataTrail>) => {
const { controls, topScene, history, settings, useOtelExperience, hasOtelResources } = model.useState(); const { controls, topScene, history, settings, useOtelExperience, hasOtelResources, embedded } = model.useState();
const chromeHeaderHeight = useChromeHeaderHeight(); const chromeHeaderHeight = useChromeHeaderHeight();
const styles = useStyles2(getStyles, chromeHeaderHeight ?? 0); const styles = useStyles2(getStyles, embedded ? 0 : (chromeHeaderHeight ?? 0));
const showHeaderForFirstTimeUsers = getTrailStore().recent.length < 2; const showHeaderForFirstTimeUsers = getTrailStore().recent.length < 2;
useEffect(() => { useEffect(() => {

5
public/app/features/trails/MetricGraphScene.tsx
View File

@ -15,7 +15,7 @@ import { useStyles2 } from '@grafana/ui';
import { MetricActionBar } from './MetricScene'; import { MetricActionBar } from './MetricScene';
import { AutoVizPanel } from './autoQuery/components/AutoVizPanel'; import { AutoVizPanel } from './autoQuery/components/AutoVizPanel';
import { getTrailSettings } from './utils'; import { getTrailFor, getTrailSettings } from './utils';
export const MAIN_PANEL_MIN_HEIGHT = 280; export const MAIN_PANEL_MIN_HEIGHT = 280;
export const MAIN_PANEL_MAX_HEIGHT = '40%'; export const MAIN_PANEL_MAX_HEIGHT = '40%';
@ -37,7 +37,8 @@ export class MetricGraphScene extends SceneObjectBase<MetricGraphSceneState> {
const { topView, selectedTab } = model.useState(); const { topView, selectedTab } = model.useState();
const { stickyMainGraph } = getTrailSettings(model).useState(); const { stickyMainGraph } = getTrailSettings(model).useState();
const chromeHeaderHeight = useChromeHeaderHeight(); const chromeHeaderHeight = useChromeHeaderHeight();
const styles = useStyles2(getStyles, chromeHeaderHeight ?? 0); const trail = getTrailFor(model);
const styles = useStyles2(getStyles, trail.state.embedded ? 0 : (chromeHeaderHeight ?? 0));
return ( return (
<div className={styles.container}> <div className={styles.container}>