diff --git a/.changeset/neat-rats-decide.md b/.changeset/neat-rats-decide.md
new file mode 100644
index 000000000..d6279186f
--- /dev/null
+++ b/.changeset/neat-rats-decide.md
@@ -0,0 +1,6 @@
+---
+"@cloudoperators/juno-app-heureka": patch
+"@cloudoperators/juno-app-greenhouse": patch
+---
+
+Add Default Vulnerability Filter to issueMatches entity and renames tab to Vulnerabilities instead of Issues
diff --git a/apps/heureka/src/components/CustomAppShell.jsx b/apps/heureka/src/components/CustomAppShell.jsx
index a5f99ea48..feb9d1962 100644
--- a/apps/heureka/src/components/CustomAppShell.jsx
+++ b/apps/heureka/src/components/CustomAppShell.jsx
@@ -14,7 +14,7 @@ import constants from "./shared/constants"
// Configuration for navigation items and their respective components
const VIEW_CONFIG = {
Services: { label: "Services", icon: "dns", component: ServicesView },
- IssueMatches: { label: "Issues", icon: "autoAwesomeMotion", component: IssueMatchesView },
+ IssueMatches: { label: "Vulnerabilities", icon: "autoAwesomeMotion", component: IssueMatchesView },
Components: { label: "Images", icon: "autoAwesomeMotion", component: ComponentsView }, // Commented out to remove ComponentsView for MVP version
}
diff --git a/apps/heureka/src/components/components/ComponentsList.jsx b/apps/heureka/src/components/components/ComponentsList.jsx
index 8d11e5f11..751ca73ad 100644
--- a/apps/heureka/src/components/components/ComponentsList.jsx
+++ b/apps/heureka/src/components/components/ComponentsList.jsx
@@ -59,7 +59,7 @@ const ComponentsList = ({ items, isLoading }) => {
) : (
-
+
)}
diff --git a/apps/heureka/src/components/issueMatches/IssueMatchesDetails.jsx b/apps/heureka/src/components/issueMatches/IssueMatchesDetails.jsx
index 3c2454975..2e4948935 100644
--- a/apps/heureka/src/components/issueMatches/IssueMatchesDetails.jsx
+++ b/apps/heureka/src/components/issueMatches/IssueMatchesDetails.jsx
@@ -82,7 +82,7 @@ const IssueMatchesDetails = () => {
- Support Group Name
+ Support Group
@@ -126,12 +126,6 @@ const IssueMatchesDetails = () => {
)}
-
-
- Issue Type
-
- {}
-
>
diff --git a/apps/heureka/src/components/issueMatches/IssueMatchesList.jsx b/apps/heureka/src/components/issueMatches/IssueMatchesList.jsx
index ce2e31c06..22334c1fa 100644
--- a/apps/heureka/src/components/issueMatches/IssueMatchesList.jsx
+++ b/apps/heureka/src/components/issueMatches/IssueMatchesList.jsx
@@ -26,7 +26,7 @@ const IssueMatchesList = ({ items, isLoading }) => {
{isLoading && !items ? (
-
+
) : (
@@ -40,7 +40,7 @@ const IssueMatchesList = ({ items, isLoading }) => {
) : (
-
+
)}
diff --git a/apps/heureka/src/components/issueMatches/IssueMatchesView.jsx b/apps/heureka/src/components/issueMatches/IssueMatchesView.jsx
index 108384fb3..2e5f3f334 100644
--- a/apps/heureka/src/components/issueMatches/IssueMatchesView.jsx
+++ b/apps/heureka/src/components/issueMatches/IssueMatchesView.jsx
@@ -13,6 +13,7 @@ import {
useIssueMatchesFilterLabels,
useIssueMatchesFilterLabelValues,
useIssueMatchesSearchTerm,
+ useGlobalsActions,
} from "../StoreProvider"
const IssueMatchesView = () => {
@@ -21,6 +22,12 @@ const IssueMatchesView = () => {
const labels = useIssueMatchesFilterLabels()
const filterLabelValues = useIssueMatchesFilterLabelValues()
const searchTerm = useIssueMatchesSearchTerm()
+
+ // Access filter actions
+ const { setQueryOptions } = useGlobalsActions()
+
+ setQueryOptions("IssueMatches", { filter: { issueType: ["Vulnerability"] } })
+
return (
<>
diff --git a/apps/heureka/src/components/services/ComponentInstancesList.jsx b/apps/heureka/src/components/services/ComponentInstancesList.jsx
index 6801029f0..8dd532aa5 100644
--- a/apps/heureka/src/components/services/ComponentInstancesList.jsx
+++ b/apps/heureka/src/components/services/ComponentInstancesList.jsx
@@ -44,7 +44,7 @@ const ComponentInstancesList = ({ serviceCcrn }) => {
Name
Version
- Total Number of Issues
+ Total Number of Vulnerabilities
Highest Severity
{isLoading ? (
@@ -56,7 +56,7 @@ const ComponentInstancesList = ({ serviceCcrn }) => {
) : items.length === 0 ? (
-
+
) : (
items.map((componentInstance, i) => (
diff --git a/apps/heureka/src/components/services/ServicesList.jsx b/apps/heureka/src/components/services/ServicesList.jsx
index ee8973d74..826548166 100644
--- a/apps/heureka/src/components/services/ServicesList.jsx
+++ b/apps/heureka/src/components/services/ServicesList.jsx
@@ -30,16 +30,16 @@ const ServicesList = ({ items, isLoading }) => {
- Components
- Total Number of Component Instances
+ Pods
+ Total Number of Pods
- Issues
- Total Number of IssueMatches
+ Vulnerabilities
+ Total Number of Vulnerabilities
diff --git a/apps/heureka/src/lib/queries/issueMatchesFilterValues.js b/apps/heureka/src/lib/queries/issueMatchesFilterValues.js
index 167ab66fb..1b2c7571b 100644
--- a/apps/heureka/src/lib/queries/issueMatchesFilterValues.js
+++ b/apps/heureka/src/lib/queries/issueMatchesFilterValues.js
@@ -22,11 +22,6 @@ export default () => gql`
filterName
values
}
- issueType {
- displayName
- filterName
- values
- }
affectedService {
displayName
filterName
diff --git a/apps/heureka/src/lib/slices/createGlobalsSlice.js b/apps/heureka/src/lib/slices/createGlobalsSlice.js
index 13342b565..be4dd6969 100644
--- a/apps/heureka/src/lib/slices/createGlobalsSlice.js
+++ b/apps/heureka/src/lib/slices/createGlobalsSlice.js
@@ -53,7 +53,10 @@ const createGlobalsSlice = (set, get, options) => ({
setQueryOptions: (viewName, options) =>
set(
produce((state) => {
- state.globals.views[viewName].queryOptions = options
+ state.globals.views[viewName].queryOptions = {
+ ...state.globals.views[viewName].queryOptions,
+ ...options,
+ }
}),
false,
"globals/setQueryOptions"