[frontend/backend] Update stixDomainObjectsExportAsk (#5797)

OpenCTI-Platform · Mar 29, 2024 · f853e14 · f853e14
1 parent f228c8b
commit f853e14
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/...ont/src/private/components/common/stix_domain_objects/StixDomainObjectsExportCreation.jsx b/...ont/src/private/components/common/stix_domain_objects/StixDomainObjectsExportCreation.jsx
@@ -15,7 +15,7 @@ import MenuItem from '@mui/material/MenuItem';
 import * as Yup from 'yup';
 import Tooltip from '@mui/material/Tooltip';
 import Fab from '@mui/material/Fab';
-import ObjectMarkingField from '@components/common/form/ObjectMarkingField';
+import ObjectMarkingField from '../form/ObjectMarkingField';
 import inject18n from '../../../../components/i18n';
 import { commitMutation, MESSAGING$ } from '../../../../relay/environment';
 import SelectField from '../../../../components/SelectField';
@@ -49,7 +49,8 @@ export const StixDomainObjectsExportCreationMutation = graphql`
  mutation StixDomainObjectsExportCreationMutation(
  $format: String!
  $exportType: String!
- $maxMarkingDefinition: String
+ $contentMaxMarkings: [String]
+ $fileMarkings: [String]
  $exportContext: ExportContext
  $search: String
  $orderBy: StixDomainObjectsOrdering
@@ -61,7 +62,8 @@ export const StixDomainObjectsExportCreationMutation = graphql`
  stixDomainObjectsExportAsk(
  format: $format
  exportType: $exportType
- maxMarkingDefinition: $maxMarkingDefinition
+ contentMaxMarkings: $contentMaxMarkings
+ fileMarkings: $fileMarkings
  exportContext: $exportContext
  search: $search
  orderBy: $orderBy
@@ -114,9 +116,6 @@ class StixDomainObjectsExportCreationComponent extends Component {
 
  onSubmit(selectedIds, values, { setSubmitting, resetForm }) {
  const { paginationOptions, exportContext } = this.props;
- const maxMarkingDefinition = values.maxMarkingDefinition === 'none'
- ? null
- : values.maxMarkingDefinition;
 
  const contentMaxMarkingDefinitions = values.contentMaxMarkingDefinitions.map(({ value }) => value); // rename to contentMaxMarkings
  const fileMarkingDefinitions = values.fileMarkingDefinitions.map(({ value }) => value); // rename to fileMarkings
@@ -126,7 +125,6 @@ class StixDomainObjectsExportCreationComponent extends Component {
  variables: {
  format: values.format,
  exportType: values.type,
- maxMarkingDefinition,
  contentMaxMarkings: contentMaxMarkingDefinitions,
  fileMarkings: fileMarkingDefinitions,
  exportContext,

diff --git a/opencti-platform/opencti-front/src/schema/relay.schema.graphql b/opencti-platform/opencti-front/src/schema/relay.schema.graphql
@@ -7927,7 +7927,7 @@ type Mutation {
  stixCoreObjectsExportPush(entity_id: String, entity_type: String!, file: Upload!, listFilters: String): Boolean
  stixDomainObjectAdd(input: StixDomainObjectAddInput!): StixDomainObject
  stixDomainObjectEdit(id: ID!): StixDomainObjectEditMutations
- stixDomainObjectsExportAsk(format: String!, exportType: String!, maxMarkingDefinition: String, search: String, exportContext: ExportContext, relationship_type: [String], orderBy: StixDomainObjectsOrdering, orderMode: OrderingMode, filters: FilterGroup, selectedIds: [String]): [File!]
+ stixDomainObjectsExportAsk(format: String!, exportType: String!, contentMaxMarkings: [String], fileMarkings: [String], search: String, exportContext: ExportContext, relationship_type: [String], orderBy: StixDomainObjectsOrdering, orderMode: OrderingMode, filters: FilterGroup, selectedIds: [String]): [File!]
  stixDomainObjectsDelete(id: [ID]!): [ID]!
  stixDomainObjectsExportPush(entity_id: String, entity_type: String!, file: Upload!, listFilters: String): Boolean
  attackPatternAdd(input: AttackPatternAddInput!): AttackPattern

diff --git a/opencti-platform/opencti-graphql/config/schema/opencti.graphql b/opencti-platform/opencti-graphql/config/schema/opencti.graphql
@@ -12465,7 +12465,8 @@ type Mutation {
  stixDomainObjectsExportAsk(
  format: String!
  exportType: String!
- maxMarkingDefinition: String
+ contentMaxMarkings: [String],
+ fileMarkings: [String]
  search: String
  exportContext: ExportContext
  relationship_type: [String]

diff --git a/opencti-platform/opencti-graphql/src/generated/graphql.ts b/opencti-platform/opencti-graphql/src/generated/graphql.ts
@@ -13997,11 +13997,12 @@ export type MutationStixDomainObjectsDeleteArgs = {
 
 
 export type MutationStixDomainObjectsExportAskArgs = {
+ contentMaxMarkings?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
  exportContext?: InputMaybe<ExportContext>;
  exportType: Scalars['String']['input'];
+ fileMarkings?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
  filters?: InputMaybe<FilterGroup>;
  format: Scalars['String']['input'];
- maxMarkingDefinition?: InputMaybe<Scalars['String']['input']>;
  orderBy?: InputMaybe<StixDomainObjectsOrdering>;
  orderMode?: InputMaybe<OrderingMode>;
  relationship_type?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;