From fd10bfbc15d860d1b52922dd154f49d1a1a4780f Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Fri, 4 Oct 2024 02:56:18 +0530
Subject: [PATCH] Bug fixes for threat intel, duplicate findings, and
 breadcrumbs path (#1176) (#1177)

* fix spacing for threat intel



* fix alienvault source details page crash



* fix threat intel findings widget view view all url crash



* fix security analtyics breadcrumbs link path crash



* fix duplicate findings



---------


(cherry picked from commit 0ce91fbe36e316516022e31baa5a77f4336f0f50)

Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../RecentThreatIntelFindingsWidget.tsx       | 19 +++++++++----------
 .../ThreatIntelSourceDetails.tsx              | 13 +++++++++----
 .../ThreatIntelSourcesList.tsx                |  7 +++++--
 public/store/FindingsStore.ts                 |  4 ++++
 public/utils/constants.ts                     |  2 +-
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/public/pages/Overview/components/Widgets/RecentThreatIntelFindingsWidget.tsx b/public/pages/Overview/components/Widgets/RecentThreatIntelFindingsWidget.tsx
index c4e48b66..f11dff12 100644
--- a/public/pages/Overview/components/Widgets/RecentThreatIntelFindingsWidget.tsx
+++ b/public/pages/Overview/components/Widgets/RecentThreatIntelFindingsWidget.tsx
@@ -16,7 +16,7 @@ import { TableWidget } from './TableWidget';
 import { WidgetContainer } from './WidgetContainer';
 import { renderTime } from '../../../../utils/helpers';
 import { ThreatIntelFinding } from '../../../../../types';
-import { getApplication } from '../../../../services/utils/constants';
+import { getApplication, getUseUpdatedUx } from '../../../../services/utils/constants';
 import { IocLabel, ThreatIntelIocType } from '../../../../../common/constants';
 
 const columns: EuiBasicTableColumn<ThreatIntelFinding>[] = [
@@ -78,17 +78,16 @@ export const RecentThreatIntelFindingsWidget: React.FC<RecentThreatIntelFindings
     );
   }, [items]);
 
-  const threatIntelFindingsUrl = `${getApplication().getUrlForApp(FINDINGS_NAV_ID, {
-    path: `#${ROUTES.FINDINGS}`,
-  })}?detectionType=${FindingTabId.ThreatIntel}`;
-  const actions = React.useMemo(
-    () => [
-      <EuiSmallButton onClick={() => getApplication().navigateToUrl(threatIntelFindingsUrl)}>
+  const actions = React.useMemo(() => {
+    const baseUrl = getUseUpdatedUx() ? getApplication().getUrlForApp(FINDINGS_NAV_ID) : '';
+    return [
+      <EuiSmallButton
+        href={`${baseUrl}#${ROUTES.FINDINGS}?detectionType=${FindingTabId.ThreatIntel}`}
+      >
         View all
       </EuiSmallButton>,
-    ],
-    []
-  );
+    ];
+  }, []);
 
   return (
     <WidgetContainer title={'Recent threat intel findings'} actions={actions}>
diff --git a/public/pages/ThreatIntel/components/ThreatIntelSourceDetails/ThreatIntelSourceDetails.tsx b/public/pages/ThreatIntel/components/ThreatIntelSourceDetails/ThreatIntelSourceDetails.tsx
index d38f5994..2462d3d2 100644
--- a/public/pages/ThreatIntel/components/ThreatIntelSourceDetails/ThreatIntelSourceDetails.tsx
+++ b/public/pages/ThreatIntel/components/ThreatIntelSourceDetails/ThreatIntelSourceDetails.tsx
@@ -333,12 +333,12 @@ export const ThreatIntelSourceDetails: React.FC<ThreatIntelSourceDetailsProps> =
               </>
             )}
             {type === 'URL_DOWNLOAD' && (
-              <EuiFormRow label="Source URL">
-                <EuiFieldText
+              <EuiCompressedFormRow label="Source URL">
+                <EuiCompressedFieldText
                   readOnly={isReadOnly}
                   value={(sourceItem.source as URLDownloadSource).url_download?.url}
                 />
-              </EuiFormRow>
+              </EuiCompressedFormRow>
             )}
             <EuiCompressedFormRow label="Types of malicious indicators">
               <>
