Merge branch 'main' into CONSOLE-4626

Author: krishagarwal278

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/nodejs-16:latest AS build
+FROM registry.access.redhat.com/ubi9/nodejs-22:latest AS build
 USER root
 RUN command -v yarn || npm i -g yarn
 
@@ -11,4 +11,4 @@ FROM registry.access.redhat.com/ubi8/nginx-120:latest
 COPY --from=build /usr/src/app/dist /usr/share/nginx/html
 USER 1001
 
-ENTRYPOINT ["nginx", "-g", "daemon off;"]
+ENTRYPOINT ["nginx", "-g", "daemon off;"]

integration-tests/views/common.ts

@@ -18,8 +18,16 @@ export const installHelmChart = (path: string) => {
     result.stdout &&
       cy.log("Successfully installed helm chart: ", result.stdout);
   });
-  cy.byTestID("refresh-web-console", { timeout: 300000 }).should("exist");
-  cy.reload();
+  // cy.byTestID("refresh-web-console", { timeout: 300000 }).should("exist");
+  cy.visit(
+    "/k8s/cluster/operator.openshift.io~v1~Console/cluster/console-plugins"
+  );
+  // TODO: make this less brittle once data-test attributes are added to the table
+  cy.get('table[aria-label="console plugins table"]').should("exist");
+  cy.get(
+    'table[aria-label="console plugins table"] tbody tr:first-child td:nth-child(4)'
+  ).should("include.text", "Loaded");
+  // cy.reload();
 };
 
 export const deleteHelmChart = (path: string) => {

package.json

@@ -19,8 +19,8 @@
   },
   "devDependencies": {
     "@cypress/webpack-preprocessor": "^6.0.0",
-    "@openshift-console/dynamic-plugin-sdk": "^1.0.0",
-    "@openshift-console/dynamic-plugin-sdk-webpack": "^1.0.0",
+    "@openshift-console/dynamic-plugin-sdk": "^4.19.0",
+    "@openshift-console/dynamic-plugin-sdk-webpack": "^4.19.0",
     "@patternfly/react-core": "6.2.0",
     "@patternfly/react-icons": "6.2.0",
     "@patternfly/react-table": "6.2.0",