[frontend] Fix search in Containers Correlation view (#8162)

OpenCTI-Platform · Sep 19, 2024 · cfc1f6f · cfc1f6f
1 parent 80b8312
commit cfc1f6f
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 96 deletions.
diff --git a/.../opencti-front/src/private/components/analyses/groupings/GroupingKnowledgeCorrelation.jsx b/.../opencti-front/src/private/components/analyses/groupings/GroupingKnowledgeCorrelation.jsx
@@ -30,6 +30,8 @@ import { hexToRGB } from '../../../../utils/Colors';
 import { UserContext } from '../../../../utils/hooks/useAuth';
 import EntitiesDetailsRightsBar from '../../../../utils/graph/EntitiesDetailsRightBar';
 import withRouter from '../../../../utils/compat_router/withRouter';
+import { isNotEmptyField } from '../../../../utils/utils';
+import { getMainRepresentative, getSecondaryRepresentative } from '../../../../utils/defaultRepresentatives';
 
 const PARAMETERS$ = new Subject().pipe(debounce(() => timer(2000)));
 const POSITIONS$ = new Subject().pipe(debounce(() => timer(2000)));
@@ -810,26 +812,20 @@ class GroupingKnowledgeCorrelationComponent extends Component {
   }
 
   handleSearch(keyword) {
-    const filterAdjust = {
-      selectedTimeRangeInterval: this.state.selectedTimeRangeInterval,
-      markedBy: this.state.markedBy,
-      createdBy: this.state.createdBy,
-      stixCoreObjectsTypes: this.state.stixCoreObjectsTypes,
-      keyword,
-    };
-    this.setState(
-      {
-        selectedTimeRangeInterval: filterAdjust.selectedTimeRangeInterval,
-        graphData: buildCorrelationData(
-          this.graphObjects,
-          decodeGraphData(this.props.grouping.x_opencti_graph_data),
-          this.props.t,
-          filterAdjust,
-          'groupings',
-        ),
-      },
-      () => this.saveParameters(false),
-    );
+    this.selectedLinks.clear();
+    this.selectedNodes.clear();
+    if (isNotEmptyField(keyword)) {
+      const filterByKeyword = (n) => keyword === ''
+          || (getMainRepresentative(n) || '').toLowerCase().indexOf(keyword.toLowerCase())
+          !== -1
+          || (getSecondaryRepresentative(n) || '')
+            .toLowerCase()
+            .indexOf(keyword.toLowerCase()) !== -1
+          || (n.entity_type || '').toLowerCase().indexOf(keyword.toLowerCase())
+          !== -1;
+      this.state.graphData.nodes.map((n) => filterByKeyword(n) && this.selectedNodes.add(n));
+      this.setState({ numberOfSelectedNodes: this.selectedNodes.size });
+    }
   }
 
   render() {

diff --git a/...form/opencti-front/src/private/components/analyses/reports/ReportKnowledgeCorrelation.jsx b/...form/opencti-front/src/private/components/analyses/reports/ReportKnowledgeCorrelation.jsx
@@ -30,6 +30,8 @@ import ReportKnowledgeGraphBar from './ReportKnowledgeGraphBar';
 import { UserContext } from '../../../../utils/hooks/useAuth';
 import EntitiesDetailsRightsBar from '../../../../utils/graph/EntitiesDetailsRightBar';
 import withRouter from '../../../../utils/compat_router/withRouter';
+import { isNotEmptyField } from '../../../../utils/utils';
+import { getMainRepresentative, getSecondaryRepresentative } from '../../../../utils/defaultRepresentatives';
 
 const PARAMETERS$ = new Subject().pipe(debounce(() => timer(2000)));
 const POSITIONS$ = new Subject().pipe(debounce(() => timer(2000)));
@@ -803,25 +805,20 @@ class ReportKnowledgeCorrelationComponent extends Component {
   }
 
   handleSearch(keyword) {
-    const filterAdjust = {
-      selectedTimeRangeInterval: this.state.selectedTimeRangeInterval,
-      markedBy: this.state.markedBy,
-      createdBy: this.state.createdBy,
-      stixCoreObjectsTypes: this.state.stixCoreObjectsTypes,
-      keyword,
-    };
-    this.setState(
-      {
-        selectedTimeRangeInterval: filterAdjust.selectedTimeRangeInterval,
-        graphData: buildCorrelationData(
-          this.graphObjects,
-          decodeGraphData(this.props.report.x_opencti_graph_data),
-          this.props.t,
-          filterAdjust,
-        ),
-      },
-      () => this.saveParameters(false),
-    );
+    this.selectedLinks.clear();
+    this.selectedNodes.clear();
+    if (isNotEmptyField(keyword)) {
+      const filterByKeyword = (n) => keyword === ''
+        || (getMainRepresentative(n) || '').toLowerCase().indexOf(keyword.toLowerCase())
+        !== -1
+        || (getSecondaryRepresentative(n) || '')
+          .toLowerCase()
+          .indexOf(keyword.toLowerCase()) !== -1
+        || (n.entity_type || '').toLowerCase().indexOf(keyword.toLowerCase())
+        !== -1;
+      this.state.graphData.nodes.map((n) => filterByKeyword(n) && this.selectedNodes.add(n));
+      this.setState({ numberOfSelectedNodes: this.selectedNodes.size });
+    }
   }
 
   render() {

diff --git a/...pencti-front/src/private/components/cases/case_incidents/IncidentKnowledgeCorrelation.jsx b/...pencti-front/src/private/components/cases/case_incidents/IncidentKnowledgeCorrelation.jsx
@@ -30,6 +30,8 @@ import { UserContext } from '../../../../utils/hooks/useAuth';
 import { caseIncidentMutationFieldPatch } from './CaseIncidentEditionOverview';
 import { hexToRGB } from '../../../../utils/Colors';
 import EntitiesDetailsRightsBar from '../../../../utils/graph/EntitiesDetailsRightBar';
+import { isNotEmptyField } from '../../../../utils/utils';
+import { getMainRepresentative, getSecondaryRepresentative } from '../../../../utils/defaultRepresentatives';
 
 const PARAMETERS$ = new Subject().pipe(debounce(() => timer(2000)));
 const POSITIONS$ = new Subject().pipe(debounce(() => timer(2000)));
@@ -810,25 +812,20 @@ class IncidentKnowledgeCorrelationComponent extends Component {
   }
 
   handleSearch(keyword) {
-    const filterAdjust = {
-      selectedTimeRangeInterval: this.state.selectedTimeRangeInterval,
-      markedBy: this.state.markedBy,
-      createdBy: this.state.createdBy,
-      stixCoreObjectsTypes: this.state.stixCoreObjectsTypes,
-      keyword,
-    };
-    this.setState(
-      {
-        selectedTimeRangeInterval: filterAdjust.selectedTimeRangeInterval,
-        graphData: buildCorrelationData(
-          this.graphObjects,
-          decodeGraphData(this.props.grouping.x_opencti_graph_data),
-          this.props.t,
-          filterAdjust,
-        ),
-      },
-      () => this.saveParameters(false),
-    );
+    this.selectedLinks.clear();
+    this.selectedNodes.clear();
+    if (isNotEmptyField(keyword)) {
+      const filterByKeyword = (n) => keyword === ''
+          || (getMainRepresentative(n) || '').toLowerCase().indexOf(keyword.toLowerCase())
+          !== -1
+          || (getSecondaryRepresentative(n) || '')
+            .toLowerCase()
+            .indexOf(keyword.toLowerCase()) !== -1
+          || (n.entity_type || '').toLowerCase().indexOf(keyword.toLowerCase())
+          !== -1;
+      this.state.graphData.nodes.map((n) => filterByKeyword(n) && this.selectedNodes.add(n));
+      this.setState({ numberOfSelectedNodes: this.selectedNodes.size });
+    }
   }
 
   render() {

diff --git a/...form/opencti-front/src/private/components/cases/case_rfis/CaseRfiKnowledgeCorrelation.jsx b/...form/opencti-front/src/private/components/cases/case_rfis/CaseRfiKnowledgeCorrelation.jsx
@@ -30,6 +30,8 @@ import { caseRfiMutationFieldPatch } from './CaseRfiEditionOverview';
 import { UserContext } from '../../../../utils/hooks/useAuth';
 import CaseRfiKnowledgeGraphBar from './CaseRfiKnowledgeGraphBar';
 import EntitiesDetailsRightsBar from '../../../../utils/graph/EntitiesDetailsRightBar';
+import { isNotEmptyField } from '../../../../utils/utils';
+import { getMainRepresentative, getSecondaryRepresentative } from '../../../../utils/defaultRepresentatives';
 
 const PARAMETERS$ = new Subject().pipe(debounce(() => timer(2000)));
 const POSITIONS$ = new Subject().pipe(debounce(() => timer(2000)));
@@ -810,25 +812,20 @@ class CaseRfiKnowledgeCorrelationComponent extends Component {
   }
 
   handleSearch(keyword) {
-    const filterAdjust = {
-      selectedTimeRangeInterval: this.state.selectedTimeRangeInterval,
-      markedBy: this.state.markedBy,
-      createdBy: this.state.createdBy,
-      stixCoreObjectsTypes: this.state.stixCoreObjectsTypes,
-      keyword,
-    };
-    this.setState(
-      {
-        selectedTimeRangeInterval: filterAdjust.selectedTimeRangeInterval,
-        graphData: buildCorrelationData(
-          this.graphObjects,
-          decodeGraphData(this.props.grouping.x_opencti_graph_data),
-          this.props.t,
-          filterAdjust,
-        ),
-      },
-      () => this.saveParameters(false),
-    );
+    this.selectedLinks.clear();
+    this.selectedNodes.clear();
+    if (isNotEmptyField(keyword)) {
+      const filterByKeyword = (n) => keyword === ''
+          || (getMainRepresentative(n) || '').toLowerCase().indexOf(keyword.toLowerCase())
+          !== -1
+          || (getSecondaryRepresentative(n) || '')
+            .toLowerCase()
+            .indexOf(keyword.toLowerCase()) !== -1
+          || (n.entity_type || '').toLowerCase().indexOf(keyword.toLowerCase())
+          !== -1;
+      this.state.graphData.nodes.map((n) => filterByKeyword(n) && this.selectedNodes.add(n));
+      this.setState({ numberOfSelectedNodes: this.selectedNodes.size });
+    }
   }
 
   render() {

diff --git a/...form/opencti-front/src/private/components/cases/case_rfts/CaseRftKnowledgeCorrelation.jsx b/...form/opencti-front/src/private/components/cases/case_rfts/CaseRftKnowledgeCorrelation.jsx
@@ -30,6 +30,8 @@ import { caseRftMutationFieldPatch } from './CaseRftEditionOverview';
 import { UserContext } from '../../../../utils/hooks/useAuth';
 import CaseRftKnowledgeGraphBar from './CaseRftKnowledgeGraphBar';
 import EntitiesDetailsRightsBar from '../../../../utils/graph/EntitiesDetailsRightBar';
+import { isNotEmptyField } from '../../../../utils/utils';
+import { getMainRepresentative, getSecondaryRepresentative } from '../../../../utils/defaultRepresentatives';
 
 const PARAMETERS$ = new Subject().pipe(debounce(() => timer(2000)));
 const POSITIONS$ = new Subject().pipe(debounce(() => timer(2000)));
@@ -811,25 +813,20 @@ class CaseRftKnowledgeCorrelationComponent extends Component {
   }
 
   handleSearch(keyword) {
-    const filterAdjust = {
-      selectedTimeRangeInterval: this.state.selectedTimeRangeInterval,
-      markedBy: this.state.markedBy,
-      createdBy: this.state.createdBy,
-      stixCoreObjectsTypes: this.state.stixCoreObjectsTypes,
-      keyword,
-    };
-    this.setState(
-      {
-        selectedTimeRangeInterval: filterAdjust.selectedTimeRangeInterval,
-        graphData: buildCorrelationData(
-          this.graphObjects,
-          decodeGraphData(this.props.grouping.x_opencti_graph_data),
-          this.props.t,
-          filterAdjust,
-        ),
-      },
-      () => this.saveParameters(false),
-    );
+    this.selectedLinks.clear();
+    this.selectedNodes.clear();
+    if (isNotEmptyField(keyword)) {
+      const filterByKeyword = (n) => keyword === ''
+          || (getMainRepresentative(n) || '').toLowerCase().indexOf(keyword.toLowerCase())
+          !== -1
+          || (getSecondaryRepresentative(n) || '')
+            .toLowerCase()
+            .indexOf(keyword.toLowerCase()) !== -1
+          || (n.entity_type || '').toLowerCase().indexOf(keyword.toLowerCase())
+          !== -1;
+      this.state.graphData.nodes.map((n) => filterByKeyword(n) && this.selectedNodes.add(n));
+      this.setState({ numberOfSelectedNodes: this.selectedNodes.size });
+    }
   }
 
   render() {