Merge remote-tracking branch 'upstream/main' into ou-923

Author: Fewwy

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/nodejs-20:1-59 AS web-builder
+FROM registry.redhat.io/ubi9/nodejs-22:9.6-1755075210 AS web-builder
 
 WORKDIR /opt/app-root
 

Dockerfile.dev-mcp

@@ -1,6 +1,6 @@
 # mcp (monitoring-console-plugin)
 
-FROM registry.redhat.io/ubi9/nodejs-20:1-59 AS web-builder
+FROM registry.redhat.io/ubi9/nodejs-22:9.6-1755075210 AS web-builder
 
 USER 0
 

Dockerfile.konflux

@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/nodejs-18:latest AS web-builder
+FROM registry.redhat.io/ubi9/nodejs-22:9.6-1755075210 AS web-builder
 
 WORKDIR /opt/app-root
 

Dockerfile.mcp

@@ -1,6 +1,6 @@
 # mcp (monitoring-console-plugin)
 
-FROM registry.redhat.io/ubi9/nodejs-20:1-59 AS web-builder
+FROM registry.redhat.io/ubi9/nodejs-22:9.6-1755075210 AS web-builder
 
 USER 0
 

Dockerfile.test

@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/nodejs-20:1-59 AS web-builder
+FROM registry.redhat.io/ubi9/nodejs-22:9.6-1755075210 AS web-builder
 
 USER 0
 

README.md

@@ -137,7 +137,7 @@ Since the store for the `monitoring-plugin` is stored in the `openshift/console`
 # Login to an OpenShift cluster
 $ oc login <clusterAddress> -u <username> -p <password>
 
-# Start podman (or Docker)
+# Start podman (or Docker) - Linux machines can skip this part 
 $ podman machine init
 $ podman machine start
 
@@ -148,10 +148,10 @@ $ make install
 $ make start-frontend
 
 # In a separate terminal
-$ make start-feature-backend
+$ make start-feature-console
 
 # In a separate terminal
-$ make start-feature-console
+$ make start-feature-backend
 ```
 
 `make start-feature-backend` will inject the `perses-dashboards`, `incidents`, and `dev-config` features by default. Features such as `acm-alerting` which take in extra parameters will need to run the `make start-feature-backend` command with the appropriate environment variables, such as `MONITORING_PLUGIN_ALERTMANAGER`.

web/.eslintrc.yml

@@ -6,6 +6,7 @@ extends:
   - plugin:react/recommended
   - plugin:react-hooks/recommended
   - plugin:@typescript-eslint/recommended
+  - plugin:react/jsx-runtime
   - prettier
 parser: '@typescript-eslint/parser'
 parserOptions:

web/cypress.config.ts

@@ -21,6 +21,7 @@ export default defineConfig({
     ),
     LOGIN_USERNAME: process.env.CYPRESS_LOGIN_USERS.split(',')[0].split(':')[0],
     LOGIN_PASSWORD: process.env.CYPRESS_LOGIN_USERS.split(',')[0].split(':')[1],
+    typeDelay: 200,
   },
   fixturesFolder: 'fixtures',
   defaultCommandTimeout: 80000, //due to performance loading issue on console

web/cypress/downloads/openshift.csv

@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 export {
   ActionServiceProvider,
   BlueInfoCircleIcon,