[backend/frontend] Fix STIX relationships (including nested refs) que…

…ries (#3553)
OpenCTI-Platform · Jun 20, 2023 · d5a9bf2 · d5a9bf2
1 parent 67a050e
commit d5a9bf2
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 50 deletions.
diff --git a/...ncti-front/src/private/components/common/stix_domain_objects/StixDomainObjectTimeline.jsx b/...ncti-front/src/private/components/common/stix_domain_objects/StixDomainObjectTimeline.jsx
@@ -367,6 +367,12 @@ const StixDomainObjectTimeline = createRefetchContainer(
                 ... on ObservedData {
                     name
                 }
+                ... on Creator {
+                  name
+                }
+                ... on MarkingDefinition {
+                  definition
+                }
               }
               to {
                 ... on BasicObject {
@@ -532,6 +538,12 @@ const StixDomainObjectTimeline = createRefetchContainer(
                 ... on ObservedData {
                     name
                 }
+                ... on Creator {
+                  name
+                }
+                ... on MarkingDefinition {
+                  definition
+                }
               }
             }
           }

diff --git a/opencti-platform/opencti-front/src/schema/relay.schema.graphql b/opencti-platform/opencti-front/src/schema/relay.schema.graphql
@@ -7261,8 +7261,8 @@ interface StixRelationship {
   updated_at: DateTime!
   x_opencti_stix_ids: [StixId]
   is_inferred: Boolean!
-  from: StixObjectOrStixRelationship
-  to: StixObjectOrStixRelationship
+  from: StixObjectOrStixRelationshipOrCreator
+  to: StixObjectOrStixRelationshipOrCreator
   x_opencti_inferences: [Inference]
   spec_version: String!
   created: DateTime
@@ -7352,10 +7352,10 @@ type StixCoreRelationship implements BasicRelationship & StixRelationship {
   updated_at: DateTime!
   x_opencti_stix_ids: [StixId]
   is_inferred: Boolean!
-  from: StixObjectOrStixRelationship
+  from: StixObjectOrStixRelationshipOrCreator
   fromId: String!
   fromType: String!
-  to: StixObjectOrStixRelationship
+  to: StixObjectOrStixRelationshipOrCreator
   toId: String!
   toType: String!
   x_opencti_inferences: [Inference]
@@ -7477,10 +7477,10 @@ type StixSightingRelationship implements BasicRelationship & StixRelationship {
   updated_at: DateTime!
   x_opencti_stix_ids: [StixId]
   is_inferred: Boolean!
-  from: StixObjectOrStixRelationship
+  from: StixObjectOrStixRelationshipOrCreator
   fromId: String!
   fromType: String!
-  to: StixObjectOrStixRelationship
+  to: StixObjectOrStixRelationshipOrCreator
   toId: String!
   toType: String!
   x_opencti_inferences: [Inference]
@@ -7582,8 +7582,8 @@ type StixRefRelationship implements BasicRelationship & StixRelationship {
   updated_at: DateTime!
   x_opencti_stix_ids: [StixId]
   is_inferred: Boolean!
-  from: StixObjectOrStixRelationship
-  to: StixObjectOrStixRelationship
+  from: StixObjectOrStixRelationshipOrCreator
+  to: StixObjectOrStixRelationshipOrCreator
   x_opencti_inferences: [Inference]
   spec_version: String!
   created: DateTime
@@ -7605,7 +7605,7 @@ type StixRefRelationship implements BasicRelationship & StixRelationship {
 }
 
 type DefinitionRefRelationship {
-  entity: StixObjectOrStixRelationship!
+  entity: StixObjectOrStixRelationshipOrCreator!
   from: [String!]
   to: [String!]
 }

diff --git a/opencti-platform/opencti-graphql/config/schema/opencti.graphql b/opencti-platform/opencti-graphql/config/schema/opencti.graphql
@@ -11028,8 +11028,8 @@ interface StixRelationship {
   # StixRelationship
   x_opencti_stix_ids: [StixId]
   is_inferred: Boolean!
-  from: StixObjectOrStixRelationship
-  to: StixObjectOrStixRelationship
+  from: StixObjectOrStixRelationshipOrCreator
+  to: StixObjectOrStixRelationshipOrCreator
   x_opencti_inferences: [Inference]
   spec_version: String!
   created: DateTime
@@ -11118,10 +11118,10 @@ type StixCoreRelationship implements BasicRelationship & StixRelationship {
   # StixRelationship
   x_opencti_stix_ids: [StixId]
   is_inferred: Boolean!
-  from: StixObjectOrStixRelationship
+  from: StixObjectOrStixRelationshipOrCreator
   fromId: String!
   fromType: String!
-  to: StixObjectOrStixRelationship
+  to: StixObjectOrStixRelationshipOrCreator
   toId: String!
   toType: String!
   x_opencti_inferences: [Inference]
@@ -11267,10 +11267,10 @@ type StixSightingRelationship implements BasicRelationship & StixRelationship {
   # StixRelationship
   x_opencti_stix_ids: [StixId]
   is_inferred: Boolean!
-  from: StixObjectOrStixRelationship
+  from: StixObjectOrStixRelationshipOrCreator
   fromId: String!
   fromType: String!
-  to: StixObjectOrStixRelationship
+  to: StixObjectOrStixRelationshipOrCreator
   toId: String!
   toType: String!
   x_opencti_inferences: [Inference]
@@ -11374,8 +11374,8 @@ type StixRefRelationship implements BasicRelationship & StixRelationship {
   # StixRelationship
   x_opencti_stix_ids: [StixId]
   is_inferred: Boolean!
-  from: StixObjectOrStixRelationship
-  to: StixObjectOrStixRelationship
+  from: StixObjectOrStixRelationshipOrCreator
+  to: StixObjectOrStixRelationshipOrCreator
   x_opencti_inferences: [Inference]
   spec_version: String!
   created: DateTime
@@ -11399,7 +11399,7 @@ type StixRefRelationship implements BasicRelationship & StixRelationship {
 }
 
 type DefinitionRefRelationship {
-  entity: StixObjectOrStixRelationship!
+  entity: StixObjectOrStixRelationshipOrCreator!
   from: [String!]
   to: [String!]
 }

diff --git a/opencti-platform/opencti-graphql/src/generated/graphql.ts b/opencti-platform/opencti-graphql/src/generated/graphql.ts