@grafana/plugin-e2e 3.9.0-canary.2621.26576348885.0 → 3.9.1

package/dist/fixtures/alertRuleEditPage.js

@@ -1,29 +1,10 @@
 'use strict';
 
-var semver = require('semver');
+var version = require('../utils/version.js');
 var AlertRuleEditPage = require('../models/pages/AlertRuleEditPage.js');
 
-function _interopNamespaceDefault(e) {
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var semver__namespace = /*#__PURE__*/_interopNamespaceDefault(semver);
-
 const alertRuleEditPage = async ({ page, selectors, grafanaVersion, request }, use, testInfo) => {
-  if (semver__namespace.lt(grafanaVersion, "9.5.0")) {
+  if (version.lt(grafanaVersion, "9.5.0")) {
     console.log(
       "Testing alert rules with plugin-e2e is only supported for Grafana 9.5.0 and later. Checkout https://grafana.com/developers/plugin-tools/e2e-test-a-plugin/test-a-data-source-plugin/annotation-queries#test-the-entire-annotation-query-execution-flow to see how to skip tests for a range of Grafana versions."
     );

package/dist/fixtures/commands/createDataSource.js

@@ -1,11 +1,10 @@
 'use strict';
 
-var uuid = require('uuid');
 var test = require('@playwright/test');
 
 const createDataSourceViaAPI = async (grafanaAPIClient, datasource) => {
   const { type, name } = datasource;
-  const dsName = name ?? `${type}-${uuid.v4()}`;
+  const dsName = name ?? `${type}-${crypto.randomUUID()}`;
   const existingDataSource = await grafanaAPIClient.getDataSourceByName(dsName);
   if (existingDataSource.ok()) {
     const json = await existingDataSource.json();

package/dist/fixtures/commands/gotoAlertRuleEditPage.js

@@ -1,30 +1,11 @@
 'use strict';
 
-var semver = require('semver');
+var version = require('../../utils/version.js');
 var AlertRuleEditPage = require('../../models/pages/AlertRuleEditPage.js');
 
-function _interopNamespaceDefault(e) {
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var semver__namespace = /*#__PURE__*/_interopNamespaceDefault(semver);
-
 const gotoAlertRuleEditPage = async ({ request, page, selectors, grafanaVersion }, use, testInfo) => {
   await use(async (args) => {
-    if (semver__namespace.lt(grafanaVersion, "9.5.0")) {
+    if (version.lt(grafanaVersion, "9.5.0")) {
       console.log(
         "Testing alert rules with plugin-e2e is only supported for Grafana 9.4.0 and later. Checkout https://grafana.com/developers/plugin-tools/e2e-test-a-plugin/test-a-data-source-plugin/annotation-queries#test-the-entire-annotation-query-execution-flow to see how to skip tests for a range of Grafana versions."
       );

package/dist/fixtures/page.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var semver = require('semver');
+var version = require('../utils/version.js');
 var options = require('../options.js');
 var openFeature = require('./openFeature.js');
 var overrideGrafanaBootData = require('./scripts/overrideGrafanaBootData.js');
@@ -17,7 +17,7 @@ const page = async ({ page: page2, featureToggles, openFeature: openFeature$1, u
       console.error("Failed to set feature toggles", error);
     }
   }
-  if (hasOpenFeature && semver.gte(grafanaVersion, "12.1.0")) {
+  if (hasOpenFeature && version.gte(grafanaVersion, "12.1.0")) {
     await openFeature.setupOpenFeatureRoutes(page2, mergedFlags, openFeature$1.latency ?? 0, selectors);
   }
   await page2.goto("/");

package/dist/index.d.ts

@@ -171,58 +171,6 @@ declare class AppPage extends GrafanaPage {
     goto(options?: AppPageNavigateOptions): Promise<void>;
 }
 
-type LocatorParams = Parameters<Locator['locator']>;
-declare abstract class ComponentBase {
-    readonly ctx: PluginTestCtx;
-    protected readonly element: Locator;
-    constructor(ctx: PluginTestCtx, element: Locator);
-    locator(selectorOrLocator?: LocatorParams[0], options?: LocatorParams[1]): Locator;
-}
-
-type SelectOptionsType = Parameters<Locator['selectOption']>[1];
-type CheckOptionsType = Parameters<Locator['check']>[0];
-
-declare class ColorPicker extends ComponentBase {
-    constructor(ctx: PluginTestCtx, element: Locator);
-    static getContainer(ctx: PluginTestCtx, root?: Locator): Locator;
-    within(root: Locator): ColorPicker;
-    selectOption(rgbOrHex: string, options?: SelectOptionsType): Promise<void>;
-    private getCustomTab;
-    private getContainer;
-}
-
-declare class MultiSelect extends ComponentBase {
-    constructor(ctx: PluginTestCtx, element: Locator);
-    static getContainer(ctx: PluginTestCtx, root?: Locator): Locator;
-    within(root: Locator): MultiSelect;
-    selectOptions(values: string[], options?: SelectOptionsType): Promise<string[]>;
-}
-
-declare class RadioGroup extends ComponentBase {
-    constructor(ctx: PluginTestCtx, element: Locator);
-    static getContainer(ctx: PluginTestCtx, root?: Locator): Locator;
-    within(root: Locator): RadioGroup;
-    check(labelOrValue: string, options?: CheckOptionsType): Promise<void>;
-}
-
-declare class Select extends ComponentBase {
-    constructor(ctx: PluginTestCtx, element: Locator);
-    static getContainer(ctx: PluginTestCtx, root?: Locator): Locator;
-    within(root: Locator): Select;
-    selectOption(values: string, options?: SelectOptionsType): Promise<string>;
-}
-
-declare class Switch extends ComponentBase {
-    private group;
-    constructor(ctx: PluginTestCtx, group: Locator);
-    static getContainer(ctx: PluginTestCtx, root?: Locator): Locator;
-    within(root: Locator): Switch;
-    private static getElement;
-    check(options?: CheckOptionsType): Promise<void>;
-    uncheck(options?: CheckOptionsType): Promise<void>;
-    private getSwitch;
-}
-
 declare class TimeRange extends ScopedComponent {
     /**
      * Opens the time picker and sets the time range to the provided values
@@ -230,14 +178,6 @@ declare class TimeRange extends ScopedComponent {
     set({ from, to, zone }: TimeRangeArgs): Promise<void>;
 }
 
-declare class UnitPicker extends ComponentBase {
-    constructor(ctx: PluginTestCtx, element: Locator);
-    static getContainer(ctx: PluginTestCtx, root?: Locator): Locator;
-    within(root: Locator): UnitPicker;
-    selectOption(value: string, options?: SelectOptionsType): Promise<void>;
-    private getOption;
-}
-
 /**
  * Factory for components that are not attached to a specific page.
  *
@@ -251,19 +191,11 @@ declare class UnitPicker extends ComponentBase {
  * ```typescript
  * await components.dataSourcePicker.set('prom');
  * await components.dataSourcePicker.within(panel).set('prom');
- * await components.select.within(fieldLabel).selectOption('Europe/Stockholm');
- * await components.switch.within(fieldLabel).check();
  * ```
  */
 declare class Components {
     readonly dataSourcePicker: DataSourcePicker;
     readonly timeRangePicker: TimeRange;
-    readonly select: Select;
-    readonly multiSelect: MultiSelect;
-    readonly switch: Switch;
-    readonly radioGroup: RadioGroup;
-    readonly unitPicker: UnitPicker;
-    readonly colorPicker: ColorPicker;
     constructor(ctx: PluginTestCtx);
 }
 
@@ -309,6 +241,54 @@ declare class Panel extends GrafanaPage {
     getErrorIcon(): Locator;
 }
 
+type LocatorParams = Parameters<Locator['locator']>;
+declare abstract class ComponentBase {
+    readonly ctx: PluginTestCtx;
+    protected readonly element: Locator;
+    constructor(ctx: PluginTestCtx, element: Locator);
+    locator(selectorOrLocator?: LocatorParams[0], options?: LocatorParams[1]): Locator;
+}
+
+type SelectOptionsType = Parameters<Locator['selectOption']>[1];
+type CheckOptionsType = Parameters<Locator['check']>[0];
+
+declare class ColorPicker extends ComponentBase {
+    constructor(ctx: PluginTestCtx, element: Locator);
+    selectOption(rgbOrHex: string, options?: SelectOptionsType): Promise<void>;
+    private getCustomTab;
+    private getContainer;
+}
+
+declare class UnitPicker extends ComponentBase {
+    constructor(ctx: PluginTestCtx, element: Locator);
+    selectOption(value: string, options?: SelectOptionsType): Promise<void>;
+    private getOption;
+}
+
+declare class Select extends ComponentBase {
+    constructor(ctx: PluginTestCtx, element: Locator);
+    selectOption(values: string, options?: SelectOptionsType): Promise<string>;
+}
+
+declare class MultiSelect extends ComponentBase {
+    constructor(ctx: PluginTestCtx, element: Locator);
+    selectOptions(values: string[], options?: SelectOptionsType): Promise<string[]>;
+}
+
+declare class Switch extends ComponentBase {
+    private group;
+    constructor(ctx: PluginTestCtx, group: Locator);
+    private static getElement;
+    check(options?: CheckOptionsType): Promise<void>;
+    uncheck(options?: CheckOptionsType): Promise<void>;
+    private getSwitch;
+}
+
+declare class RadioGroup extends ComponentBase {
+    constructor(ctx: PluginTestCtx, element: Locator);
+    check(labelOrValue: string, options?: CheckOptionsType): Promise<void>;
+}
+
 declare class PanelEditOptionsGroup {
     private ctx;
     readonly element: Locator;
@@ -1464,6 +1444,74 @@ declare const isFeatureEnabled: (page: Page, featureToggle: string) => Promise<b
 
 declare const DEFAULT_A11Y_TAGS: string[];
 
+/**
+ * Returns true when version `a` is greater than or equal to version `b`.
+ *
+ * Follows semver precedence rules: a release has higher precedence than any
+ * pre-release of the same `MAJOR.MINOR.PATCH` (`1.2.3` > `1.2.3-anything`).
+ * Pre-release identifiers are compared dot-separated, numerics numerically
+ * and non-numerics lexicographically (`1.2.3-2` < `1.2.3-10`).
+ *
+ * @param a - A semantic version string in the form `MAJOR.MINOR.PATCH[-PRE]`.
+ * @param b - A semantic version string in the form `MAJOR.MINOR.PATCH[-PRE]`.
+ */
+declare const gte: (a: string, b: string) => boolean;
+/**
+ * Returns true when version `a` is strictly less than version `b`.
+ *
+ * Follows semver precedence rules: a release has higher precedence than any
+ * pre-release of the same `MAJOR.MINOR.PATCH` (`1.2.3-anything` < `1.2.3`).
+ * Pre-release identifiers are compared dot-separated, numerics numerically
+ * and non-numerics lexicographically.
+ *
+ * @param a - A semantic version string in the form `MAJOR.MINOR.PATCH[-PRE]`.
+ * @param b - A semantic version string in the form `MAJOR.MINOR.PATCH[-PRE]`.
+ */
+declare const lt: (a: string, b: string) => boolean;
+/**
+ * Returns true when version `a` is less than or equal to version `b`.
+ *
+ * Follows semver precedence rules. See {@link lt} for details.
+ *
+ * @param a - A semantic version string in the form `MAJOR.MINOR.PATCH[-PRE]`.
+ * @param b - A semantic version string in the form `MAJOR.MINOR.PATCH[-PRE]`.
+ */
+declare const lte: (a: string, b: string) => boolean;
+/**
+ * Returns true when version `a` is strictly greater than version `b`.
+ *
+ * Follows semver precedence rules. See {@link gte} for details.
+ *
+ * @param a - A semantic version string in the form `MAJOR.MINOR.PATCH[-PRE]`.
+ * @param b - A semantic version string in the form `MAJOR.MINOR.PATCH[-PRE]`.
+ */
+declare const gt: (a: string, b: string) => boolean;
+/**
+ * Returns true when version `a` is equal to version `b` per semver precedence.
+ *
+ * Build metadata (after `+`) is ignored. `1.2.3` and `1.2.3-pre` are not equal.
+ *
+ * @param a - A semantic version string in the form `MAJOR.MINOR.PATCH[-PRE]`.
+ * @param b - A semantic version string in the form `MAJOR.MINOR.PATCH[-PRE]`.
+ */
+declare const eq: (a: string, b: string) => boolean;
+/**
+ * Returns true when `version` satisfies the given range expression.
+ *
+ * Supports a small subset of semver range syntax suitable for Grafana version checks:
+ * - Exact: `"1.2.3"` (equivalent to `=1.2.3`)
+ * - Comparators: `">=1.2.3"`, `">1.2.3"`, `"<=1.2.3"`, `"<1.2.3"`, `"=1.2.3"`
+ * - Conjunction (AND) via whitespace: `">=1.2.3 <2.0.0"`
+ * - Disjunction (OR) via `||`: `">=1.2.3 <2.0.0 || >=3.0.0"`
+ *
+ * Caret (`^`) and tilde (`~`) prefixes and hyphen ranges are not supported.
+ * Unrecognized comparator prefixes cause that comparator to evaluate to false.
+ *
+ * @param version - A semantic version string in the form `MAJOR.MINOR.PATCH[-PRE]`.
+ * @param range - A range expression using the syntax described above.
+ */
+declare const satisfies: (version: string, range: string) => boolean;
+
 declare const test: _playwright_test.TestType<_playwright_test.PlaywrightTestArgs & _playwright_test.PlaywrightTestOptions & InternalFixtures & PluginFixture, _playwright_test.PlaywrightWorkerArgs & _playwright_test.PlaywrightWorkerOptions & PluginOptions>;
 declare const expect: _playwright_test.Expect<{
     toHaveAlert: (grafanaPage: GrafanaPage, severity: AlertVariant, options?: AlertPageOptions) => Promise<{
@@ -1581,5 +1629,5 @@ declare global {
     }
 }
 
-export { AnnotationEditPage, AnnotationPage, AppConfigPage, AppPage, ColorPicker, Components, DEFAULT_A11Y_TAGS, DashboardPage, DataSourceConfigPage, DataSourcePicker, ExplorePage, GrafanaPage, MultiSelect, Panel, PanelEditPage, PluginConfigPage, RadioGroup, ScopedComponent, Select, Switch, TimeRange, UnitPicker, VariableEditPage, VariablePage, expect, isFeatureEnabled, isLegacyFeatureEnabled, test };
+export { AnnotationEditPage, AnnotationPage, AppConfigPage, AppPage, Components, DEFAULT_A11Y_TAGS, DashboardPage, DataSourceConfigPage, DataSourcePicker, ExplorePage, GrafanaPage, Panel, PanelEditPage, PluginConfigPage, ScopedComponent, TimeRange, VariableEditPage, VariablePage, eq, expect, gt, gte, isFeatureEnabled, isLegacyFeatureEnabled, lt, lte, satisfies, test };
 export type { A11yViolationsOptions, AlertPageOptions, AlertRule, AlertRuleArgs, AlertVariant$1 as AlertVariant, AppPageNavigateOptions, AxeScanContext, ContainTextOptions, CreateDataSourceArgs, CreateDataSourcePageArgs, Credentials, Dashboard, DashboardEditViewArgs, DashboardPageArgs, DataSourceSettings, E2ESelectorGroups, FeatureFlagValue, GotoAppConfigPageArgs, GotoAppPageArgs, GrafanaPageArgs, InternalFixtures, NavigateOptions, OrgRole, PlaywrightArgs, PluginFixture, PluginOptions, PluginPageArgs, PluginTestCtx, ReadProvisionedAlertRuleArgs, ReadProvisionedDashboardArgs, ReadProvisionedDataSourceArgs, RequestOptions, TimeRangeArgs, TriggerRequestOptions, User, UserPreferences, Visualization, getByGrafanaSelectorOptions };

package/dist/index.js

@@ -45,16 +45,10 @@ var toHaveChecked = require('./matchers/toHaveChecked.js');
 var toHaveColor = require('./matchers/toHaveColor.js');
 var toHavePanelErrors = require('./matchers/toHavePanelErrors.js');
 var Components = require('./models/Components.js');
-var ColorPicker = require('./models/components/ColorPicker.js');
 var DataSourcePicker = require('./models/components/DataSourcePicker.js');
-var MultiSelect = require('./models/components/MultiSelect.js');
-var RadioGroup = require('./models/components/RadioGroup.js');
 var ScopedComponent = require('./models/components/ScopedComponent.js');
-var Select = require('./models/components/Select.js');
-var Switch = require('./models/components/Switch.js');
 var Panel = require('./models/components/Panel.js');
 var TimeRange = require('./models/components/TimeRange.js');
-var UnitPicker = require('./models/components/UnitPicker.js');
 var AnnotationEditPage = require('./models/pages/AnnotationEditPage.js');
 var AnnotationPage = require('./models/pages/AnnotationPage.js');
 var DashboardPage = require('./models/pages/DashboardPage.js');
@@ -67,6 +61,7 @@ var VariablePage = require('./models/pages/VariablePage.js');
 var AppConfigPage = require('./models/pages/AppConfigPage.js');
 var PluginConfigPage = require('./models/pages/PluginConfigPage.js');
 var AppPage = require('./models/pages/AppPage.js');
+var version = require('./utils/version.js');
 
 const testWithInternal = test$1.test.extend({
   bootData: bootData.bootData
@@ -127,16 +122,10 @@ exports.isFeatureEnabled = isFeatureToggleEnabled.isFeatureEnabled;
 exports.isLegacyFeatureEnabled = isFeatureToggleEnabled.isLegacyFeatureEnabled;
 exports.DEFAULT_A11Y_TAGS = scanForA11yViolations.DEFAULT_A11Y_TAGS;
 exports.Components = Components.Components;
-exports.ColorPicker = ColorPicker.ColorPicker;
 exports.DataSourcePicker = DataSourcePicker.DataSourcePicker;
-exports.MultiSelect = MultiSelect.MultiSelect;
-exports.RadioGroup = RadioGroup.RadioGroup;
 exports.ScopedComponent = ScopedComponent.ScopedComponent;
-exports.Select = Select.Select;
-exports.Switch = Switch.Switch;
 exports.Panel = Panel.Panel;
 exports.TimeRange = TimeRange.TimeRange;
-exports.UnitPicker = UnitPicker.UnitPicker;
 exports.AnnotationEditPage = AnnotationEditPage.AnnotationEditPage;
 exports.AnnotationPage = AnnotationPage.AnnotationPage;
 exports.DashboardPage = DashboardPage.DashboardPage;
@@ -149,5 +138,11 @@ exports.VariablePage = VariablePage.VariablePage;
 exports.AppConfigPage = AppConfigPage.AppConfigPage;
 exports.PluginConfigPage = PluginConfigPage.PluginConfigPage;
 exports.AppPage = AppPage.AppPage;
+exports.eq = version.eq;
+exports.gt = version.gt;
+exports.gte = version.gte;
+exports.lt = version.lt;
+exports.lte = version.lte;
+exports.satisfies = version.satisfies;
 exports.expect = expect;
 exports.test = test;

package/dist/models/Components.js

@@ -1,13 +1,7 @@
 'use strict';
 
-var ColorPicker = require('./components/ColorPicker.js');
 var DataSourcePicker = require('./components/DataSourcePicker.js');
-var MultiSelect = require('./components/MultiSelect.js');
-var RadioGroup = require('./components/RadioGroup.js');
-var Select = require('./components/Select.js');
-var Switch = require('./components/Switch.js');
 var TimeRange = require('./components/TimeRange.js');
-var UnitPicker = require('./components/UnitPicker.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;
@@ -16,20 +10,8 @@ class Components {
   constructor(ctx) {
     __publicField(this, "dataSourcePicker");
     __publicField(this, "timeRangePicker");
-    __publicField(this, "select");
-    __publicField(this, "multiSelect");
-    __publicField(this, "switch");
-    __publicField(this, "radioGroup");
-    __publicField(this, "unitPicker");
-    __publicField(this, "colorPicker");
     this.dataSourcePicker = new DataSourcePicker.DataSourcePicker(ctx);
     this.timeRangePicker = new TimeRange.TimeRange(ctx);
-    this.select = new Select.Select(ctx, Select.Select.getContainer(ctx));
-    this.multiSelect = new MultiSelect.MultiSelect(ctx, MultiSelect.MultiSelect.getContainer(ctx));
-    this.switch = new Switch.Switch(ctx, Switch.Switch.getContainer(ctx));
-    this.radioGroup = new RadioGroup.RadioGroup(ctx, RadioGroup.RadioGroup.getContainer(ctx));
-    this.unitPicker = new UnitPicker.UnitPicker(ctx, UnitPicker.UnitPicker.getContainer(ctx));
-    this.colorPicker = new ColorPicker.ColorPicker(ctx, ColorPicker.ColorPicker.getContainer(ctx));
   }
 }
 

package/dist/models/components/ColorPicker.js

@@ -1,22 +1,13 @@
 'use strict';
 
 var ComponentBase = require('./ComponentBase.js');
-var semver = require('semver');
+var version = require('../../utils/version.js');
 var utils = require('../utils.js');
 
 class ColorPicker extends ComponentBase.ComponentBase {
   constructor(ctx, element) {
     super(ctx, element);
   }
-  static getContainer(ctx, root) {
-    if (root) {
-      return root;
-    }
-    return ctx.page.locator('[data-testid*="colorswatch"]').locator("xpath=..").first();
-  }
-  within(root) {
-    return new ColorPicker(this.ctx, root);
-  }
   async selectOption(rgbOrHex, options) {
     await this.element.getByRole("button").click(options);
     await this.getCustomTab().click(options);
@@ -25,17 +16,17 @@ class ColorPicker extends ComponentBase.ComponentBase {
     await colorInput.fill(rgbOrHex, options);
   }
   getCustomTab() {
-    if (semver.gte(this.ctx.grafanaVersion, "11.6.0")) {
+    if (version.gte(this.ctx.grafanaVersion, "11.6.0")) {
       return this.getContainer().getByRole("tab", { name: "Custom", exact: true });
     }
     return this.getContainer().getByRole("button", { name: "Custom", exact: true });
   }
   getContainer() {
     const { grafanaVersion, page, selectors } = this.ctx;
-    if (semver.gte(grafanaVersion, "11.5.0")) {
+    if (version.gte(grafanaVersion, "11.5.0")) {
       return page.locator(utils.resolveGrafanaSelector(selectors.components.Portal.container));
     }
-    if (semver.gte(grafanaVersion, "8.7.0")) {
+    if (version.gte(grafanaVersion, "8.7.0")) {
       return page.locator("#grafana-portal-container");
     }
     return page.locator("body > div").last();

package/dist/models/components/DataSourcePicker.js

@@ -1,28 +1,9 @@
 'use strict';
 
-var semver = require('semver');
+var version = require('../../utils/version.js');
 var test = require('@playwright/test');
 var ScopedComponent = require('./ScopedComponent.js');
 
-function _interopNamespaceDefault(e) {
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var semver__namespace = /*#__PURE__*/_interopNamespaceDefault(semver);
-
 class DataSourcePicker extends ScopedComponent.ScopedComponent {
   /**
    * Sets the data source picker to the provided name
@@ -31,7 +12,7 @@ class DataSourcePicker extends ScopedComponent.ScopedComponent {
     let datasourcePicker = (this.root || this.ctx.page).getByTestId(
       this.ctx.selectors.components.DataSourcePicker.inputV2
     );
-    if (semver__namespace.lt(this.ctx.grafanaVersion, "10.1.0")) {
+    if (version.lt(this.ctx.grafanaVersion, "10.1.0")) {
       datasourcePicker = this.getByGrafanaSelector(this.ctx.selectors.components.DataSourcePicker.container, {
         root: this.root
       }).locator("input");

package/dist/models/components/MultiSelect.js

@@ -1,24 +1,12 @@
 'use strict';
 
-var semver = require('semver');
 var Select = require('./Select.js');
 var ComponentBase = require('./ComponentBase.js');
-var utils = require('../utils.js');
 
 class MultiSelect extends ComponentBase.ComponentBase {
   constructor(ctx, element) {
     super(ctx, element);
   }
-  static getContainer(ctx, root) {
-    const base = root ?? ctx.page;
-    if (semver.gte(ctx.grafanaVersion, "13.1.0")) {
-      return base.locator(utils.resolveGrafanaSelector(ctx.selectors.components.MultiSelect.container)).locator("xpath=..").first();
-    }
-    return base.locator('[class*="-grafana-select-value-container-multi"]').locator("xpath=..").first();
-  }
-  within(root) {
-    return new MultiSelect(this.ctx, MultiSelect.getContainer(this.ctx, root));
-  }
   async selectOptions(values, options) {
     const menu = await Select.openSelect(this, options);
     const selected = [];

package/dist/models/components/Panel.js

@@ -1,27 +1,8 @@
 'use strict';
 
-var semver = require('semver');
+var version = require('../../utils/version.js');
 var GrafanaPage = require('../pages/GrafanaPage.js');
 
-function _interopNamespaceDefault(e) {
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var semver__namespace = /*#__PURE__*/_interopNamespaceDefault(semver);
-
 const ERROR_STATUS = "error";
 class Panel extends GrafanaPage.GrafanaPage {
   constructor(ctx, locator) {
@@ -47,7 +28,7 @@ class Panel extends GrafanaPage.GrafanaPage {
    */
   get data() {
     const panel = this.locator;
-    if (semver__namespace.lt(this.ctx.grafanaVersion, "12.2.0")) {
+    if (version.lt(this.ctx.grafanaVersion, "12.2.0")) {
       return panel.locator('[role="cell"]');
     }
     return panel.locator('[role="gridcell"]');
@@ -66,7 +47,7 @@ class Panel extends GrafanaPage.GrafanaPage {
       this.ctx.selectors.components.Panels.Panel.menuItems(options?.parentItem ?? "")
     );
     let menuItem = this.getByGrafanaSelector(this.ctx.selectors.components.Panels.Panel.menuItems(item));
-    if (semver__namespace.lt(this.ctx.grafanaVersion, "9.5.0")) {
+    if (version.lt(this.ctx.grafanaVersion, "9.5.0")) {
       panelMenu = this.locator.getByRole("heading");
       parentMenuItem = this.ctx.page.getByText(options?.parentItem ?? "");
       menuItem = this.ctx.page.getByRole("menu").getByText(item);
@@ -112,7 +93,7 @@ class Panel extends GrafanaPage.GrafanaPage {
    */
   getErrorIcon() {
     let selector = this.ctx.selectors.components.Panels.Panel.status(ERROR_STATUS);
-    if (semver__namespace.lt(this.ctx.grafanaVersion, "9.5.0")) {
+    if (version.lt(this.ctx.grafanaVersion, "9.5.0")) {
       selector = this.ctx.selectors.components.Panels.Panel.headerCornerInfo(ERROR_STATUS);
     }
     return this.getByGrafanaSelector(selector, {

package/dist/models/components/PanelEditOptionsGroup.js

@@ -5,7 +5,7 @@ var UnitPicker = require('./UnitPicker.js');
 var Select = require('./Select.js');
 var MultiSelect = require('./MultiSelect.js');
 var Switch = require('./Switch.js');
-var semver = require('semver');
+var version = require('../../utils/version.js');
 var RadioGroup = require('./RadioGroup.js');
 var utils = require('../utils.js');
 
@@ -34,7 +34,7 @@ class PanelEditOptionsGroup {
     await this.getOptionsGroupToggle().click();
   }
   getRadioGroup(label) {
-    if (semver.gte(this.ctx.grafanaVersion, "10.2.0")) {
+    if (version.gte(this.ctx.grafanaVersion, "10.2.0")) {
       return new RadioGroup.RadioGroup(this.ctx, this.getFieldLocator(label).getByRole("radiogroup"));
     }
     return new RadioGroup.RadioGroup(this.ctx, this.getFieldLocator(label));
@@ -49,7 +49,7 @@ class PanelEditOptionsGroup {
     return this.getFieldLocator(label).getByRole("spinbutton");
   }
   getSliderInput(label) {
-    if (semver.gte(this.ctx.grafanaVersion, "9.1.0") && semver.lt(this.ctx.grafanaVersion, "13.1.0-25389005429")) {
+    if (version.gte(this.ctx.grafanaVersion, "9.1.0") && version.lt(this.ctx.grafanaVersion, "13.1.0-25389005429")) {
       return this.getNumberInput(label);
     }
     return this.getTextInput(label);
@@ -74,7 +74,7 @@ class PanelEditOptionsGroup {
   }
   getOptionsGroupToggle() {
     const selector = utils.resolveGrafanaSelector(this.ctx.selectors.components.OptionsGroup.toggle(this.groupLabel));
-    if (semver.gte(this.ctx.grafanaVersion, "10.0.0")) {
+    if (version.gte(this.ctx.grafanaVersion, "10.0.0")) {
       return this.element.locator(selector);
     }
     return this.element.locator(selector).getByRole("button");

package/dist/models/components/RadioGroup.js

@@ -1,28 +1,14 @@
 'use strict';
 
 var ComponentBase = require('./ComponentBase.js');
-var semver = require('semver');
-var utils = require('../utils.js');
+var version = require('../../utils/version.js');
 
 class RadioGroup extends ComponentBase.ComponentBase {
   constructor(ctx, element) {
     super(ctx, element);
   }
-  static getContainer(ctx, root) {
-    const base = root ?? ctx.page;
-    if (semver.gte(ctx.grafanaVersion, "13.1.0")) {
-      return base.locator(utils.resolveGrafanaSelector(ctx.selectors.components.RadioGroup.container)).first();
-    }
-    if (semver.gte(ctx.grafanaVersion, "10.0.0")) {
-      return base.locator('[role="radiogroup"]').first();
-    }
-    return base.locator('div:has(> input[type="radio"]), div:has(> div > input[type="radio"])').first();
-  }
-  within(root) {
-    return new RadioGroup(this.ctx, RadioGroup.getContainer(this.ctx, root));
-  }
   async check(labelOrValue, options) {
-    if (semver.gte(this.ctx.grafanaVersion, "10.2.0")) {
+    if (version.gte(this.ctx.grafanaVersion, "10.2.0")) {
       return this.element.getByLabel(labelOrValue, { exact: true }).check(options);
     }
     return this.element.getByText(labelOrValue, { exact: true }).check(options);