Merge pull request #173 from PeterYurkovich/ou-962-merge-main-into-release

OU-962: Update release branch with main

Author: openshift-merge-bot[bot]

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/nodejs-18:latest AS web-builder
+FROM registry.access.redhat.com/ubi8/nodejs-22:latest AS web-builder
 
 WORKDIR /opt/app-root
 
@@ -11,7 +11,7 @@ RUN make install-frontend
 COPY web/ web/
 RUN make build-frontend
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17 as go-builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.20 as go-builder
 
 WORKDIR /opt/app-root
 

Dockerfile.dev

@@ -1,5 +1,5 @@
 # This Dockerfile is used for local testing of images. All images should be available for public use
-FROM registry.access.redhat.com/ubi9/nodejs-18:latest AS web-builder
+FROM registry.access.redhat.com/ubi9/nodejs-22:latest AS web-builder
 
 WORKDIR /opt/app-root
 

Dockerfile.konflux

@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/nodejs-18:latest AS web-builder
+FROM registry.redhat.io/ubi9/nodejs-22:latest AS web-builder
 
 WORKDIR /opt/app-root
 
@@ -12,7 +12,7 @@ RUN make install-frontend-ci
 COPY web/ web/
 RUN make build-frontend
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22 as go-builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24 as go-builder
 
 WORKDIR /opt/app-root
 

Dockerfile.test

@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/nodejs-18:latest AS web-builder
+FROM registry.redhat.io/ubi9/nodejs-22:latest AS web-builder
 
 WORKDIR /opt/app-root
 
@@ -11,4 +11,4 @@ RUN make install-frontend-ci
 
 COPY web/ web/
 
-ENTRYPOINT ["make", "lint-frontend"]
+ENTRYPOINT ["make", "lint-frontend"]

Makefile

@@ -18,7 +18,7 @@ install-frontend-ci-clean: install-frontend-ci
 	cd web && npm cache clean --force
 
 .PHONY: build-frontend
-build-frontend:
+build-frontend: lint-frontend
 	cd web && npm run i18n && npm run build
 
 .PHONY: start-frontend
@@ -31,7 +31,7 @@ start-console:
 
 .PHONY: lint-frontend
 lint-frontend:
-	cd web && npm run lint
+	cd web && npm run lint && npm run lint:tsc
 
 .PHONY: install-backend
 install-backend:
@@ -45,15 +45,18 @@ build-backend:
 start-backend:
 	go run ./cmd/plugin-backend.go -port='9002' -config-path='./web/dist' -static-path='./web/dist' -plugin-config-path='ct.yaml'
 
+.PHONY: install
+install: install-frontend install-backend
+
 .PHONY: build-image
-build-image: test-frontend
+build-image: build-frontend test-frontend
 	./scripts/build-image.sh
 
 .PHONY: start-forward
 start-forward:
 	./scripts/start-forward.sh
 
-export REGISTRY_ORG?=openshift-observability-ui
+export REGISTRY_ORG?=	openshift-observability-ui
 export TAG?=latest
 IMAGE=quay.io/${REGISTRY_ORG}/troubleshooting-panel-console-plugin:${TAG}
 

devspace.yaml

@@ -31,6 +31,7 @@ dev:
     sync:
       - path: ./web/dist:/opt/app-root/web/dist
         startContainer: true
+        printLogs: true
     command: ["make"]
     args: ["start-devspace-backend"]
     # Inject a lightweight SSH server into the container (so your IDE can connect to the remote dev env)

go.mod

@@ -1,6 +1,6 @@
 module github.com/openshift/troubleshooting-panel-console-plugin
 
