Update dependencies II

Author: lpetrora

.config/jest/utils.js

@@ -14,12 +14,18 @@ const nodeModulesToTransform = (moduleNames) => `node_modules\/(?!.*(${moduleNam
 const grafanaESModules = [
   '.pnpm', // Support using pnpm symlinked packages
   '@grafana/schema',
+  '@wojtekmaj/date-utils',
   'd3',
   'd3-color',
   'd3-force',
   'd3-interpolate',
   'd3-scale-chromatic',
+  'get-user-locale',
+  'marked',
+  'memoize',
+  'mimic-function',
   'ol',
+  'react-calendar',
   'react-colorful',
   'rxjs',
   'uuid',

jest.config.js

@@ -6,6 +6,5 @@ process.env.TZ = 'UTC';
 module.exports = {
   // Jest configuration provided by Grafana scaffolding
   ...require('./.config/jest.config'),
-  //testMatch: ['<rootDir>/test/unit/**/*.{spec,test,jest}.{js,jsx,ts,tsx}'],
   testMatch: ['**/tests/unit/**/*.{spec,test,jest}.{js,jsx,ts,tsx}'],
 };

package-lock.json

@@ -28,10 +28,10 @@
   "devDependencies": {
     "@babel/core": "^7.28.5",
     "@grafana/eslint-config": "^7.0.0",
-    "@grafana/plugin-e2e": "^1.19.4",
+    "@grafana/plugin-e2e": "^2.2.0",
     "@grafana/tsconfig": "^2.0.1",
     "@playwright/test": "^1.56.1",
-    "@swc/core": "^1.13.5",
+    "@swc/core": "^1.13.20",
     "@swc/helpers": "^0.5.17",
     "@swc/jest": "^0.2.39",
     "@testing-library/jest-dom": "6.9.1",
@@ -45,7 +45,7 @@
     "css-loader": "^7.1.2",
     "dotenv": "^17.2.3",
     "eslint-plugin-deprecation": "^3.0.0",
-    "eslint-webpack-plugin": "^4.2.0",
+    "eslint-webpack-plugin": "^5.0.0",
     "fork-ts-checker-webpack-plugin": "^9.1.0",
     "glob": "^11.0.3",
     "identity-obj-proxy": "3.0.0",
@@ -73,9 +73,10 @@
   "dependencies": {
     "@emotion/css": "^11.13.5",
     "@grafana/data": "^12.0.2",
-    "@grafana/runtime": "^11.6.2",
-    "@grafana/schema": "^11.6.2",
-    "@grafana/ui": "^11.6.2",
+    "@grafana/i18n": "^12.2.0",
+    "@grafana/runtime": "^12.2.0",
+    "@grafana/schema": "^12.2.0",
+    "@grafana/ui": "^12.2.0",
     "process": "^0.11.10",
     "react": "18.3.1",
     "react-dom": "18.3.1",

package.json

@@ -572,6 +572,7 @@ export const OnlyActiveChildren = (props: OnlyActiveChildrenProps): React.JSX.El
                     <Button
                       icon="minus"
                       data-test-id={'cmk-oac-minus-button-' + getLabel(elem)}
+                      aria-label={`Remove ${getLabel(elem)} filter`}
                       variant="secondary"
                       onClick={() =>
                         setActiveComponents((c) => {

src/ui/components.tsx

@@ -30,7 +30,7 @@ export class CmkRawQueryEditorPage extends CmkQueryEditorPage {
   }
 
   async _filterBy(fieldLabel: string, value: string) {
-    await this.page.getByLabel(fieldLabel).fill(value);
+    await this.page.getByLabel(fieldLabel, { exact: true }).fill(value);
     await this.expectSpinners(false);
     await this.page.keyboard.press('Enter');
     await this.expectSpinners(false);

tests/e2e/pom/CMKRawQueryEditorPage.ts

@@ -19,10 +19,10 @@ export class CmkCEEQueryEditorPage extends CmkQueryEditorPage {
 
   async filterByHostname(hostname: string) {
     await this.addFilter(FilterTypes.HOSTNAME);
-    await this.page.getByLabel(FilterTypes.HOSTNAME).fill(hostname);
+    await this.page.getByLabel(FilterTypes.HOSTNAME, { exact: true }).fill(hostname);
     await this.expectSpinners(false);
     await this.page.keyboard.press('Enter');
-    await this.page.getByLabel(FilterTypes.HOSTNAME).blur();
+    await this.page.getByLabel(FilterTypes.HOSTNAME, { exact: true }).blur();
     await this.expectSpinners(false);
   }
 
@@ -48,15 +48,15 @@ export class CmkCEEQueryEditorPage extends CmkQueryEditorPage {
 
   async filterByService(service: Services) {
     await this.addFilter(FilterTypes.SERVICE);
-    await this.page.getByLabel('Service').fill(service);
+    await this.page.getByLabel('Service', { exact: true }).fill(service);
     await this.expectSpinners(false);
     await this.page.keyboard.press('Enter');
     await this.expectSpinners(false);
   }
 
   async filterByHostLabel(label: string) {
     await this.addFilter(FilterTypes.HOST_LABELS);
-    await this.page.getByLabel(FilterTypes.HOST_LABELS).fill(label);
+    await this.page.getByLabel(FilterTypes.HOST_LABELS, { exact: true }).fill(label);
     await this.expectSpinners(false);
     await this.page.keyboard.press('Enter');
     await this.expectSpinners(false);
@@ -72,7 +72,7 @@ export class CmkCEEQueryEditorPage extends CmkQueryEditorPage {
     if (testId) {
       component = this.page.getByTestId(testId);
     } else {
-      component = this.page.getByLabel(filter);
+      component = this.page.getByLabel(filter, { exact: true });
     }
 
     await expect(component).toBeVisible();

tests/e2e/pom/CmkCEEQueryEditorPage.ts

@@ -63,7 +63,7 @@ export class CmkQueryEditorPage extends CmkBasePage {
 
   async _selectGraph(componentLabel: string, graph: Graphs) {
     await wait(1000);
-    const locator = this.page.getByLabel(componentLabel);
+    const locator = this.page.getByLabel(componentLabel, { exact: true });
     await this.expectSpinners(false);
     await locator.fill(graph);
     await this.expectSpinners(false);