@grafana/plugin-e2e 1.9.0-canary.1140.8d70b63.0 → 1.9.0

package/dist/e2e-selectors/types.d.ts

@@ -106,6 +106,12 @@ export type Components = {
     Alert: {
         alertV2: (severity: string) => string;
     };
+    NavToolbar: {
+        editDashboard: {
+            backToDashboardButton: string;
+            editButton: string;
+        };
+    };
     PageToolbar: {
         item: (tooltip: string) => string;
         showMoreItems: string;

package/dist/e2e-selectors/versioned/components.d.ts

@@ -187,6 +187,16 @@ export declare const versionedComponents: {
             "8.0.0": (severity: string) => string;
         };
     };
+    NavToolbar: {
+        editDashboard: {
+            editButton: {
+                '11.1.0': string;
+            };
+            backToDashboardButton: {
+                '11.1.0': string;
+            };
+        };
+    };
     PageToolbar: {
         item: {
             "8.0.0": (tooltip: string) => string;

package/dist/e2e-selectors/versioned/components.js

@@ -168,6 +168,16 @@ exports.versionedComponents = {
             [constants_1.MIN_GRAFANA_VERSION]: (severity) => `Alert ${severity}`,
         },
     },
+    NavToolbar: {
+        editDashboard: {
+            editButton: {
+                '11.1.0': 'data-testid Edit dashboard button',
+            },
+            backToDashboardButton: {
+                '11.1.0': 'data-testid Back to dashboard button',
+            },
+        },
+    },
     PageToolbar: {
         item: {
             [constants_1.MIN_GRAFANA_VERSION]: (tooltip) => `${tooltip}`,

package/dist/e2e-selectors/versioned/pages.d.ts

@@ -37,6 +37,7 @@ export declare const versionedPages: {
             '9.5.0': (title: string) => string;
         };
         addNewPanel: {
+            '11.1.0': string;
             "8.0.0": string;
         };
         itemButtonAddViz: {
@@ -59,11 +60,13 @@ export declare const versionedPages: {
                 List: {
                     url: {
                         "8.0.0": string;
+                        '11.3.0': string;
                     };
                 };
                 Edit: {
                     url: {
-                        "8.0.0": (annotationIndex: string) => string;
+                        "8.0.0": (variableIndex: string) => string;
+                        '11.3.0': (variableIndex: string) => string;
                     };
                 };
             };
@@ -100,6 +103,7 @@ export declare const versionedPages: {
                 List: {
                     url: {
                         "8.0.0": (dashboardUid: string) => string;
+                        '11.3.0': (dashboardUid: string) => string;
                     };
                     newButton: {
                         "8.0.0": string;
@@ -117,6 +121,7 @@ export declare const versionedPages: {
                 Edit: {
                     url: {
                         "8.0.0": (dashboardUid: string, editIndex: string) => string;
+                        '11.3.0': (dashboardUid: string, editIndex: string) => string;
                     };
                     General: {
                         generalTypeSelectV2: {

package/dist/e2e-selectors/versioned/pages.js

@@ -42,6 +42,7 @@ exports.versionedPages = {
             '9.5.0': (title) => `data-testid ${title}`,
         },
         addNewPanel: {
+            '11.1.0': 'data-testid Add new panel',
             [constants_1.MIN_GRAFANA_VERSION]: 'Add new panel',
         },
         itemButtonAddViz: {
@@ -64,11 +65,13 @@ exports.versionedPages = {
                 List: {
                     url: {
                         [constants_1.MIN_GRAFANA_VERSION]: '/dashboard/new?orgId=1&editview=templating',
+                        '11.3.0': '/dashboard/new?orgId=1&editview=variables',
                     },
                 },
                 Edit: {
                     url: {
-                        [constants_1.MIN_GRAFANA_VERSION]: (annotationIndex) => `/dashboard/new?orgId=1&editview=templating&editIndex=${annotationIndex}`,
+                        [constants_1.MIN_GRAFANA_VERSION]: (variableIndex) => `/dashboard/new?orgId=1&editview=templating&editIndex=${variableIndex}`,
+                        '11.3.0': (variableIndex) => `/dashboard/new?orgId=1&editview=variables&editIndex=${variableIndex}`,
                     },
                 },
             },
@@ -106,6 +109,7 @@ exports.versionedPages = {
                 List: {
                     url: {
                         [constants_1.MIN_GRAFANA_VERSION]: (dashboardUid) => `/d/${dashboardUid}?editview=templating`,
+                        '11.3.0': (dashboardUid) => `/d/${dashboardUid}?editview=variables`,
                     },
                     newButton: {
                         [constants_1.MIN_GRAFANA_VERSION]: 'Variable editor New variable button',
@@ -123,6 +127,7 @@ exports.versionedPages = {
                 Edit: {
                     url: {
                         [constants_1.MIN_GRAFANA_VERSION]: (dashboardUid, editIndex) => `/d/${dashboardUid}?editview=templating&editIndex=${editIndex}`,
+                        '11.3.0': (dashboardUid, editIndex) => `/d/${dashboardUid}?editview=variables&editIndex=${editIndex}`,
                     },
                     General: {
                         generalTypeSelectV2: {

package/dist/fixtures/page.d.ts

@@ -1,4 +1,6 @@
-import { PageFixture } from '../types';
+import { TestFixture, Page } from '@playwright/test';
+import { PlaywrightArgs } from '../types';
+type PageFixture = TestFixture<Page, PlaywrightArgs>;
 /**
  * This fixture ensures the feature toggles defined in the Playwright config are being used in Grafana frontend.
  * If Grafana version >= 10.1.0, feature toggles are read from to the 'grafana.featureToggles' key in the browser's localStorage.
@@ -11,3 +13,4 @@ import { PageFixture } from '../types';
  * The script is evaluated after the document was created but before any of its scripts were run.
  */
 export declare const page: PageFixture;
+export {};

package/dist/models/pages/DashboardPage.js

@@ -98,11 +98,18 @@ class DashboardPage extends GrafanaPage_1.GrafanaPage {
      */
     async addPanel() {
         const { components, pages } = this.ctx.selectors;
+        // From Grafana 11.3.0, one needs to click the edit button before adding a new panel in already existing dashboards
+        if (semver.gte(this.ctx.grafanaVersion, '11.3.0') && this.dashboard?.uid) {
+            await this.getByGrafanaSelector(components.NavToolbar.editDashboard.editButton).click();
+        }
         if (semver.gte(this.ctx.grafanaVersion, '10.0.0')) {
             await this.getByGrafanaSelector(components.PageToolbar.itemButton(components.PageToolbar.itemButtonTitle)).click();
             await this.getByGrafanaSelector(pages.AddDashboard.itemButton(pages.AddDashboard.itemButtonAddViz)).click();
         }
         else {
+            if (this.dashboard?.uid) {
+                await this.getByGrafanaSelector(components.PageToolbar.item('Add panel')).click();
+            }
             await this.getByGrafanaSelector(pages.AddDashboard.addNewPanel).click();
         }
         const panelId = await this.ctx.page.evaluate(() => {

package/dist/models/pages/PanelEditPage.d.ts

@@ -4,6 +4,7 @@ import { DataSourcePicker } from '../components/DataSourcePicker';
 import { GrafanaPage } from './GrafanaPage';
 import { TimeRange } from '../components/TimeRange';
 import { Panel } from '../components/Panel';
+import { DashboardPage } from './DashboardPage';
 export declare class PanelEditPage extends GrafanaPage {
     readonly ctx: PluginTestCtx;
     readonly args: DashboardEditViewArgs<string>;
@@ -34,10 +35,17 @@ export declare class PanelEditPage extends GrafanaPage {
      * Returns the name of the visualization currently selected in the panel editor
      */
     getVisualizationName(): Locator;
+    /**
+     * Clicks the "Back to dashboard" button in the panel editor
+     * In versions prior to 11.3.0, this method clicks the "Apply" button instead
+     */
+    backToDashboard(): Promise<DashboardPage>;
     /**
      * Clicks the "Apply" button in the panel editor
+     *
+     * @deprecated use {@link PanelEditPage.backToDashboard} method instead.
      */
-    apply(): Promise<void>;
+    apply(): Promise<DashboardPage>;
     /**
      * Returns the locator for the query editor row with the given refId
      */

package/dist/models/pages/PanelEditPage.js

@@ -31,6 +31,7 @@ const GrafanaPage_1 = require("./GrafanaPage");
 const TimeRange_1 = require("../components/TimeRange");
 const Panel_1 = require("../components/Panel");
 const utils_1 = require("../utils");
+const DashboardPage_1 = require("./DashboardPage");
 class PanelEditPage extends GrafanaPage_1.GrafanaPage {
     ctx;
     args;
@@ -125,11 +126,29 @@ class PanelEditPage extends GrafanaPage_1.GrafanaPage {
     getVisualizationName() {
         return this.getByGrafanaSelector(this.ctx.selectors.components.PanelEditor.toggleVizPicker);
     }
+    /**
+     * Clicks the "Back to dashboard" button in the panel editor
+     * In versions prior to 11.3.0, this method clicks the "Apply" button instead
+     */
+    async backToDashboard() {
+        if (semver.gte(this.ctx.grafanaVersion, '11.3.0')) {
+            await this.getByGrafanaSelector(this.ctx.selectors.components.NavToolbar.editDashboard.backToDashboardButton).click();
+        }
+        else if (semver.gte(this.ctx.grafanaVersion, '9.0.0')) {
+            await this.ctx.page.getByTestId(this.ctx.selectors.components.PanelEditor.applyButton).click();
+        }
+        else {
+            await this.ctx.page.getByLabel('panel editor apply').click();
+        }
+        return new DashboardPage_1.DashboardPage(this.ctx, this.args);
+    }
     /**
      * Clicks the "Apply" button in the panel editor
+     *
+     * @deprecated use {@link PanelEditPage.backToDashboard} method instead.
      */
     async apply() {
-        await this.ctx.page.getByTestId(this.ctx.selectors.components.PanelEditor.applyButton).click();
+        return this.backToDashboard();
     }
     /**
      * Returns the locator for the query editor row with the given refId

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import { Locator, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions, Response, TestInfo, TestFixture, Page } from '@playwright/test';
+import { Locator, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions, Response, TestInfo } from '@playwright/test';
 import { E2ESelectors } from './e2e-selectors/types';
 import { AnnotationEditPage } from './models/pages/AnnotationEditPage';
 import { AppConfigPage } from './models/pages/AppConfigPage';
@@ -287,7 +287,6 @@ export type PluginTestCtx = {
  * Playwright args used when defining fixtures
  */
 export type PlaywrightArgs = PluginFixture & PluginOptions & PlaywrightTestArgs & PlaywrightTestOptions & PlaywrightWorkerArgs & PlaywrightWorkerOptions;
-export type PageFixture = TestFixture<Page, PlaywrightArgs>;
 /**
  * The data source settings
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "1.9.0-canary.1140.8d70b63.0",
+  "version": "1.9.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -56,5 +56,5 @@
       "start": "cls || clear"
     }
   },
-  "gitHead": "8d70b63cb978c9f71ccf9bbe3d8af62323ca67be"
+  "gitHead": "6e147dcb3af44550009cad0be302b319899c9d51"
 }