chore(heureka): renames Issues to Vulnerabilities tab with the defaul…

…t filter of issueType is Vulnerability (#660) * chore(heureka): shows only vulnerabilities from issueMatches entity * chore(heureka): adds changeset
cloudoperators · Dec 10, 2024 · d07a3cb · d07a3cb
1 parent 3471a77
commit d07a3cb
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 23 deletions.
diff --git a/.changeset/neat-rats-decide.md 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
@@ -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
@@ -59,7 +59,7 @@ const ComponentsList = ({ items, isLoading }) => {
           ) : (
             <DataGridRow>
               <DataGridCell colSpan={10}>
-                <HintNotFound text="No components found" />
+                <HintNotFound text="No images found" />
               </DataGridCell>
             </DataGridRow>
           )}

diff --git a/apps/heureka/src/components/issueMatches/IssueMatchesDetails.jsx b/apps/heureka/src/components/issueMatches/IssueMatchesDetails.jsx
@@ -82,7 +82,7 @@ const IssueMatchesDetails = () => {
           </DataGridRow>
 
           <DataGridRow>
-            <DataGridHeadCell>Support Group Name</DataGridHeadCell>
+            <DataGridHeadCell>Support Group</DataGridHeadCell>
 
             <DataGridCell>
               <LoadElement elem={listOfCommaSeparatedObjs(issue?.componentInstance?.service?.supportGroups, "ccrn")} />
@@ -126,12 +126,6 @@ const IssueMatchesDetails = () => {
               )}
             </DataGridCell>
           </DataGridRow>
-
-          <DataGridRow>
-            <DataGridHeadCell>Issue Type</DataGridHeadCell>
-
-            <DataGridCell>{<LoadElement elem={issue?.issue?.type} />}</DataGridCell>
-          </DataGridRow>
         </DataGrid>
       </Stack>
     </>

diff --git 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 ? (
           <DataGridRow>
             <DataGridCell colSpan={7}>
-              <HintLoading className="my-4" text="Loading issue matches..." />
+              <HintLoading className="my-4" text="Loading vulnerabilities..." />
             </DataGridCell>
           </DataGridRow>
         ) : (
@@ -40,7 +40,7 @@ const IssueMatchesList = ({ items, isLoading }) => {
             ) : (
               <DataGridRow>
                 <DataGridCell colSpan={7}>
-                  <HintNotFound text="No issue matches found" />
+                  <HintNotFound text="No vulnerabilities found" />
                 </DataGridCell>
               </DataGridRow>
             )}

diff --git 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 (
     <>
       <MessagesProvider>

diff --git a/apps/heureka/src/components/services/ComponentInstancesList.jsx b/apps/heureka/src/components/services/ComponentInstancesList.jsx
@@ -44,7 +44,7 @@ const ComponentInstancesList = ({ serviceCcrn }) => {
         <DataGridRow>
           <DataGridHeadCell>Name</DataGridHeadCell>
           <DataGridHeadCell>Version</DataGridHeadCell>
-          <DataGridHeadCell>Total Number of Issues</DataGridHeadCell>
+          <DataGridHeadCell>Total Number of Vulnerabilities</DataGridHeadCell>
           <DataGridHeadCell>Highest Severity</DataGridHeadCell>
         </DataGridRow>
         {isLoading ? (
@@ -56,7 +56,7 @@ const ComponentInstancesList = ({ serviceCcrn }) => {
             </DataGridCell>
           </DataGridRow>
         ) : items.length === 0 ? (
-          <HintNotFound text="No component instances available." />
+          <HintNotFound text="No pods available." />
         ) : (
           items.map((componentInstance, i) => (
             <DataGridRow key={i}>

diff --git a/apps/heureka/src/components/services/ServicesList.jsx b/apps/heureka/src/components/services/ServicesList.jsx
@@ -30,16 +30,16 @@ const ServicesList = ({ items, isLoading }) => {
           <DataGridHeadCell>
             <Stack direction="vertical">
               <Tooltip triggerEvent="hover">
-                <TooltipTrigger>Components</TooltipTrigger>
-                <TooltipContent>Total Number of Component Instances</TooltipContent>
+                <TooltipTrigger>Pods</TooltipTrigger>
+                <TooltipContent>Total Number of Pods</TooltipContent>
               </Tooltip>
             </Stack>
           </DataGridHeadCell>
           <DataGridHeadCell>
             <Stack direction="vertical">
               <Tooltip triggerEvent="hover">
-                <TooltipTrigger>Issues</TooltipTrigger>
-                <TooltipContent>Total Number of IssueMatches</TooltipContent>
+                <TooltipTrigger>Vulnerabilities</TooltipTrigger>
+                <TooltipContent>Total Number of Vulnerabilities</TooltipContent>
               </Tooltip>
             </Stack>
           </DataGridHeadCell>

diff --git 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
@@ -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"