-go 1.22.1
+go 1.24.0
 
 require (
 	github.com/evanphx/json-patch v0.5.2

web/integration-tests/cypress.config.js

@@ -1,6 +1,7 @@
-const { defineConfig } = require('cypress');
+import { defineConfig } from 'cypress';
+import plugin from './plugins/index';
 
-module.exports = defineConfig({
+export default defineConfig({
   viewportWidth: 1920,
   viewportHeight: 1080,
   screenshotsFolder: './screenshots',
@@ -18,7 +19,7 @@ module.exports = defineConfig({
   },
   e2e: {
     setupNodeEvents(on, config) {
-      return require('./plugins/index.ts')(on, config);
+      return plugin(on, config);
     },
     specPattern: 'tests/**/*.cy.{js,jsx,ts,tsx}',
     supportFile: false,

web/integration-tests/plugins/index.ts

@@ -1,4 +1,4 @@
-import * as wp from '@cypress/webpack-preprocessor';
+import wp from '@cypress/webpack-preprocessor';
 
 module.exports = (on, config) => {
   const options = {

web/locales/en/plugin__troubleshooting-panel-console-plugin.json

@@ -1,24 +1,34 @@
 {
+  "Advanced": "Advanced",
+  "Ago": "Ago",
   "Correlation result was empty.": "Correlation result was empty.",
-  "Depth": "Depth",
-  "Find related resources.": "Find related resources.",
+  "Create a graph of items correlated from resources in the current page.": "Create a graph of items correlated from resources in the current page.",
+  "Distance": "Distance",
+  "Find all paths to items of the specified goal class.": "Find all paths to items of the specified goal class.",
   "Focus": "Focus",
-  "Generate a correlation graph starting from resources in the current view.": "Generate a correlation graph starting from resources in the current view.",
-  "Goal directed search": "Goal directed search",
+  "Follows correlation rules from the starting point to find related data, then continues the search from that data, up to the number of steps you specify.": "Follows correlation rules from the starting point to find related data, then continues the search from that data, up to the number of steps you specify.",
+  "Goal Class": "Goal Class",
   "Korrel8r Error": "Korrel8r Error",
+  "Loading": "Loading",
   "Logging Plugin Disabled": "Logging Plugin Disabled",
-  "Neighbourhood search": "Neighbourhood search",
   "Netflow Plugin Disabled": "Netflow Plugin Disabled",
   "No Correlated Signals Found": "No Correlated Signals Found",
   "Open the Troubleshooting Panel": "Open the Troubleshooting Panel",
-  "Query to select the starting resources for correlation.": "Query to select the starting resources for correlation.",
-  "Refresh the graph using the current search settings": "Refresh the graph using the current search settings",
+  "Query": "Query",
+  "Quickly diagnose and resolve issues by exploring correlated observability signals for resources.": "Quickly diagnose and resolve issues by exploring correlated observability signals for resources.",
+  "Range": "Range",
+  "Recent": "Recent",
+  "Refresh the graph using the current settings": "Refresh the graph using the current settings",
   "Request Failed": "Request Failed",
-  "Search for  correlated resources up to the specified depth.": "Search for  correlated resources up to the specified depth.",
-  "Search for paths to resources of the specified class.": "Search for paths to resources of the specified class.",
-  "The current view does not support correlation.": "The current view does not support correlation.",
+  "Return only results in the specified time range.": "Return only results in the specified time range.",
+  "Return only results more recent than the specified duration.": "Return only results more recent than the specified duration.",
+  "Search Type": "Search Type",
+  "Selects the starting point for correlation search. This query is set automatically by the <1>Focus</1> button. You can edit it manually to specify a custom query.": "Selects the starting point for correlation search. This query is set automatically by the <1>Focus</1> button. You can edit it manually to specify a custom query.",
+  "Since": "Since",
+  "The current page does not support correlation.": "The current page does not support correlation.",
+  "Time": "Time",
+  "to": "to",
   "Troubleshooting": "Troubleshooting",
   "Troubleshooting Panel": "Troubleshooting Panel",
-  "Unable to find Console Link": "Unable to find Console Link",
-  "Update": "Update"
+  "Unable to find Console Link": "Unable to find Console Link"
 }