[frontend] Resolve more types in dashboard widgets

OpenCTI-Platform · Sep 24, 2023 · 75d6446 · 75d6446
1 parent c4214b2
commit 75d6446
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 5 deletions.
diff --git a/...rm/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsDonut.jsx b/...rm/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsDonut.jsx
@@ -181,9 +181,16 @@ const stixCoreObjectsDonutDistributionQuery = graphql`
           definition_type
           definition
         }
+        ... on KillChainPhase {
+          kill_chain_name
+          phase_name
+        }
         ... on Creator {
           name
         }
+        ... on Label {
+          value
+        }
       }
     }
   }

diff --git a/...rm/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsRadar.jsx b/...rm/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsRadar.jsx
@@ -176,6 +176,17 @@ const stixCoreObjectsRadarDistributionQuery = graphql`
         ... on StixCyberObservable {
           observable_value
         }
+        ... on MarkingDefinition {
+          definition_type
+          definition
+        }
+        ... on KillChainPhase {
+          kill_chain_name
+          phase_name
+        }
+        ... on Creator {
+          name
+        }
         ... on Label {
           value
         }

diff --git a/opencti-platform/opencti-front/src/private/components/workspaces/dashboards/WidgetConfig.jsx b/opencti-platform/opencti-front/src/private/components/workspaces/dashboards/WidgetConfig.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable custom-rules/classes-rule */
 import React, { useState } from 'react';
 import { v4 as uuid } from 'uuid';
 import * as R from 'ramda';
@@ -114,6 +115,33 @@ const useStyles = makeStyles((theme) => ({
     marginTop: 20,
     textAlign: 'center',
   },
+  step_entity: {
+    position: 'relative',
+    width: '100%',
+    margin: '0 0 20px 0',
+    padding: 15,
+    verticalAlign: 'middle',
+    border: `1px solid ${theme.palette.secondary.main}`,
+    borderRadius: 5,
+  },
+  step_relationship: {
+    position: 'relative',
+    width: '100%',
+    margin: '0 0 20px 0',
+    padding: 15,
+    verticalAlign: 'middle',
+    border: `1px solid ${theme.palette.primary.main}`,
+    borderRadius: 5,
+  },
+  step_audit: {
+    position: 'relative',
+    width: '100%',
+    margin: '0 0 20px 0',
+    padding: 15,
+    verticalAlign: 'middle',
+    border: `1px solid ${theme.palette.secondary.main}`,
+    borderRadius: 5,
+  },
 }));
 
 const entitiesFilters = [
@@ -1330,13 +1358,22 @@ const WidgetConfig = ({ widget, onComplete, closeMenu }) => {
                             <MenuItem key="entity_type" value="entity_type">
                               {t('Entity type')}
                             </MenuItem>
-                            <MenuItem key="created-by.internal_id" value="created-by.internal_id">
+                            <MenuItem
+                              key="created-by.internal_id"
+                              value="created-by.internal_id"
+                            >
                               {t('Author')}
                             </MenuItem>
-                            <MenuItem key="object-marking.internal_id" value="object-marking.internal_id">
+                            <MenuItem
+                              key="object-marking.internal_id"
+                              value="object-marking.internal_id"
+                            >
                               {t('Marking definition')}
                             </MenuItem>
-                            <MenuItem key="kill-chain-phase.internal_id" value="kill-chain-phase.internal_id">
+                            <MenuItem
+                              key="kill-chain-phase.internal_id"
+                              value="kill-chain-phase.internal_id"
+                            >
                               {t('Kill chain phase')}
                             </MenuItem>
                             <MenuItem key="creator_id" value="creator_id">

diff --git a/opencti-platform/opencti-graphql/src/database/middleware.js b/opencti-platform/opencti-graphql/src/database/middleware.js
@@ -96,8 +96,8 @@ import {
 } from './redis';
 import { cleanStixIds, STIX_SPEC_VERSION, } from './stix';
 import {
+  ABSTRACT_BASIC_RELATIONSHIP,
   ABSTRACT_STIX_CORE_OBJECT,
-  ABSTRACT_STIX_CORE_RELATIONSHIP,
   ABSTRACT_STIX_OBJECT,
   ABSTRACT_STIX_RELATIONSHIP,
   BASE_TYPE_ENTITY,
@@ -641,7 +641,7 @@ export const distributionRelations = async (context, user, args) => {
   const { field } = args; // Mandatory fields
   const { limit = 50, order } = args;
   const { relationship_type: relationshipTypes, dateAttribute = 'created_at' } = args;
-  const types = relationshipTypes || [ABSTRACT_STIX_CORE_RELATIONSHIP];
+  const types = relationshipTypes || [ABSTRACT_BASIC_RELATIONSHIP];
   const distributionDateAttribute = dateAttribute || 'created_at';
   let finalField = field;
   if (field.includes('.')) {