remove metrics

Signed-off-by: Carlos Feria <2582866+carlosthe19916@users.noreply.github.com>

Author: carlosthe19916

client/src/app/pages/sbom-scan/sbom-scan.tsx

@@ -21,8 +21,6 @@ import {
   PageSection,
   Split,
   SplitItem,
-  Stack,
-  StackItem,
   type MenuToggleElement,
 } from "@patternfly/react-core";
 
@@ -35,7 +33,6 @@ import { useUploadAndAnalyzeSBOM } from "@app/queries/sboms-analysis";
 import { Paths } from "@app/Routes";
 
 import { useVulnerabilitiesOfSbomByPurls } from "@static-report/hooks/useVulnerabilitiesOfSbom";
-import { VulnerabilityMetrics } from "@static-report/pages/vulnerabilities/components/VulnerabilitiesMetrics";
 import { VulnerabilityTable } from "@static-report/pages/vulnerabilities/components/VulnerabilityTable";
 
 import { UploadFileForAnalysis } from "./components/UploadFileForAnalysis";
@@ -67,7 +64,7 @@ export const SbomScan: React.FC = () => {
   }, [uploadResponseData]);
 
   const {
-    data: { vulnerabilities, summary },
+    data: { vulnerabilities },
     analysisResponse,
     isFetching,
     fetchError,
@@ -98,20 +95,27 @@ export const SbomScan: React.FC = () => {
     });
   };
 
+  const reportNotReady =
+    uploadResponseData === null || isFetching || fetchError;
+
   return (
     <>
       <PageSection type="breadcrumb">
         <Breadcrumb>
           <BreadcrumbItem>
             <Link to={Paths.sboms}>SBOMs</Link>
           </BreadcrumbItem>
-          <BreadcrumbItem isActive>
-            Generate vulnerability report
-          </BreadcrumbItem>
+          {reportNotReady ? (
+            <BreadcrumbItem isActive>
+              Generate vulnerability report
+            </BreadcrumbItem>
+          ) : (
+            <BreadcrumbItem isActive>Vulnerability report</BreadcrumbItem>
+          )}
         </Breadcrumb>
       </PageSection>
       <PageSection>
-        {uploadResponseData === null || isFetching || fetchError ? (
+        {reportNotReady ? (
           <Content>
             <Content component="h1">Generate vulnerability report</Content>
             <Content component="p">
@@ -209,22 +213,11 @@ export const SbomScan: React.FC = () => {
             </EmptyStateFooter>
           </EmptyState>
         ) : (
-          <Stack hasGutter>
-            <StackItem>
-              <VulnerabilityMetrics
-                summary={summary}
-                isFetching={isFetching}
-                fetchError={fetchError}
-              />
-            </StackItem>
-            <StackItem>
-              <VulnerabilityTable
-                vulnerabilities={vulnerabilities}
-                isFetching={isFetching}
-                fetchError={fetchError}
-              />
-            </StackItem>
-          </Stack>
+          <VulnerabilityTable
+            vulnerabilities={vulnerabilities}
+            isFetching={isFetching}
+            fetchError={fetchError}
+          />
         )}
       </PageSection>
     </>

client/src/static-report/pages/vulnerabilities/components/VulnerabilitiesMetrics.tsx

@@ -71,8 +71,8 @@ export const VulnerabilityTable: React.FC<IVulnerabilityTableProps> = ({
     columnNames: {
       vulnerabilityId: "Vulnerability ID",
       description: "Description",
-      status: "Status",
       severity: "Severity",
+      status: "Status",
       affectedPackages: "Affected packages",
       published: "Published",
       updated: "Updated",
@@ -185,8 +185,8 @@ export const VulnerabilityTable: React.FC<IVulnerabilityTableProps> = ({
             <TableHeaderContentWithControls {...tableControls}>
               <Th {...getThProps({ columnKey: "vulnerabilityId" })} />
               <Th {...getThProps({ columnKey: "description" })} />
-              <Th {...getThProps({ columnKey: "status" })} />
               <Th {...getThProps({ columnKey: "severity" })} />
+              <Th {...getThProps({ columnKey: "status" })} />
               <Th {...getThProps({ columnKey: "affectedPackages" })} />
               <Th {...getThProps({ columnKey: "published" })} />
               <Th {...getThProps({ columnKey: "updated" })} />
@@ -245,13 +245,6 @@ export const VulnerabilityTable: React.FC<IVulnerabilityTableProps> = ({
                         </Td>
                       )}
                     </TdWithFocusStatus>
-                    <Td
-                      width={10}
-                      modifier="truncate"
-                      {...getTdProps({ columnKey: "status" })}
-                    >
-                      {item.status}
-                    </Td>
                     <Td
                       width={10}
                       modifier="breakWord"
@@ -277,6 +270,13 @@ export const VulnerabilityTable: React.FC<IVulnerabilityTableProps> = ({
                         />
                       </Popover>
                     </Td>
+                    <Td
+                      width={10}
+                      modifier="truncate"
+                      {...getTdProps({ columnKey: "status" })}
+                    >
+                      {item.status}
+                    </Td>
                     <Td
                       width={10}
                       modifier="truncate"