From 1703f9f15608eb05fdc5d77cf63155620c1a8b51 Mon Sep 17 00:00:00 2001 From: Joey Orlando Date: Mon, 11 Dec 2023 14:51:02 -0500 Subject: [PATCH] Revert "Unified logo with IRM, added few minor UI tweaks, bumped labels version" (#3549) Reverts grafana/oncall#3531 --- .../e2e-tests/integrations/heartbeat.test.ts | 3 --- grafana-plugin/e2e-tests/utils/schedule.ts | 7 +++++++ grafana-plugin/package.json | 2 +- grafana-plugin/src/PluginPage.tsx | 8 +------- grafana-plugin/src/navbar/Header/Header.module.scss | 12 +----------- grafana-plugin/src/navbar/Header/Header.tsx | 5 ++--- .../src/pages/integrations/Integrations.module.scss | 4 ---- grafana-plugin/yarn.lock | 8 ++++---- 8 files changed, 16 insertions(+), 33 deletions(-) diff --git a/grafana-plugin/e2e-tests/integrations/heartbeat.test.ts b/grafana-plugin/e2e-tests/integrations/heartbeat.test.ts index 2ba7e16e..374ca6ae 100644 --- a/grafana-plugin/e2e-tests/integrations/heartbeat.test.ts +++ b/grafana-plugin/e2e-tests/integrations/heartbeat.test.ts @@ -7,7 +7,6 @@ const HEARTBEAT_SETTINGS_FORM_TEST_ID = 'heartbeat-settings-form'; test.describe("updating an integration's heartbeat interval works", async () => { const _openHeartbeatSettingsForm = async (page: Page) => { await page.getByTestId('integration-settings-context-menu-wrapper').getByRole('img').click(); - await page.waitForTimeout(1000); await page.getByTestId('integration-heartbeat-settings').click(); }; @@ -30,8 +29,6 @@ test.describe("updating an integration's heartbeat interval works", async () => await heartbeatSettingsForm.getByTestId('update-heartbeat').click(); - await page.waitForTimeout(1000); - await _openHeartbeatSettingsForm(page); const heartbeatIntervalValue = await heartbeatSettingsForm diff --git a/grafana-plugin/e2e-tests/utils/schedule.ts b/grafana-plugin/e2e-tests/utils/schedule.ts index 9c5257f6..3627109a 100644 --- a/grafana-plugin/e2e-tests/utils/schedule.ts +++ b/grafana-plugin/e2e-tests/utils/schedule.ts @@ -20,6 +20,13 @@ export const createOnCallSchedule = async (page: Page, scheduleName: string, use await clickButton({ page, buttonText: 'Add rotation' }); + /** + * Drag the modal such that the "Create" button will always be visible within the viewport. We cannot scroll + * on the modal itself + * https://playwright.dev/docs/input#dragging-manually + */ + await page.locator('.ReactModal__Content .drag-handler').dragTo(page.locator('.page-header__logo')); + await selectDropdownValue({ page, selectType: 'grafanaSelect', diff --git a/grafana-plugin/package.json b/grafana-plugin/package.json index 33214b17..60ac20c9 100644 --- a/grafana-plugin/package.json +++ b/grafana-plugin/package.json @@ -122,7 +122,7 @@ "@grafana/data": "^9.2.4", "@grafana/faro-web-sdk": "^1.0.0-beta4", "@grafana/faro-web-tracing": "^1.0.0-beta4", - "@grafana/labels": "~1.4.3", + "@grafana/labels": "~1.4.2", "@grafana/runtime": "9.3.0-beta1", "@grafana/ui": "^10.2.0", "@lifeomic/attempt": "^3.0.3", diff --git a/grafana-plugin/src/PluginPage.tsx b/grafana-plugin/src/PluginPage.tsx index 5b81bdc2..4497af92 100644 --- a/grafana-plugin/src/PluginPage.tsx +++ b/grafana-plugin/src/PluginPage.tsx @@ -3,10 +3,8 @@ import React from 'react'; import { PluginPageProps, PluginPage as RealPluginPage } from '@grafana/runtime'; import Header from 'navbar/Header/Header'; -import RenderConditionally from 'components/RenderConditionally/RenderConditionally'; import { pages } from 'pages'; import { isTopNavbar } from 'plugin/GrafanaPluginRootPage.helpers'; -import { DEFAULT_PAGE } from 'utils/consts'; interface AppPluginPageProps extends PluginPageProps { page?: string; @@ -16,14 +14,10 @@ export const PluginPage = (isTopNavbar() ? RealPlugin : PluginPageFallback) as R function RealPlugin(props: AppPluginPageProps): React.ReactNode { const { page } = props; - const isDefaultPage = page === DEFAULT_PAGE; return ( - -
- - +
{pages[page]?.text && !pages[page]?.hideTitle && (

{pages[page].text} diff --git a/grafana-plugin/src/navbar/Header/Header.module.scss b/grafana-plugin/src/navbar/Header/Header.module.scss index bd85bd65..78318cca 100644 --- a/grafana-plugin/src/navbar/Header/Header.module.scss +++ b/grafana-plugin/src/navbar/Header/Header.module.scss @@ -4,7 +4,7 @@ .header-topnavbar { padding-top: 0; - padding-bottom: 12px; + padding-bottom: 36px; } .navbar-heading { @@ -34,7 +34,6 @@ flex-direction: row; column-gap: 8px; row-gap: 8px; - margin-left: -50px; } .irm-icon { @@ -53,12 +52,3 @@ margin-bottom: 0; } } - -.logo-container, -.page-header__img { - height: 32px; -} - -.page-header__title { - margin-bottom: 8px; -} diff --git a/grafana-plugin/src/navbar/Header/Header.tsx b/grafana-plugin/src/navbar/Header/Header.tsx index c7878ae5..00cae379 100644 --- a/grafana-plugin/src/navbar/Header/Header.tsx +++ b/grafana-plugin/src/navbar/Header/Header.tsx @@ -23,8 +23,8 @@ const Header = observer(() => {
- - Grafana OnCall + + Grafana OnCall
{renderHeading()}
@@ -41,7 +41,6 @@ const Header = observer(() => {

Grafana OnCall

{APP_SUBTITLE}
-