From 034885ebfcd9279d16a29ef81eb8e2db8a618bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chantal=20Bel=C3=A9n=20kelm?=
 <99441266+chantal-kelm@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:46:50 -0300
Subject: [PATCH] Some links in the threat hunting dashboard table do not
 redirect or have no links (#6845)

* fix some links in the threat hunting dashboard table do not redirect or have no links

* update changelog

* use RedirectAppLinks in threat hunting
---
 CHANGELOG.md                                  |  2 +-
 .../common/wazuh-discover/render-columns.tsx  | 49 ++++++++++++-------
 .../events/threat-hunting-columns.tsx         | 12 +++--
 3 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d892cd01d6..ca31846c9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 ### Changed
 
-- Removed embedded discover [#6120](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6120) [#6235](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6235) [#6254](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6254) [#6285](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6285) [#6288](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6288) [#6290](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6290) [#6289](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6289) [#6286](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6286) [#6275](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6275) [#6287](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6297](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6297) [#6291](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6459](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6459) [#6434](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6434) [#6504](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6504) [#6649](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6649) [#6506](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6506) [#6537](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6537) [#6528](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6528) [#6675](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6675) [#6674](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6674) [#6558](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6558) [#6685](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6685) [#6691](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6691) [#6712](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6712) [#6734](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6734) [#6746](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6746) [#6752](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6752) [#6753](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6753) [#6756](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6756) [#6771](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6771) [#6792](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6792) [#6857](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6857)
+- Removed embedded discover [#6120](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6120) [#6235](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6235) [#6254](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6254) [#6285](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6285) [#6288](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6288) [#6290](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6290) [#6289](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6289) [#6286](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6286) [#6275](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6275) [#6287](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6297](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6297) [#6291](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6459](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6459) [#6434](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6434) [#6504](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6504) [#6649](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6649) [#6506](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6506) [#6537](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6537) [#6528](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6528) [#6675](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6675) [#6674](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6674) [#6558](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6558) [#6685](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6685) [#6691](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6691) [#6712](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6712) [#6734](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6734) [#6746](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6746) [#6752](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6752) [#6753](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6753) [#6756](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6756) [#6771](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6771) [#6792](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6792) [#6845](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6845) [#6857](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6857)
 - Allow editing groups for an agent from Endpoints Summary [#6250](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6250)
 - Change how the configuration is managed in the backend side [#6337](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6337) [#6519](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6519) [#6573](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6573)
 - Change the view of API is down and check connection to Server APIs application [#6337](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6337)
diff --git a/plugins/main/public/components/common/wazuh-discover/render-columns.tsx b/plugins/main/public/components/common/wazuh-discover/render-columns.tsx
index b3e4de94c9..3a69ec65ca 100644
--- a/plugins/main/public/components/common/wazuh-discover/render-columns.tsx
+++ b/plugins/main/public/components/common/wazuh-discover/render-columns.tsx
@@ -3,29 +3,25 @@ import { EuiLink } from '@elastic/eui';
 import { tDataGridRenderColumn } from '../data-grid';
 import { getCore } from '../../../kibana-services';
 import { RedirectAppLinks } from '../../../../../../src/plugins/opensearch_dashboards_react/public';
-import { endpointSummary, rules } from '../../../utils/applications';
-import { formatUIDate } from '../../../react-services';
+import {
+  endpointSummary,
+  rules,
+  mitreAttack,
+} from '../../../utils/applications';
 import NavigationService from '../../../react-services/navigation-service';
 
 export const MAX_ENTRIES_PER_QUERY = 10000;
 
-const navigateTo = (ev, section, params) => {
-  NavigationService.getInstance().navigateToModule(ev, section, params);
-};
-
-const renderMitreTechnique = (technique: string) => (
-  <EuiLink
-    onClick={e =>
-      navigateTo(e, 'overview', {
-        tab: 'mitre',
-        tabView: 'intelligence',
-        tabRedirect: 'techniques',
-        idToRedirect: technique,
-      })
-    }
-  >
-    {technique}
-  </EuiLink>
+const renderMitreTechnique = technique => (
+  <RedirectAppLinks application={getCore().application}>
+    <EuiLink
+      href={NavigationService.getInstance().getUrlForApp(mitreAttack.id, {
+        path: `#/overview?tab=mitre&tabView=intelligence&tabRedirect=techniques&idToRedirect=${technique}`,
+      })}
+    >
+      {technique}
+    </EuiLink>
+  </RedirectAppLinks>
 );
 
 export const wzDiscoverRenderColumns: tDataGridRenderColumn[] = [
@@ -86,4 +82,19 @@ export const wzDiscoverRenderColumns: tDataGridRenderColumn[] = [
         <div>{renderMitreTechnique(value)}</div>
       ),
   },
+  {
+    id: 'rule.mitre_techniques',
+    render: value =>
+      Array.isArray(value) ? (
+        <div style={{ display: 'flex', gap: 10 }}>
+          {value?.map((technique, index) => (
+            <div key={`${technique}-${index}`}>
+              {renderMitreTechnique(technique)}
+            </div>
+          ))}
+        </div>
+      ) : (
+        <div>{renderMitreTechnique(value)}</div>
+      ),
+  },
 ];
diff --git a/plugins/main/public/components/overview/threat-hunting/events/threat-hunting-columns.tsx b/plugins/main/public/components/overview/threat-hunting/events/threat-hunting-columns.tsx
index 87bda4ea92..e09379cae6 100644
--- a/plugins/main/public/components/overview/threat-hunting/events/threat-hunting-columns.tsx
+++ b/plugins/main/public/components/overview/threat-hunting/events/threat-hunting-columns.tsx
@@ -11,10 +11,10 @@ export const threatHuntingTableDefaultColumns: tDataGridColumn[] = [
     id: 'timestamp',
   },
   {
-    id: 'agent.id'
+    id: 'agent.id',
   },
   {
-    id: 'agent.name'
+    id: 'agent.name',
   },
   {
     id: 'rule.mitre.id',
@@ -22,6 +22,9 @@ export const threatHuntingTableDefaultColumns: tDataGridColumn[] = [
   {
     id: 'rule.mitre.tactic',
   },
+  {
+    id: 'rule.mitre_technique',
+  },
   {
     id: 'rule.description',
   },
@@ -29,7 +32,7 @@ export const threatHuntingTableDefaultColumns: tDataGridColumn[] = [
     id: 'rule.level',
   },
   {
-    id: 'rule.id'
+    id: 'rule.id',
   },
 ];
 
@@ -46,6 +49,9 @@ export const threatHuntingTableAgentColumns: EuiDataGridColumn[] = [
   {
     id: 'rule.mitre.tactic',
   },
+  {
+    id: 'rule.mitre_technique',
+  },
   {
     id: 'rule.description',
   },