@grafana/plugin-e2e 0.26.0 → 0.26.1

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

@@ -11,7 +11,7 @@ export type APIs = {
         query: string;
         health: (uid: string, id: string) => string;
         datasourceByUID: (uid: string) => string;
-        proxy: (uid: string) => string;
+        proxy: (uid: string, id: string) => string;
     };
     Dashboard: {
         delete: (uid: string) => string;
@@ -175,10 +175,12 @@ export type Pages = {
                     newButton: string;
                     addVariableCTAV2: (variableName: string) => string;
                     addVariableCTAV2Item: string;
+                    table: string;
                 };
                 Edit: {
                     url: (dashboardUid: string, editIndex: string) => string;
                     General: {
+                        selectionOptionsIncludeAllSwitch: string;
                         generalTypeSelectV2: string;
                         previewOfValuesOption: string;
                         submitButton: string;

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

@@ -21,7 +21,8 @@ export declare const versionedAPIs: {
             "8.0.0": (uid: string) => string;
         };
         proxy: {
-            "8.0.0": (uid: string) => string;
+            '9.4.0': (uid: string, _: string) => string;
+            "8.0.0": (_: string, id: string) => string;
         };
     };
     Dashboard: {

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

@@ -25,7 +25,8 @@ exports.versionedAPIs = {
             [constants_1.MIN_GRAFANA_VERSION]: (uid) => `/api/datasources/uid/${uid}`,
         },
         proxy: {
-            [constants_1.MIN_GRAFANA_VERSION]: (uid) => `api/datasources/proxy/uid/${uid}`,
+            '9.4.0': (uid, _) => `api/datasources/proxy/uid/${uid}`,
+            [constants_1.MIN_GRAFANA_VERSION]: (_, id) => `/api/datasources/proxy/${id}`,
         },
     },
     Dashboard: {

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

@@ -112,6 +112,9 @@ export declare const versionedPages: {
                             '10.4.0': string;
                             "8.0.0": string;
                         };
+                        selectionOptionsIncludeAllSwitch: {
+                            "8.0.0": string;
+                        };
                     };
                 };
             };

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

@@ -118,6 +118,9 @@ exports.versionedPages = {
                             '10.4.0': 'data-testid Variable editor Run Query button',
                             [constants_1.MIN_GRAFANA_VERSION]: 'Variable editor Submit button',
                         },
+                        selectionOptionsIncludeAllSwitch: {
+                            [constants_1.MIN_GRAFANA_VERSION]: 'Variable editor Form IncludeAll switch',
+                        },
                     },
                 },
             },

package/dist/models/pages/AnnotationEditPage.js

@@ -45,7 +45,14 @@ class AnnotationEditPage extends GrafanaPage_1.GrafanaPage {
         const url = this.args.dashboard?.uid
             ? Dashboard.Settings.Annotations.Edit.url(this.args.dashboard.uid, this.args.id)
             : AddDashboard.Settings.Annotations.Edit.url(this.args.id);
-        return super.navigate(url, options);
+        await super.navigate(url, options);
+        // In versions before 9.2.0, the annotation index is not part of the URL so there's no way to navigate to it directly.
+        // Instead, we have to click the nth row in the variable list to navigate to the edit page for a given annotation index.
+        if (semver.lt(this.ctx.grafanaVersion, '9.2.0') && this.args.id) {
+            const list = this.ctx.page.locator('tbody tr');
+            const variables = await list.all();
+            await variables[Number(this.args.id)].click();
+        }
     }
     /**
      * Executes the annotation query defined in the annotation page and returns the response promise

package/dist/models/pages/ExplorePage.js

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExplorePage = void 0;
-const semver = require('semver');
+const semver = __importStar(require("semver"));
 const DataSourcePicker_1 = require("../components/DataSourcePicker");
 const GrafanaPage_1 = require("./GrafanaPage");
 const TimeRange_1 = require("../components/TimeRange");

package/dist/models/pages/VariableEditPage.js

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VariableEditPage = void 0;
-const gte = require('semver/functions/gte');
+const semver = __importStar(require("semver"));
 const DataSourcePicker_1 = require("../components/DataSourcePicker");
 const GrafanaPage_1 = require("./GrafanaPage");
 class VariableEditPage extends GrafanaPage_1.GrafanaPage {
@@ -23,6 +46,13 @@ class VariableEditPage extends GrafanaPage_1.GrafanaPage {
             ? Dashboard.Settings.Variables.Edit.url(this.args.dashboard.uid, this.args.id)
             : AddDashboard.Settings.Variables.Edit.url(this.args.id);
         await super.navigate(url, options);
+        // In versions before 9.2.0, the variable index is not part of the URL so there's no way to navigate to it directly.
+        // Instead, we have to click the nth row in the variable list to navigate to the edit page for a given variable index.
+        if (semver.lt(this.ctx.grafanaVersion, '9.2.0') && this.args.id) {
+            const list = this.getByGrafanaSelector(this.ctx.selectors.pages.Dashboard.Settings.Variables.List.table).locator('tbody tr');
+            const variables = await list.all();
+            await variables[Number(this.args.id)].click();
+        }
     }
     /**
      * Sets the type of variable in the 'Variable type' dropdown to the given type
@@ -44,12 +74,16 @@ class VariableEditPage extends GrafanaPage_1.GrafanaPage {
      */
     async runQuery() {
         // in 9.2.0, the submit button got a new purpose. it no longer submits the form, but instead runs the query
-        if (gte(this.ctx.grafanaVersion, '9.2.0')) {
+        if (semver.gte(this.ctx.grafanaVersion, '9.2.0')) {
             await this.getByGrafanaSelector(this.ctx.selectors.pages.Dashboard.Settings.Variables.Edit.General.submitButton).click();
         }
         else {
-            // in 9.1.3, the submit button submits the form
-            await this.ctx.page.keyboard.press('Tab');
+            // in version before 9.2.0, there's no submit button, so instead we click the "Include all" button to trigger the query
+            const queryDataRequest = this.waitForQueryDataRequest();
+            const includeAllSwitch = this.getByGrafanaSelector(this.ctx.selectors.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch).locator('..');
+            await includeAllSwitch.click();
+            await queryDataRequest;
+            await includeAllSwitch.click();
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -55,5 +55,5 @@
       "start": "cls || clear"
     }
   },
-  "gitHead": "c2f0cae29ad626e595146dd59abbadf7c21d6d37"
+  "gitHead": "e6b578f7f1dbd3d405ac150e71b625ed3db5c82b"
 }