[frontend] Clean up entity-type filter in Correlation Graphs

The "entity_*" options shouldn't show up as an option in the Correlation Knowledge graphs. Additionally, an Analysis Report Correlation Graph shouldn't allow the Report or Reported-in options in the entity-type filter, either.
OpenCTI-Platform · Jun 3, 2024 · faf3549 · faf3549
1 parent e383348
commit faf3549
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/.../opencti-front/src/private/components/analyses/groupings/GroupingKnowledgeCorrelation.jsx b/.../opencti-front/src/private/components/analyses/groupings/GroupingKnowledgeCorrelation.jsx
@@ -854,6 +854,9 @@ class GroupingKnowledgeCorrelationComponent extends Component {
     const selectedEntities = [...this.selectedLinks, ...this.selectedNodes];
     const sortByLabel = R.sortBy(R.compose(R.toLower, R.prop('tlabel')));
     const stixCoreObjectsTypes = R.pipe(
+      R.filter((n) => n.node.entity_type
+          && n.node.entity_type.length > 1
+          && n.node.entity_type[0] !== n.node.entity_type[0].toLowerCase()),
       R.map((n) => R.assoc(
         'tlabel',
         t(

diff --git a/...form/opencti-front/src/private/components/analyses/reports/ReportKnowledgeCorrelation.jsx b/...form/opencti-front/src/private/components/analyses/reports/ReportKnowledgeCorrelation.jsx
@@ -846,6 +846,9 @@ class ReportKnowledgeCorrelationComponent extends Component {
     const selectedEntities = [...this.selectedLinks, ...this.selectedNodes];
     const sortByLabel = R.sortBy(R.compose(R.toLower, R.prop('tlabel')));
     const stixCoreObjectsTypes = R.pipe(
+      R.filter((n) => n.node.entity_type
+          && n.node.entity_type.length > 1
+          && n.node.entity_type[0] !== n.node.entity_type[0].toLowerCase()),
       R.map((n) => R.assoc(
         'tlabel',
         t(
@@ -858,7 +861,6 @@ class ReportKnowledgeCorrelationComponent extends Component {
       sortByLabel,
       R.map((n) => n.node.entity_type),
       R.filter((n) => n && n.length > 0),
-      R.concat(['Report', 'reported-in']),
       R.uniq,
     )(report.objects.edges);
     const markedBy = R.uniqBy(

diff --git a/...pencti-front/src/private/components/cases/case_incidents/IncidentKnowledgeCorrelation.jsx b/...pencti-front/src/private/components/cases/case_incidents/IncidentKnowledgeCorrelation.jsx
@@ -853,6 +853,9 @@ class IncidentKnowledgeCorrelationComponent extends Component {
     const selectedEntities = [...this.selectedLinks, ...this.selectedNodes];
     const sortByLabel = R.sortBy(R.compose(R.toLower, R.prop('tlabel')));
     const stixCoreObjectsTypes = R.pipe(
+      R.filter((n) => n.node.entity_type
+          && n.node.entity_type.length > 1
+          && n.node.entity_type[0] !== n.node.entity_type[0].toLowerCase()),
       R.map((n) => R.assoc(
         'tlabel',
         t(

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
@@ -853,6 +853,9 @@ class CaseRfiKnowledgeCorrelationComponent extends Component {
     const selectedEntities = [...this.selectedLinks, ...this.selectedNodes];
     const sortByLabel = R.sortBy(R.compose(R.toLower, R.prop('tlabel')));
     const stixCoreObjectsTypes = R.pipe(
+      R.filter((n) => n.node.entity_type
+          && n.node.entity_type.length > 1
+          && n.node.entity_type[0] !== n.node.entity_type[0].toLowerCase()),
       R.map((n) => R.assoc(
         'tlabel',
         t(

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
@@ -854,6 +854,9 @@ class CaseRftKnowledgeCorrelationComponent extends Component {
     const selectedEntities = [...this.selectedLinks, ...this.selectedNodes];
     const sortByLabel = R.sortBy(R.compose(R.toLower, R.prop('tlabel')));
     const stixCoreObjectsTypes = R.pipe(
+      R.filter((n) => n.node.entity_type
+          && n.node.entity_type.length > 1
+          && n.node.entity_type[0] !== n.node.entity_type[0].toLowerCase()),
       R.map((n) => R.assoc(
         'tlabel',
         t(