@grafana/plugin-e2e 1.17.1 → 1.17.2-canary.1508.adff3b9.0

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

@@ -13,12 +13,24 @@ export declare class AlertRuleEditPage extends GrafanaPage {
      * Returns a locator for hte alert rule name field
      */
     get alertRuleNameField(): import("playwright-core").Locator;
+    get advancedModeSwitch(): import("playwright-core").Locator;
+    isAdvancedModeSupported(): Promise<boolean>;
+    enableAdvancedQueryMode(): Promise<void>;
+    disableAdvancedQueryMode(): Promise<void>;
+    getQueryRow(refId?: string): Promise<AlertRuleQuery>;
     /**
-     * Returns an instance of the {@link AlertRuleQuery} class for the query row with the provided refId.
+     * @deprecated Use getQueryRow instead
+     * Returns an instance of the {@link AlertRuleQuery} class for a query in the query and expression step (step 2)
+     *
+     * @param refId is optional. If not provided, it will return query row with refId 'A' in Grafana versions <11.6.
+     * In Grafana versions >=11.6 where advanced mode is supported, it will return the default query if advanced mode
+     * is not enabled. If advanced mode is enabled, it will return the a query by refId.
      */
-    getAlertRuleQueryRow(refId: string): AlertRuleQuery;
+    getAlertRuleQueryRow(refId?: string): AlertRuleQuery;
     /**
      * Clicks the "Add query" button and returns an instance of the {@link AlertRuleQuery} class for the new query row.
+     *
+     * Since Grafana 11.6, this method is only available if advanced mode is enabled. Use enableQueryAdvancedMode() method to enable it.
      */
     clickAddQueryRow(): Promise<AlertRuleQuery>;
     /**

package/dist/models/pages/AlertRuleEditPage.js

@@ -37,6 +37,7 @@ exports.AlertRuleEditPage = void 0;
 const semver = __importStar(require("semver"));
 const GrafanaPage_1 = require("./GrafanaPage");
 const AlertRuleQuery_1 = require("../components/AlertRuleQuery");
+const QUERY_AND_EXPRESSION_STEP_ID = '2';
 class AlertRuleEditPage extends GrafanaPage_1.GrafanaPage {
     ctx;
     args;
@@ -62,10 +63,59 @@ class AlertRuleEditPage extends GrafanaPage_1.GrafanaPage {
         }
         return this.ctx.page.getByPlaceholder('Give your alert rule a name');
     }
+    get advancedModeSwitch() {
+        return this.getByGrafanaSelector(this.ctx.selectors.components.AlertRules.stepAdvancedModeSwitch(QUERY_AND_EXPRESSION_STEP_ID));
+    }
+    async isAdvancedModeSupported() {
+        // why not check if alertingQueryAndExpressionsStepMode feature is enabled? then we'd have to update the code when the toggle is removed.
+        const count = await this.getByGrafanaSelector(this.ctx.selectors.components.AlertRules.stepAdvancedModeSwitch(QUERY_AND_EXPRESSION_STEP_ID)).count();
+        return count > 0;
+    }
+    /*
+     * Enables the advanced mode for the query and expression step.
+     * Only available in Grafana 11.6.0 and later. If advanced mode is not supported, this method will do nothing.
+     */
+    async enableAdvancedQueryMode() {
+        const advancedModeSupported = await this.isAdvancedModeSupported();
+        if (!advancedModeSupported) {
+            console.log('Advanced query mode is not supported in this Grafana version. Ignoring the request.');
+            return;
+        }
+        await this.getByGrafanaSelector(this.ctx.selectors.components.AlertRules.stepAdvancedModeSwitch(QUERY_AND_EXPRESSION_STEP_ID)).check({ force: true });
+    }
+    /*
+     * Disabled the advanced mode for the query and expression step.
+     * Advanced mode is enabled by default in Grafana 11.6.0 and later.
+     */
+    async disableAdvancedQueryMode() {
+        const advancedModeSupported = await this.isAdvancedModeSupported();
+        if (!advancedModeSupported) {
+            console.log('Advanced query mode is not supported in this Grafana version. Ignoring the request.');
+            return;
+        }
+        await this.getByGrafanaSelector(this.ctx.selectors.components.AlertRules.stepAdvancedModeSwitch(QUERY_AND_EXPRESSION_STEP_ID)).uncheck({ force: true });
+    }
+    async getQueryRow(refId = 'A') {
+        const advancedModeSupported = await this.isAdvancedModeSupported();
+        if (advancedModeSupported && !(await this.advancedModeSwitch.isChecked()) && refId === 'A') {
+            // return the default query row
+            return new AlertRuleQuery_1.AlertRuleQuery(this.ctx, this.ctx.page.getByTestId('query-editor-row'));
+        }
+        // return query by refId
+        const locator = this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRows.rows).filter({
+            has: this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRow.title(refId)),
+        });
+        return new AlertRuleQuery_1.AlertRuleQuery(this.ctx, locator);
+    }
     /**
-     * Returns an instance of the {@link AlertRuleQuery} class for the query row with the provided refId.
+     * @deprecated Use getQueryRow instead
+     * Returns an instance of the {@link AlertRuleQuery} class for a query in the query and expression step (step 2)
+     *
+     * @param refId is optional. If not provided, it will return query row with refId 'A' in Grafana versions <11.6.
+     * In Grafana versions >=11.6 where advanced mode is supported, it will return the default query if advanced mode
+     * is not enabled. If advanced mode is enabled, it will return the a query by refId.
      */
-    getAlertRuleQueryRow(refId) {
+    getAlertRuleQueryRow(refId = 'A') {
         const locator = this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRows.rows).filter({
             has: this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRow.title(refId)),
         });
@@ -73,8 +123,14 @@ class AlertRuleEditPage extends GrafanaPage_1.GrafanaPage {
     }
     /**
      * Clicks the "Add query" button and returns an instance of the {@link AlertRuleQuery} class for the new query row.
+     *
+     * Since Grafana 11.6, this method is only available if advanced mode is enabled. Use enableQueryAdvancedMode() method to enable it.
      */
     async clickAddQueryRow() {
+        const advancedModeSupported = await this.isAdvancedModeSupported();
+        if (advancedModeSupported && !(await this.advancedModeSwitch.isChecked())) {
+            throw new Error('Since Grafana 11.6, you need to enable advanced mode to add queries. Use enableQueryAdvancedMode() method to enable it.');
+        }
         await this.getByGrafanaSelector(this.ctx.selectors.components.QueryTab.addQuery).click();
         const locator = this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRows.rows).last();
         return new AlertRuleQuery_1.AlertRuleQuery(this.ctx, locator);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "1.17.1",
+  "version": "1.17.2-canary.1508.adff3b9.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -36,7 +36,7 @@
     "@playwright/test": "^1.41.2"
   },
   "devDependencies": {
-    "@playwright/test": "^1.50.0",
+    "@playwright/test": "^1.50.1",
     "@types/uuid": "^10.0.0",
     "dotenv": "^16.4.7"
   },
@@ -55,5 +55,5 @@
       "start": "cls || clear"
     }
   },
-  "gitHead": "eb261766bea8898f97d078b211338a8556e3985a"
+  "gitHead": "adff3b954e1a7e5fa93c4d7ef72755db2add926b"
 }