@@ -374,7 +374,12 @@ export const ThreatIntelSourceDetails: React.FC<ThreatIntelSourceDetailsProps> =
                 <EuiSmallButton onClick={onDiscard}>Discard</EuiSmallButton>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiSmallButton isLoading={saveInProgress} fill onClick={onSave} disabled={saveDisabled}>
+                <EuiSmallButton
+                  isLoading={saveInProgress}
+                  fill
+                  onClick={onSave}
+                  disabled={saveDisabled}
+                >
                   Save
                 </EuiSmallButton>
               </EuiFlexItem>
diff --git a/public/pages/ThreatIntel/components/ThreatIntelSourcesList/ThreatIntelSourcesList.tsx b/public/pages/ThreatIntel/components/ThreatIntelSourcesList/ThreatIntelSourcesList.tsx
index 1c794786..86631ad7 100644
--- a/public/pages/ThreatIntel/components/ThreatIntelSourcesList/ThreatIntelSourcesList.tsx
+++ b/public/pages/ThreatIntel/components/ThreatIntelSourcesList/ThreatIntelSourcesList.tsx
@@ -34,7 +34,6 @@ export const ThreatIntelSourcesList: React.FC<ThreatIntelSourcesListProps> = ({
 }) => {
   return (
     <EuiPanel>
-      <EuiSpacer size="m" />
       <EuiFlexGroup>
         <EuiFlexItem>
           <EuiTitle size="s">
@@ -97,7 +96,11 @@ export const ThreatIntelSourcesList: React.FC<ThreatIntelSourcesListProps> = ({
       </EuiFlexGroup>
       {threatIntelSources.length === 0 && (
         <EuiEmptyPrompt
-          title={<EuiText size="s"><h2>No threat intel source present</h2></EuiText>}
+          title={
+            <EuiText size="s">
+              <h2>No threat intel source present</h2>
+            </EuiText>
+          }
           actions={[
             <EuiSmallButton
               fill
diff --git a/public/store/FindingsStore.ts b/public/store/FindingsStore.ts
index 65422527..ef080023 100644
--- a/public/store/FindingsStore.ts
+++ b/public/store/FindingsStore.ts
@@ -132,6 +132,10 @@ export class FindingsStore implements IFindingsStore {
 
     const firstGetFindingsRes = await this.service.getFindings(getFindingsQueryParams);
 
+    if (signal.aborted) {
+      return allFindings;
+    }
+
     if (firstGetFindingsRes.ok) {
       const extendedFindings = this.extendFindings(firstGetFindingsRes.response.findings, detector);
       onPartialFindingsFetched?.(extendedFindings);
diff --git a/public/utils/constants.ts b/public/utils/constants.ts
index c3355678..1817d667 100644
--- a/public/utils/constants.ts
+++ b/public/utils/constants.ts
@@ -79,7 +79,7 @@ export const getNotificationDetailsHref = (channelId: string) =>
   `notifications-dashboards#/channels-details/${channelId}`;
 
 export const BREADCRUMBS = Object.freeze({
-  SECURITY_ANALYTICS: { text: 'Security Analytics', href: '#/' },
+  SECURITY_ANALYTICS: { text: 'Security Analytics', href: `#${ROUTES.OVERVIEW}` },
   OVERVIEW: { text: 'Overview', href: `#${ROUTES.OVERVIEW}` },
   GETTING_STARTED: { text: 'Getting started', href: `#${ROUTES.GETTING_STARTED}` },
   FINDINGS: { text: 'Findings', href: `#${ROUTES.FINDINGS}` },