Update codeowners (#809)

Author: kevinwcyu

.github/CODEOWNERS

@@ -11,4 +11,4 @@
 # In each subsection folders are ordered first by depth, then alphabetically.
 # This should make it easy to add new rules without breaking existing ones.
 
-* @grafana/aws-datasources
+* @grafana/data-sources-plugins

.github/workflows/publish.yaml

@@ -40,7 +40,6 @@ jobs:
         ACCESS_KEY=e2e:accessKey
         SECRET_KEY=e2e:secretKey
       github-draft-release: false # publish the github release directly, skipping the draft step
-      run-playwright-with-skip-grafana-react-19-preview-image: true
 
       # Scope for the plugin published to the catalog. Setting this to "grafana_cloud" will make it visible only in Grafana Cloud
       # (and hide it for on-prem). This is required for some provisioned plugins.

.github/workflows/push.yaml

@@ -21,4 +21,3 @@ jobs:
       playwright-secrets: |
         ACCESS_KEY=e2e:accessKey
         SECRET_KEY=e2e:secretKey
-      run-playwright-with-skip-grafana-react-19-preview-image: true

package.json

@@ -41,7 +41,7 @@
     "@eslint/js": "9.39.2",
     "@grafana/aws-sdk": "0.10.2",
     "@grafana/eslint-config": "9.0.0",
-    "@grafana/plugin-e2e": "3.4.5",
+    "@grafana/plugin-e2e": "3.4.12",
     "@grafana/tsconfig": "2.0.1",
     "@openfeature/core": "1.9.2",
     "@openfeature/web-sdk": "1.7.3",

playwright.config.ts

@@ -36,9 +36,19 @@ export default defineConfig<PluginOptions>({
   use: {
     /* Base URL to use in actions like `await page.goto('/')`. */
     baseURL: 'http://localhost:3000',
+    featureToggles: {
+      dashboardNewLayouts: false,
+      multiPropsVariables: false,
+    },
+    openFeature: {
+      flags: {
+        splashScreen: false,
+      },
+    },
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
+    trace: 'on',
+    video: 'on',
   },
 
   /* Configure projects for major browsers */

src/ConfigEditor/ConfigEditor.tsx

@@ -41,7 +41,7 @@ type Workgroup = {
 type InputResourceType = 'dbUser' | 'database';
 
 export function ConfigEditor(props: Props) {
-  const baseURL = `/api/datasources/${props.options.id}`;
+  const baseURL = `/api/datasources/uid/${props.options.uid}`;
   const resourcesURL = `${baseURL}/resources`;
   const { jsonData } = props.options;
   const [saved, setSaved] = useState(!!jsonData.defaultRegion);

tests/alertRule.spec.ts

@@ -14,9 +14,30 @@ test('should successfully create an alert rule', async ({
 }) => {
   const ds = await readProvisionedDataSource({ fileName: 'aws-redshift-e2e.yaml', name: 'AWS Redshift E2E' });
   const queryA = alertRuleEditPage.getAlertRuleQueryRow('A');
-  await queryA.datasource.set(ds.name);
-  await page.waitForFunction(() => window.monaco);
-  await queryA.getByGrafanaSelector(selectors.components.CodeEditor.container).click();
+
+  try {
+    await queryA.datasource.set(ds.name);
+    await page.waitForFunction(() => window.monaco);
+    await queryA.getByGrafanaSelector(selectors.components.CodeEditor.container).click();
+  } catch {
+    // TODO: Remove this fallback once @grafana/plugin-e2e picks up the Grafana 13 query-row selectors.
+    const queryEditorRow = alertRuleEditPage.getByGrafanaSelector('data-testid Query editor row').filter({
+      has: alertRuleEditPage.getByGrafanaSelector('data-testid Query editor row title A'),
+    });
+    const datasourcePicker = queryEditorRow.getByTestId(selectors.components.DataSourcePicker.inputV2);
+
+    await expect(datasourcePicker).toBeVisible();
+    await datasourcePicker.fill(ds.name);
+    await page.keyboard.press('ArrowDown');
+    await page.keyboard.press('ArrowUp');
+    await page.keyboard.press('Enter');
+
+    await page.waitForFunction(() => window.monaco);
+    await alertRuleEditPage
+      .getByGrafanaSelector(selectors.components.CodeEditor.container, { root: queryEditorRow })
+      .click();
+  }
+
   await page.keyboard.insertText('SELECT environment, temperature FROM public.long_format_example limit 2');
   await expect(alertRuleEditPage.evaluate()).toBeOK();
 });

yarn.lock

@@ -1531,14 +1531,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/e2e-selectors@npm:13.0.0-22898798261":
-  version: 13.0.0-22898798261
-  resolution: "@grafana/e2e-selectors@npm:13.0.0-22898798261"
+"@grafana/e2e-selectors@npm:13.0.0-23624974663":
+  version: 13.0.0-23624974663
+  resolution: "@grafana/e2e-selectors@npm:13.0.0-23624974663"
   dependencies:
     semver: "npm:^7.7.0"
     tslib: "npm:2.8.1"
     typescript: "npm:5.9.2"
-  checksum: 10c0/d437e29cb25e4974088ab9108d0489dd3c9fb599d03b46a480814bcdb36ee62bae6b5cad865137665ae8d1d0a23eb74b9e8cee34f386a5738e68eaddeb53bd36
+  checksum: 10c0/714095fbf1932c49a923027e0d6d5e6d89f7dd06070e512716f58a7a2241eeac10b24ef9427b5ff5a21b2e4df43240ed2532676197e5daa75e7828b044e7bc54
   languageName: node
   linkType: hard
 
@@ -1598,11 +1598,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/plugin-e2e@npm:3.4.5":
-  version: 3.4.5
-  resolution: "@grafana/plugin-e2e@npm:3.4.5"
+"@grafana/plugin-e2e@npm:3.4.12":
+  version: 3.4.12
+  resolution: "@grafana/plugin-e2e@npm:3.4.12"
   dependencies:
-    "@grafana/e2e-selectors": "npm:13.0.0-22898798261"
+    "@grafana/e2e-selectors": "npm:13.0.0-23624974663"
     semver: "npm:^7.5.4"
     uuid: "npm:^13.0.0"
     yaml: "npm:^2.3.4"
@@ -1612,7 +1612,7 @@ __metadata:
   peerDependenciesMeta:
     "@axe-core/playwright":
       optional: true
-  checksum: 10c0/f125153cd7ff222e24c418bff805263872d2c0012a24ecf83f00f7b9e0a3369b2283e04a3d234d03c43aec779ce7e6aed9de418ebb9769233589937e02c8760a
+  checksum: 10c0/b87340d2cb04bcbcaf7676d61f8f990fd26ba1d8f53cfb922e89a4751ede29bbe61021d770d3a9ebdf4500fe404fe6512ddea03be4d1c08ee15d22e9e5a376e7
   languageName: node
   linkType: hard
 
@@ -7508,7 +7508,7 @@ __metadata:
     "@grafana/aws-sdk": "npm:0.10.2"
     "@grafana/data": "npm:12.4.1"
     "@grafana/eslint-config": "npm:9.0.0"
-    "@grafana/plugin-e2e": "npm:3.4.5"
+    "@grafana/plugin-e2e": "npm:3.4.12"
     "@grafana/plugin-ui": "npm:^0.13.0"
     "@grafana/runtime": "npm:12.4.1"
     "@grafana/schema": "npm:12.4.1"