diff --git a/e2e/various-suite/graph-auto-migrate.spec.ts b/e2e/various-suite/graph-auto-migrate.spec.ts index 319ba5bec25..8f21a338501 100644 --- a/e2e/various-suite/graph-auto-migrate.spec.ts +++ b/e2e/various-suite/graph-auto-migrate.spec.ts @@ -35,7 +35,7 @@ e2e.scenario({ e2e.pages.Dashboard.Annotations.marker().should('exist'); }); - e2e.pages.Dashboard.wrapper().children().children('.scrollbar-view').scrollTo('bottom'); + cy.get('body').children().find('.scrollbar-view').first().scrollTo('bottom'); e2e.components.Panels.Panel.title('05:00') .should('exist') diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts index d1c611cc547..95cd03e5b25 100644 --- a/packages/grafana-e2e-selectors/src/selectors/pages.ts +++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts @@ -49,7 +49,6 @@ export const Pages = { }, Dashboard: { url: (uid: string) => `/d/${uid}`, - wrapper: 'data-testid dashboard-page-wrapper', DashNav: { /** * @deprecated use navV2 from Grafana 8.3 instead diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx index fd4c79749d8..df666b44ed9 100644 --- a/public/app/core/components/Page/Page.tsx +++ b/public/app/core/components/Page/Page.tsx @@ -3,7 +3,6 @@ import { css, cx } from '@emotion/css'; import React, { useLayoutEffect } from 'react'; import { GrafanaTheme2, PageLayoutType } from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; import { CustomScrollbar, useStyles2 } from '@grafana/ui'; import { useGrafana } from 'app/core/context/GrafanaContext'; @@ -51,7 +50,7 @@ export const Page: PageType = ({ }, [navModel, pageNav, chrome, layout]); return ( -
+
{layout === PageLayoutType.Standard && (