From 833e7257fff1675c3daf8132a330c249cbd35f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20J=C3=A1ky?= <ajaky@cisco.com>
Date: Thu, 8 Feb 2024 10:51:09 +0100
Subject: [PATCH] refactor: update Misconfiguration fields on the UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: András Jáky <ajaky@cisco.com>
---
 .../MisconfigurationDetails.jsx                  |  2 +-
 .../Misconfigurations/MisconfigurationTable.jsx  | 16 ++++++++--------
 .../TabMisconfigurationDetails.jsx               | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ui/src/layout/Findings/Misconfigurations/MisconfigurationDetails.jsx b/ui/src/layout/Findings/Misconfigurations/MisconfigurationDetails.jsx
index e7dd7acdc7..0936d068e5 100644
--- a/ui/src/layout/Findings/Misconfigurations/MisconfigurationDetails.jsx
+++ b/ui/src/layout/Findings/Misconfigurations/MisconfigurationDetails.jsx
@@ -40,7 +40,7 @@ const DetailsContent = ({data}) => {
 const MisconfigurationDetails = () => (
     <FindingsDetailsPage
         backTitle="Misconfigurations"
-        getTitleData={({findingInfo}) => ({title: findingInfo.testID})}
+        getTitleData={({findingInfo}) => ({title: findingInfo.id})}
         detailsContent={DetailsContent}
     />
 )
diff --git a/ui/src/layout/Findings/Misconfigurations/MisconfigurationTable.jsx b/ui/src/layout/Findings/Misconfigurations/MisconfigurationTable.jsx
index 8cff1fa71a..bde27508ee 100644
--- a/ui/src/layout/Findings/Misconfigurations/MisconfigurationTable.jsx
+++ b/ui/src/layout/Findings/Misconfigurations/MisconfigurationTable.jsx
@@ -11,10 +11,10 @@ const FILTER_SEVERITY_ITEMS = Object.keys(MISCONFIGURATION_SEVERITY_MAP)
 const MisconfigurationsTable = () => {
     const columns = useMemo(() => [
         {
-            Header: "Test ID",
-            id: "testId",
-            sortIds: ["findingInfo.testID"],
-            accessor: "findingInfo.testID"
+            Header: "ID",
+            id: "id",
+            sortIds: ["findingInfo.id"],
+            accessor: "findingInfo.id"
         },
         {
             Header: "Severity",
@@ -25,8 +25,8 @@ const MisconfigurationsTable = () => {
         {
             Header: "Description",
             id: "description",
-            sortIds: ["findingInfo.testDescription"],
-            accessor: "findingInfo.testDescription",
+            sortIds: ["findingInfo.description"],
+            accessor: "findingInfo.description",
             width: 200
         },
         ...getAssetAndScanColumnsConfigList()
@@ -37,7 +37,7 @@ const MisconfigurationsTable = () => {
             columns={columns}
             filterType={FILTER_TYPES.FINDINGS_MISCONFIGURATIONS}
             filtersConfig={[
-                {value: "findingInfo.testID", label: "Test ID", operators: [
+                {value: "findingInfo.id", label: "ID", operators: [
                     {...OPERATORS.eq, valueItems: [], creatable: true},
                     {...OPERATORS.ne, valueItems: [], creatable: true},
                     {...OPERATORS.startswith},
@@ -48,7 +48,7 @@ const MisconfigurationsTable = () => {
                     {...OPERATORS.eq, valueItems: FILTER_SEVERITY_ITEMS},
                     {...OPERATORS.ne, valueItems: FILTER_SEVERITY_ITEMS}
                 ]},
-                {value: "findingInfo.testDescription", label: "Description", operators: [
+                {value: "findingInfo.description", label: "Description", operators: [
                     {...OPERATORS.eq, valueItems: [], creatable: true},
                     {...OPERATORS.ne, valueItems: [], creatable: true},
                     {...OPERATORS.startswith},
diff --git a/ui/src/layout/Findings/Misconfigurations/TabMisconfigurationDetails.jsx b/ui/src/layout/Findings/Misconfigurations/TabMisconfigurationDetails.jsx
index 9c1a54218f..b8d37545de 100644
--- a/ui/src/layout/Findings/Misconfigurations/TabMisconfigurationDetails.jsx
+++ b/ui/src/layout/Findings/Misconfigurations/TabMisconfigurationDetails.jsx
@@ -6,32 +6,32 @@ import { MISCONFIGURATION_SEVERITY_MAP } from './utils';
 
 const TabMisconfigurationDetails = ({data}) => {
     const {findingInfo, foundOn, invalidatedOn} = data;
-    const {testID, severity, testDescription, scannerName, scannedPath, remediation, testCategory, message} = findingInfo;
+    const {id, severity, description, scannerName, location, remediation, category, message} = findingInfo;
 
     return (
         <DoublePaneDisplay
             leftPaneDisplay={() => (
                 <>
                     <TitleValueDisplayRow>
-                        <TitleValueDisplay title="Test ID">{testID}</TitleValueDisplay>
+                        <TitleValueDisplay title="ID">{id}</TitleValueDisplay>
                         <TitleValueDisplay title="Severity">{MISCONFIGURATION_SEVERITY_MAP[severity]}</TitleValueDisplay>
                     </TitleValueDisplayRow>
                     <TitleValueDisplayRow>
                         <TitleValueDisplay title="Scanner Name">{scannerName}</TitleValueDisplay>
-                        <TitleValueDisplay title="File path">{scannedPath}</TitleValueDisplay>
+                        <TitleValueDisplay title="File path">{location}</TitleValueDisplay>
                     </TitleValueDisplayRow>
                     <TitleValueDisplayRow>
-                        <TitleValueDisplay title="Category">{testCategory}</TitleValueDisplay>
+                        <TitleValueDisplay title="Category">{category}</TitleValueDisplay>
                         <TitleValueDisplay title="Remediation">{remediation}</TitleValueDisplay>
                     </TitleValueDisplayRow>
                     <TitleValueDisplayRow>
                         <TitleValueDisplay title="Message" withOpen defaultOpen>{message}</TitleValueDisplay>
                     </TitleValueDisplayRow>
                     <TitleValueDisplayRow>
-                        <TitleValueDisplay title="Description" withOpen defaultOpen>{testDescription}</TitleValueDisplay>
+                        <TitleValueDisplay title="Description" withOpen defaultOpen>{description}</TitleValueDisplay>
                     </TitleValueDisplayRow>
                     <FindingsDetailsCommonFields foundOn={foundOn} invalidatedOn={invalidatedOn} />
-                </>  
+                </>
             )}
         />
     )