@grafana/plugin-e2e 3.8.0 → 3.8.1-canary.2678.26587359388.0

package/dist/index.d.ts

@@ -89,8 +89,8 @@ declare class AlertRuleEditPage extends GrafanaPage {
     /**
      * Returns a locator for hte alert rule name field
      */
-    get alertRuleNameField(): _playwright_test.Locator;
-    get advancedModeSwitch(): _playwright_test.Locator;
+    get alertRuleNameField(): Locator;
+    get advancedModeSwitch(): Locator;
     isAdvancedModeSupported(): Promise<boolean>;
     enableAdvancedQueryMode(): Promise<void>;
     disableAdvancedQueryMode(): Promise<void>;

package/dist/models/GrafanaAPIClient.js

@@ -1,8 +1,11 @@
 'use strict';
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);
 class GrafanaAPIClient {
   constructor(request) {
-    this.request = request;
+    __publicField(this, "request", request);
   }
   async getUserIdByUsername(userName) {
     const getUserIdByUserNameReq = await this.request.get(`/api/users/lookup?loginOrEmail=${userName}`);

package/dist/models/components/AlertRuleQuery.js

@@ -5,12 +5,12 @@ var GrafanaPage = require('../pages/GrafanaPage.js');
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class AlertRuleQuery extends GrafanaPage.GrafanaPage {
   constructor(ctx, locator) {
     super(ctx);
-    this.ctx = ctx;
-    this.locator = locator;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "locator", locator);
     __publicField(this, "datasource");
     this.datasource = new DataSourcePicker.DataSourcePicker(ctx, locator);
   }

package/dist/models/components/ComponentBase.js

@@ -1,9 +1,12 @@
 'use strict';
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ComponentBase {
   constructor(ctx, element) {
-    this.ctx = ctx;
-    this.element = element;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "element", element);
   }
   locator(selectorOrLocator, options) {
     if (!selectorOrLocator) {

package/dist/models/components/Panel.js

@@ -22,12 +22,15 @@ function _interopNamespaceDefault(e) {
 
 var semver__namespace = /*#__PURE__*/_interopNamespaceDefault(semver);
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 const ERROR_STATUS = "error";
 class Panel extends GrafanaPage.GrafanaPage {
   constructor(ctx, locator) {
     super(ctx);
-    this.ctx = ctx;
-    this.locator = locator;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "locator", locator);
   }
   /**
    * Returns a locator that resolves element(s) that contain the field name(s) that are currently displayed in the panel.

package/dist/models/components/PanelEditOptionsGroup.js

@@ -9,11 +9,14 @@ var semver = require('semver');
 var RadioGroup = require('./RadioGroup.js');
 var utils = require('../utils.js');
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class PanelEditOptionsGroup {
   constructor(ctx, element, groupLabel) {
-    this.ctx = ctx;
-    this.element = element;
-    this.groupLabel = groupLabel;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "element", element);
+    __publicField(this, "groupLabel", groupLabel);
   }
   async isExpanded() {
     const expanded = await this.getOptionsGroupToggle().getAttribute("aria-expanded");

package/dist/models/components/ScopedComponent.js

@@ -2,10 +2,13 @@
 
 var GrafanaPage = require('../pages/GrafanaPage.js');
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);
 class ScopedComponent extends GrafanaPage.GrafanaPage {
   constructor(ctx, root) {
     super(ctx);
-    this.root = root;
+    __publicField(this, "root", root);
   }
   /**
    * Returns a new instance of this component scoped to the given root locator.

package/dist/models/pages/AlertRuleEditPage.js

@@ -25,12 +25,16 @@ function _interopNamespaceDefault(e) {
 
 var semver__namespace = /*#__PURE__*/_interopNamespaceDefault(semver);
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 const QUERY_AND_EXPRESSION_STEP_ID = "2";
+const ALERT_PAGE_READY_TIMEOUT = 15e3;
 class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
   constructor(ctx, args) {
     super(ctx, args);
-    this.ctx = ctx;
-    this.args = args;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "args", args);
   }
   /**
    * Navigates to the annotation edit page. If a dashboard uid was not provided, it's assumed that it's a new dashboard.
@@ -60,12 +64,12 @@ class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
       "alertingQueryAndExpressionsStepMode"
     );
     if (alertingQueryAndExpressionsStepMode) {
-      await test.expect(this.advancedModeSwitch).toBeVisible();
-      await test.expect(this.advancedModeSwitch).toHaveCount(1);
+      await test.expect(this.advancedModeSwitch).toBeVisible({ timeout: ALERT_PAGE_READY_TIMEOUT });
+      await test.expect(this.advancedModeSwitch).toHaveCount(1, { timeout: ALERT_PAGE_READY_TIMEOUT });
       return true;
     }
-    await test.expect(this.advancedModeSwitch).not.toBeVisible();
-    await test.expect(this.advancedModeSwitch).toHaveCount(0);
+    await test.expect(this.advancedModeSwitch).not.toBeVisible({ timeout: ALERT_PAGE_READY_TIMEOUT });
+    await test.expect(this.advancedModeSwitch).toHaveCount(0, { timeout: ALERT_PAGE_READY_TIMEOUT });
     return false;
   }
   /*
@@ -98,15 +102,15 @@ class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
   }
   async getQueryRow(refId = "A") {
     const advancedModeSupported = await this.isAdvancedModeSupported();
+    let locator;
     if (advancedModeSupported && !await this.advancedModeSwitch.isChecked() && refId === "A") {
-      return new AlertRuleQuery.AlertRuleQuery(
-        this.ctx,
-        this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRows.rows)
-      );
+      locator = this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRows.rows);
+    } else {
+      locator = this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRows.rows).filter({
+        has: this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRow.title(refId))
+      });
     }
-    const locator = this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRows.rows).filter({
-      has: this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRow.title(refId))
-    });
+    await locator.first().waitFor({ state: "visible", timeout: ALERT_PAGE_READY_TIMEOUT });
     return new AlertRuleQuery.AlertRuleQuery(this.ctx, locator);
   }
   /**
@@ -173,7 +177,7 @@ class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
     if (semver__namespace.lt(this.ctx.grafanaVersion, "11.1.0")) {
       evaluateButton = this.ctx.page.getByRole("button", { name: "Preview", exact: true });
     }
-    await test.expect(evaluateButton).toBeVisible();
+    await test.expect(evaluateButton).toBeVisible({ timeout: ALERT_PAGE_READY_TIMEOUT });
     const evalReq = this.ctx.page.waitForRequest((req) => req.url().includes(this.ctx.selectors.apis.Alerting.eval), {
       timeout: 5e3
     }).catch(async () => {

package/dist/models/pages/AnnotationEditPage.js

@@ -25,12 +25,12 @@ var semver__namespace = /*#__PURE__*/_interopNamespaceDefault(semver);
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class AnnotationEditPage extends GrafanaPage.GrafanaPage {
   constructor(ctx, args) {
     super(ctx, args);
-    this.ctx = ctx;
-    this.args = args;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "args", args);
     __publicField(this, "datasource");
     this.datasource = new DataSourcePicker.DataSourcePicker(ctx);
   }

package/dist/models/pages/AnnotationPage.js

@@ -23,11 +23,14 @@ function _interopNamespaceDefault(e) {
 
 var semver__namespace = /*#__PURE__*/_interopNamespaceDefault(semver);
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class AnnotationPage extends GrafanaPage.GrafanaPage {
   constructor(ctx, dashboard) {
     super(ctx, dashboard);
-    this.ctx = ctx;
-    this.dashboard = dashboard;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "dashboard", dashboard);
   }
   /**
    * Navigates to the annotation list page. If a dashboard uid was not provided, it's assumed that it's a new dashboard.

package/dist/models/pages/AppConfigPage.js

@@ -2,11 +2,14 @@
 
 var PluginConfigPage = require('./PluginConfigPage.js');
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class AppConfigPage extends PluginConfigPage.PluginConfigPage {
   constructor(ctx, args) {
     super(ctx, args);
-    this.ctx = ctx;
-    this.args = args;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "args", args);
   }
   /**
    * Will wait for the settings endpoint to be called e.g. when saving settings

package/dist/models/pages/AppPage.js

@@ -22,11 +22,14 @@ function _interopNamespaceDefault(e) {
 
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class AppPage extends GrafanaPage.GrafanaPage {
   constructor(ctx, args) {
     super(ctx, args);
-    this.ctx = ctx;
-    this.args = args;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "args", args);
   }
   /**
    * Will append the `/a/${pluginId}` before the provided path and then

package/dist/models/pages/DashboardPage.js

@@ -35,8 +35,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 class DashboardPage extends GrafanaPage.GrafanaPage {
   constructor(ctx, dashboard) {
     super(ctx, dashboard);
-    this.ctx = ctx;
-    this.dashboard = dashboard;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "dashboard", dashboard);
     __publicField(this, "dataSourcePicker");
     __publicField(this, "timeRange");
     __publicField(this, "pendingQueryCount", 0);

package/dist/models/pages/DataSourceConfigPage.js

@@ -2,10 +2,13 @@
 
 var GrafanaPage = require('./GrafanaPage.js');
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);
 class DataSourceConfigPage extends GrafanaPage.GrafanaPage {
   constructor(ctx, datasource) {
     super(ctx);
-    this.datasource = datasource;
+    __publicField(this, "datasource", datasource);
   }
   async deleteDataSource() {
     await this.ctx.request.delete(this.ctx.selectors.apis.DataSource.datasourceByUID(this.datasource.uid));

package/dist/models/pages/ExplorePage.js

@@ -35,7 +35,7 @@ const TABLE_PANEL_TEXT = "Table";
 class ExplorePage extends GrafanaPage.GrafanaPage {
   constructor(ctx, args) {
     super(ctx, args);
-    this.args = args;
+    __publicField(this, "args", args);
     __publicField(this, "datasource");
     __publicField(this, "timeRange");
     __publicField(this, "timeSeriesPanel");

package/dist/models/pages/GrafanaPage.js

@@ -2,10 +2,13 @@
 
 var utils = require('../utils.js');
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class GrafanaPage {
   constructor(ctx, pageArgs = {}) {
-    this.ctx = ctx;
-    this.pageArgs = pageArgs;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "pageArgs", pageArgs);
   }
   async navigate(url, options) {
     let queryParams = options?.queryParams ? options.queryParams : this.pageArgs.queryParams;

package/dist/models/pages/PanelEditPage.js

@@ -35,8 +35,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 class PanelEditPage extends GrafanaPage.GrafanaPage {
   constructor(ctx, args) {
     super(ctx, args);
-    this.ctx = ctx;
-    this.args = args;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "args", args);
     __publicField(this, "datasource");
     __publicField(this, "timeRange");
     __publicField(this, "panel");

package/dist/models/pages/PluginConfigPage.js

@@ -2,11 +2,14 @@
 
 var GrafanaPage = require('./GrafanaPage.js');
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class PluginConfigPage extends GrafanaPage.GrafanaPage {
   constructor(ctx, args) {
     super(ctx, args);
-    this.ctx = ctx;
-    this.args = args;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "args", args);
   }
   /**
    * Navigates to the app plugin config page.

package/dist/models/pages/VariableEditPage.js

@@ -26,12 +26,12 @@ var semver__namespace = /*#__PURE__*/_interopNamespaceDefault(semver);
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class VariableEditPage extends GrafanaPage.GrafanaPage {
   constructor(ctx, args) {
     super(ctx, args);
-    this.ctx = ctx;
-    this.args = args;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "args", args);
     __publicField(this, "datasource");
     this.datasource = new DataSourcePicker.DataSourcePicker(ctx);
   }

package/dist/models/pages/VariablePage.js

@@ -3,11 +3,14 @@
 var GrafanaPage = require('./GrafanaPage.js');
 var VariableEditPage = require('./VariableEditPage.js');
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class VariablePage extends GrafanaPage.GrafanaPage {
   constructor(ctx, dashboard) {
     super(ctx, dashboard);
-    this.ctx = ctx;
-    this.dashboard = dashboard;
+    __publicField(this, "ctx", ctx);
+    __publicField(this, "dashboard", dashboard);
   }
   /**
    * Navigates to the variable list page. If a dashboard uid was not provided, it's assumed that it's a new dashboard.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "3.8.0",
+  "version": "3.8.1-canary.2678.26587359388.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -54,5 +54,5 @@
     "uuid": "^13.0.0",
     "yaml": "^2.3.4"
   },
-  "gitHead": "a5b29c0663a14099383f2cda889ff86df36086ae"
+  "gitHead": "d9f66da8028dc528c481ec13977f8629794a1988"
 }