From 40a8cddaa02d69c85854de9ea93dcd2fb4b90211 Mon Sep 17 00:00:00 2001
From: ValentinBouzinFiligran
 <162980256+ValentinBouzinFiligran@users.noreply.github.com>
Date: Fri, 17 Jan 2025 16:29:43 +0100
Subject: [PATCH] [frontend] In create entity form (on the fly), spacing of the
 first field is not correct (#9567)

---
 .../analyses/groupings/GroupingCreation.tsx   |  2 +-
 .../MalwareAnalysisCreation.tsx               | 26 ++++++++--------
 .../analyses/reports/ReportCreation.tsx       |  4 +--
 .../arsenal/channels/ChannelCreation.tsx      | 22 ++++----------
 .../arsenal/malwares/MalwareCreation.tsx      |  2 +-
 .../components/arsenal/tools/ToolCreation.tsx |  2 +-
 .../vulnerabilities/VulnerabilityCreation.tsx | 30 ++++++-------------
 .../case_incidents/CaseIncidentCreation.tsx   |  2 +-
 .../cases/case_rfis/CaseRfiCreation.tsx       |  2 +-
 .../cases/case_rfts/CaseRftCreation.tsx       |  2 +-
 .../StixDomainObjectCreation.jsx              |  4 ++-
 .../entities/events/EventCreation.tsx         |  6 ++--
 .../individuals/IndividualCreation.tsx        |  2 +-
 .../entities/sectors/SectorCreation.tsx       |  2 +-
 .../entities/systems/SystemCreation.tsx       |  2 +-
 .../events/incidents/IncidentCreation.tsx     |  4 +--
 .../observed_data/ObservedDataCreation.tsx    |  8 ++---
 .../AdministrativeAreaCreation.tsx            |  6 ++--
 .../locations/cities/CityCreation.tsx         |  6 ++--
 .../locations/countries/CountryCreation.tsx   | 12 ++------
 .../locations/positions/PositionCreation.tsx  | 10 +++----
 .../locations/regions/RegionCreation.tsx      | 12 ++------
 .../indicators/IndicatorCreation.tsx          | 10 +++----
 .../InfrastructureCreation.tsx                |  8 ++---
 .../attack_patterns/AttackPatternCreation.tsx |  4 +--
 .../CourseOfActionCreation.tsx                |  2 +-
 .../data_components/DataComponentCreation.tsx | 22 ++++----------
 .../data_sources/DataSourceCreation.tsx       | 22 ++++----------
 .../threats/campaigns/CampaignCreation.tsx    |  2 +-
 .../intrusion_sets/IntrusionSetCreation.tsx   |  2 +-
 .../ThreatActorGroupCreation.tsx              |  6 ++--
 31 files changed, 94 insertions(+), 152 deletions(-)

diff --git a/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingCreation.tsx b/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingCreation.tsx
index 26830e6596a9..df627f826b40 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingCreation.tsx
@@ -216,7 +216,7 @@ export const GroupingCreationForm: FunctionComponent<GroupingFormProps> = ({
             fullWidth={true}
             multiline={true}
             rows="4"
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
             askAi={true}
           />
           <Field
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/MalwareAnalysisCreation.tsx b/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/MalwareAnalysisCreation.tsx
index 565d3b71db84..df93fe566df2 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/MalwareAnalysisCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/MalwareAnalysisCreation.tsx
@@ -229,7 +229,7 @@ MalwareAnalysisFormProps
             label={t_i18n('Report name')}
             required={mandatoryAttributes.includes('result_name')}
             fullWidth={true}
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <Field
             component={TextField}
@@ -237,7 +237,7 @@ MalwareAnalysisFormProps
             label={t_i18n('Version of the product')}
             required={mandatoryAttributes.includes('version')}
             fullWidth={true}
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <Field
             component={DateTimePickerField}
@@ -246,7 +246,7 @@ MalwareAnalysisFormProps
             textFieldProps={{
               label: t_i18n('Submission date'),
               fullWidth: true,
-              style: { marginTop: 20 },
+              style: { ...fieldSpacingContainerStyle },
               required: mandatoryAttributes.includes('submitted'),
             }}
           />
@@ -271,26 +271,26 @@ MalwareAnalysisFormProps
           <CreatedByField
             name="createdBy"
             required={mandatoryAttributes.includes('createdBy')}
-            style={{ marginTop: 20, width: '100%' }}
+            style={fieldSpacingContainerStyle}
             setFieldValue={setFieldValue}
           />
           <ObjectLabelField
             name="objectLabel"
             required={mandatoryAttributes.includes('objectLabel')}
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
             setFieldValue={setFieldValue}
             values={values.objectLabel}
           />
           <ObjectMarkingField
             name="objectMarking"
             required={mandatoryAttributes.includes('objectMarking')}
-            style={{ marginTop: 20, width: '100%' }}
+            style={fieldSpacingContainerStyle}
             setFieldValue={setFieldValue}
           />
           <ExternalReferencesField
             name="externalReferences"
             required={mandatoryAttributes.includes('externalReferences')}
-            style={{ marginTop: 20, width: '100%' }}
+            style={fieldSpacingContainerStyle}
             setFieldValue={setFieldValue}
             values={values.externalReferences}
           />
@@ -301,7 +301,7 @@ MalwareAnalysisFormProps
             required={mandatoryAttributes.includes('configuration_version')}
             label={t_i18n('Configuration version')}
             fullWidth
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <Field
             component={DateTimePickerField}
@@ -309,7 +309,7 @@ MalwareAnalysisFormProps
             textFieldProps={{
               label: t_i18n('Analysis started'),
               fullWidth: true,
-              style: { marginTop: 20 },
+              style: { ...fieldSpacingContainerStyle },
               required: mandatoryAttributes.includes('analysis_started'),
             }}
           />
@@ -319,7 +319,7 @@ MalwareAnalysisFormProps
             textFieldProps={{
               label: t_i18n('Analysis ended'),
               fullWidth: true,
-              style: { marginTop: 20 },
+              style: { ...fieldSpacingContainerStyle },
               required: mandatoryAttributes.includes('analysis_ended'),
             }}
           />
@@ -329,7 +329,7 @@ MalwareAnalysisFormProps
             required={mandatoryAttributes.includes('analysis_engine_version')}
             label={t_i18n('Analysis engine version')}
             fullWidth
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <Field
             component={TextField}
@@ -337,7 +337,7 @@ MalwareAnalysisFormProps
             required={mandatoryAttributes.includes('analysis_definition_version')}
             label={t_i18n('Analysis definition version')}
             fullWidth
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <Field
             component={TextField}
@@ -347,7 +347,7 @@ MalwareAnalysisFormProps
             fullWidth
             multiline
             rows="4"
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <div className={classes.buttons}>
             <Button
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportCreation.tsx b/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportCreation.tsx
index c39a3ad9f316..b17943fc05db 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportCreation.tsx
@@ -223,7 +223,7 @@ export const ReportCreationForm: FunctionComponent<ReportFormProps> = ({
               required: mandatoryAttributes.includes('published'),
               variant: 'standard',
               fullWidth: true,
-              style: { marginTop: 20 },
+              style: { ...fieldSpacingContainerStyle },
             }}
           />
           <OpenVocabField
@@ -256,7 +256,7 @@ export const ReportCreationForm: FunctionComponent<ReportFormProps> = ({
             fullWidth={true}
             multiline={true}
             rows="4"
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
             askAi={true}
           />
           <Field
diff --git a/opencti-platform/opencti-front/src/private/components/arsenal/channels/ChannelCreation.tsx b/opencti-platform/opencti-front/src/private/components/arsenal/channels/ChannelCreation.tsx
index 637eac2ec2fc..7f99eb60821d 100644
--- a/opencti-platform/opencti-front/src/private/components/arsenal/channels/ChannelCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/arsenal/channels/ChannelCreation.tsx
@@ -228,7 +228,7 @@ export const ChannelCreationForm: FunctionComponent<ChannelFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <ConfidenceField
               entityType="Channel"
@@ -236,35 +236,23 @@ export const ChannelCreationForm: FunctionComponent<ChannelFormProps> = ({
             />
             <CreatedByField
               name="createdBy"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ObjectLabelField
               name="objectLabel"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
               values={values.objectLabel}
             />
             <ObjectMarkingField
               name="objectMarking"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ExternalReferencesField
               name="externalReferences"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
               values={values.externalReferences}
             />
diff --git a/opencti-platform/opencti-front/src/private/components/arsenal/malwares/MalwareCreation.tsx b/opencti-platform/opencti-front/src/private/components/arsenal/malwares/MalwareCreation.tsx
index dfc1ee4226f8..3a6668a6935e 100644
--- a/opencti-platform/opencti-front/src/private/components/arsenal/malwares/MalwareCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/arsenal/malwares/MalwareCreation.tsx
@@ -281,7 +281,7 @@ export const MalwareCreationForm: FunctionComponent<MalwareFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
               askAi={true}
             />
             <OpenVocabField
diff --git a/opencti-platform/opencti-front/src/private/components/arsenal/tools/ToolCreation.tsx b/opencti-platform/opencti-front/src/private/components/arsenal/tools/ToolCreation.tsx
index 51d50ea6c4a0..80982322339e 100644
--- a/opencti-platform/opencti-front/src/private/components/arsenal/tools/ToolCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/arsenal/tools/ToolCreation.tsx
@@ -230,7 +230,7 @@ export const ToolCreationForm: FunctionComponent<ToolFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
               askAi={true}
             />
             <ConfidenceField
diff --git a/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/VulnerabilityCreation.tsx b/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/VulnerabilityCreation.tsx
index 620c33690b56..dcba45c5d5e0 100644
--- a/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/VulnerabilityCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/VulnerabilityCreation.tsx
@@ -265,7 +265,7 @@ export const VulnerabilityCreationForm: FunctionComponent<VulnerabilityFormProps
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
               askAi={true}
             />
             <Field
@@ -276,7 +276,7 @@ export const VulnerabilityCreationForm: FunctionComponent<VulnerabilityFormProps
               type="number"
               step="0.1"
               fullWidth={true}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             { /* TODO Dont touch until CVSS4 */}
             <Field
@@ -285,10 +285,7 @@ export const VulnerabilityCreationForm: FunctionComponent<VulnerabilityFormProps
               name="x_opencti_cvss_base_severity"
               label={t_i18n('CVSS3 - Severity')}
               fullWidth={true}
-              containerstyle={{
-                width: '100%',
-                marginTop: 20,
-              }}
+              containerstyle={fieldSpacingContainerStyle}
             >
               <MenuItem value="CRITICAL">{t_i18n('CRITICAL')}</MenuItem>
               <MenuItem value="HIGH">{t_i18n('HIGH')}</MenuItem>
@@ -314,7 +311,7 @@ export const VulnerabilityCreationForm: FunctionComponent<VulnerabilityFormProps
               name="x_opencti_cisa_kev"
               label={t_i18n('CISA KEV')}
               fullWidth
-              containerstyle={{ marginTop: 20 }}
+              containerstyle={fieldSpacingContainerStyle}
             />
             <Field
               component={TextField}
@@ -323,7 +320,7 @@ export const VulnerabilityCreationForm: FunctionComponent<VulnerabilityFormProps
               label={t_i18n('EPSS Score')}
               type="number"
               fullWidth={true}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <Field
               component={TextField}
@@ -332,31 +329,22 @@ export const VulnerabilityCreationForm: FunctionComponent<VulnerabilityFormProps
               label={t_i18n('EPSS Percentile')}
               type="number"
               fullWidth={true}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <CreatedByField
               name="createdBy"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ObjectLabelField
               name="objectLabel"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
               values={values.objectLabel}
             />
             <ObjectMarkingField
               name="objectMarking"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ExternalReferencesField
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/CaseIncidentCreation.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/CaseIncidentCreation.tsx
index dc1e25b9e70f..82f1f1c1905a 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/CaseIncidentCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/CaseIncidentCreation.tsx
@@ -220,7 +220,7 @@ export const CaseIncidentCreationForm: FunctionComponent<IncidentFormProps> = ({
               label: t_i18n('Incident date'),
               variant: 'standard',
               fullWidth: true,
-              style: { marginTop: 20 },
+              style: { ...fieldSpacingContainerStyle },
             }}
           />
           <OpenVocabField
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiCreation.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiCreation.tsx
index 1e8b0a26ffb2..cb04c29c1034 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiCreation.tsx
@@ -215,7 +215,7 @@ export const CaseRfiCreationForm: FunctionComponent<CaseRfiFormProps> = ({
               label: t_i18n('Request For Information Date'),
               variant: 'standard',
               fullWidth: true,
-              style: { marginTop: 20 },
+              style: { ...fieldSpacingContainerStyle },
             }}
           />
           <OpenVocabField
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftCreation.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftCreation.tsx
index 15bc81af696f..9c5d12ea27d2 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftCreation.tsx
@@ -216,7 +216,7 @@ export const CaseRftCreationForm: FunctionComponent<CaseRftFormProps> = ({
               label: t_i18n('Request For Takedown Date'),
               variant: 'standard',
               fullWidth: true,
-              style: { marginTop: 20 },
+              style: { ...fieldSpacingContainerStyle },
             }}
           />
           <OpenVocabField
diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectCreation.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectCreation.jsx
index dfb1f9579a22..bbb4fe37920c 100644
--- a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectCreation.jsx
+++ b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectCreation.jsx
@@ -797,7 +797,9 @@ const StixDomainPanel = ({
             </MenuItem>
           ))}
         </Select>
-        {renderEntityCreationInterface()}
+        <div style={{ marginTop: '20px' }}>
+          {renderEntityCreationInterface()}
+        </div>
       </DialogContent>
     </Dialog>
   );
diff --git a/opencti-platform/opencti-front/src/private/components/entities/events/EventCreation.tsx b/opencti-platform/opencti-front/src/private/components/entities/events/EventCreation.tsx
index 38b202ea3b0b..706b6bb0e39f 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/events/EventCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/events/EventCreation.tsx
@@ -239,7 +239,7 @@ export const EventCreationForm: FunctionComponent<EventFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows={4}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <Field
               component={DateTimePickerField}
@@ -248,7 +248,7 @@ export const EventCreationForm: FunctionComponent<EventFormProps> = ({
                 label: t_i18n('Start date'),
                 variant: 'standard',
                 fullWidth: true,
-                style: { marginTop: 20 },
+                style: { ...fieldSpacingContainerStyle },
               }}
             />
             <Field
@@ -258,7 +258,7 @@ export const EventCreationForm: FunctionComponent<EventFormProps> = ({
                 label: t_i18n('End date'),
                 variant: 'standard',
                 fullWidth: true,
-                style: { marginTop: 20 },
+                style: { ...fieldSpacingContainerStyle },
               }}
             />
             <ConfidenceField
diff --git a/opencti-platform/opencti-front/src/private/components/entities/individuals/IndividualCreation.tsx b/opencti-platform/opencti-front/src/private/components/entities/individuals/IndividualCreation.tsx
index d309c33d0b4a..cad837617d9a 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/individuals/IndividualCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/individuals/IndividualCreation.tsx
@@ -231,7 +231,7 @@ export const IndividualCreationForm: FunctionComponent<IndividualFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <ConfidenceField
               entityType="Individual"
diff --git a/opencti-platform/opencti-front/src/private/components/entities/sectors/SectorCreation.tsx b/opencti-platform/opencti-front/src/private/components/entities/sectors/SectorCreation.tsx
index 93a9e419105d..fe72ee6578ba 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/sectors/SectorCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/sectors/SectorCreation.tsx
@@ -249,7 +249,7 @@ export const SectorCreationForm: FunctionComponent<SectorFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <ConfidenceField
               entityType="Sector"
diff --git a/opencti-platform/opencti-front/src/private/components/entities/systems/SystemCreation.tsx b/opencti-platform/opencti-front/src/private/components/entities/systems/SystemCreation.tsx
index 1cb36f3e78e0..a486a5c628f4 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/systems/SystemCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/systems/SystemCreation.tsx
@@ -234,7 +234,7 @@ export const SystemCreationForm: FunctionComponent<SystemFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <ConfidenceField
               entityType="System"
diff --git a/opencti-platform/opencti-front/src/private/components/events/incidents/IncidentCreation.tsx b/opencti-platform/opencti-front/src/private/components/events/incidents/IncidentCreation.tsx
index 69650845bce6..da6da504c6a5 100644
--- a/opencti-platform/opencti-front/src/private/components/events/incidents/IncidentCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/events/incidents/IncidentCreation.tsx
@@ -218,7 +218,7 @@ export const IncidentCreationForm: FunctionComponent<IncidentCreationProps> = ({
             fullWidth={true}
             multiline={true}
             rows="4"
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <Field
             component={TextField}
@@ -226,7 +226,7 @@ export const IncidentCreationForm: FunctionComponent<IncidentCreationProps> = ({
             name="source"
             label={t_i18n('Source')}
             fullWidth={true}
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <ObjectAssigneeField
             name="objectAssignee"
diff --git a/opencti-platform/opencti-front/src/private/components/events/observed_data/ObservedDataCreation.tsx b/opencti-platform/opencti-front/src/private/components/events/observed_data/ObservedDataCreation.tsx
index 438370b409ec..0f8dc2e42063 100644
--- a/opencti-platform/opencti-front/src/private/components/events/observed_data/ObservedDataCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/events/observed_data/ObservedDataCreation.tsx
@@ -177,7 +177,7 @@ ObservedDataFormProps
         <Form>
           <StixCoreObjectsField
             name="objects"
-            style={{ width: '100%' }}
+            style={fieldSpacingContainerStyle}
             setFieldValue={setFieldValue}
             values={values.objects}
           />
@@ -188,7 +188,7 @@ ObservedDataFormProps
               label: t_i18n('First observed'),
               variant: 'standard',
               fullWidth: true,
-              style: { marginTop: 20 },
+              style: { ...fieldSpacingContainerStyle },
             }}
           />
           <Field
@@ -198,7 +198,7 @@ ObservedDataFormProps
               label: t_i18n('Last observed'),
               variant: 'standard',
               fullWidth: true,
-              style: { marginTop: 20 },
+              style: { ...fieldSpacingContainerStyle },
             }}
           />
           <Field
@@ -208,7 +208,7 @@ ObservedDataFormProps
             type="number"
             label={t_i18n('Number observed')}
             fullWidth={true}
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <ConfidenceField
             entityType="Observed-Data"
diff --git a/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/AdministrativeAreaCreation.tsx b/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/AdministrativeAreaCreation.tsx
index b0e70f14546b..ef57199cad0b 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/AdministrativeAreaCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/AdministrativeAreaCreation.tsx
@@ -232,7 +232,7 @@ export const AdministrativeAreaCreationForm: FunctionComponent<AdministrativeAre
               fullWidth={true}
               multiline={true}
               rows={4}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <ConfidenceField
               entityType="Administrative-Area"
@@ -244,7 +244,7 @@ export const AdministrativeAreaCreationForm: FunctionComponent<AdministrativeAre
               name="latitude"
               label={t_i18n('Latitude')}
               fullWidth={true}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <Field
               component={TextField}
@@ -252,7 +252,7 @@ export const AdministrativeAreaCreationForm: FunctionComponent<AdministrativeAre
               name="longitude"
               label={t_i18n('Longitude')}
               fullWidth={true}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <CreatedByField
               name="createdBy"
diff --git a/opencti-platform/opencti-front/src/private/components/locations/cities/CityCreation.tsx b/opencti-platform/opencti-front/src/private/components/locations/cities/CityCreation.tsx
index 65e0128c4c95..a988fe8b7424 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/cities/CityCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/cities/CityCreation.tsx
@@ -223,7 +223,7 @@ export const CityCreationForm: FunctionComponent<CityFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows={4}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <ConfidenceField
               entityType="City"
@@ -234,14 +234,14 @@ export const CityCreationForm: FunctionComponent<CityFormProps> = ({
               name="latitude"
               label={t_i18n('Latitude')}
               fullWidth={true}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <Field
               component={TextField}
               name="longitude"
               label={t_i18n('Longitude')}
               fullWidth={true}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <CreatedByField
               name="createdBy"
diff --git a/opencti-platform/opencti-front/src/private/components/locations/countries/CountryCreation.tsx b/opencti-platform/opencti-front/src/private/components/locations/countries/CountryCreation.tsx
index ecdbb7079e28..5d1a9bac1174 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/countries/CountryCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/countries/CountryCreation.tsx
@@ -214,7 +214,7 @@ export const CountryCreationForm: FunctionComponent<CountryFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <ConfidenceField
               entityType="Country"
@@ -222,10 +222,7 @@ export const CountryCreationForm: FunctionComponent<CountryFormProps> = ({
             />
             <CreatedByField
               name="createdBy"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ObjectLabelField
@@ -236,10 +233,7 @@ export const CountryCreationForm: FunctionComponent<CountryFormProps> = ({
             />
             <ObjectMarkingField
               name="objectMarking"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ExternalReferencesField
diff --git a/opencti-platform/opencti-front/src/private/components/locations/positions/PositionCreation.tsx b/opencti-platform/opencti-front/src/private/components/locations/positions/PositionCreation.tsx
index bd08bb801106..b41d51cad230 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/positions/PositionCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/positions/PositionCreation.tsx
@@ -237,7 +237,7 @@ export const PositionCreationForm: FunctionComponent<PositionFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows={4}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <ConfidenceField
               entityType="Position"
@@ -249,7 +249,7 @@ export const PositionCreationForm: FunctionComponent<PositionFormProps> = ({
               name="latitude"
               label={t_i18n('Latitude')}
               fullWidth={true}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <Field
               component={TextField}
@@ -257,7 +257,7 @@ export const PositionCreationForm: FunctionComponent<PositionFormProps> = ({
               name="longitude"
               label={t_i18n('Longitude')}
               fullWidth={true}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <Field
               component={TextField}
@@ -265,7 +265,7 @@ export const PositionCreationForm: FunctionComponent<PositionFormProps> = ({
               name="street_address"
               label={t_i18n('Street address')}
               fullWidth={true}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <Field
               component={TextField}
@@ -273,7 +273,7 @@ export const PositionCreationForm: FunctionComponent<PositionFormProps> = ({
               name="postal_code"
               label={t_i18n('Postal code')}
               fullWidth={true}
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <CreatedByField
               name="createdBy"
diff --git a/opencti-platform/opencti-front/src/private/components/locations/regions/RegionCreation.tsx b/opencti-platform/opencti-front/src/private/components/locations/regions/RegionCreation.tsx
index 24105b998e60..0a0a109a27d9 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/regions/RegionCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/regions/RegionCreation.tsx
@@ -211,7 +211,7 @@ export const RegionCreationForm: FunctionComponent<RegionFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <ConfidenceField
               entityType="Region"
@@ -219,10 +219,7 @@ export const RegionCreationForm: FunctionComponent<RegionFormProps> = ({
             />
             <CreatedByField
               name="createdBy"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ObjectLabelField
@@ -233,10 +230,7 @@ export const RegionCreationForm: FunctionComponent<RegionFormProps> = ({
             />
             <ObjectMarkingField
               name="objectMarking"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ExternalReferencesField
diff --git a/opencti-platform/opencti-front/src/private/components/observations/indicators/IndicatorCreation.tsx b/opencti-platform/opencti-front/src/private/components/observations/indicators/IndicatorCreation.tsx
index 5c5bd1fe68db..d4655af8bf78 100644
--- a/opencti-platform/opencti-front/src/private/components/observations/indicators/IndicatorCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/observations/indicators/IndicatorCreation.tsx
@@ -270,7 +270,7 @@ export const IndicatorCreationForm: FunctionComponent<IndicatorFormProps> = ({
             fullWidth={true}
             multiline={true}
             rows="4"
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
             detectDuplicate={['Indicator']}
           />
           <TypesField
@@ -285,7 +285,7 @@ export const IndicatorCreationForm: FunctionComponent<IndicatorFormProps> = ({
               label: t_i18n('Valid from'),
               variant: 'standard',
               fullWidth: true,
-              style: { marginTop: 20 },
+              style: { ...fieldSpacingContainerStyle },
             }}
           />
           <Field
@@ -295,7 +295,7 @@ export const IndicatorCreationForm: FunctionComponent<IndicatorFormProps> = ({
               label: t_i18n('Valid until'),
               variant: 'standard',
               fullWidth: true,
-              style: { marginTop: 20 },
+              style: { ...fieldSpacingContainerStyle },
             }}
           />
           <OpenVocabField
@@ -313,7 +313,7 @@ export const IndicatorCreationForm: FunctionComponent<IndicatorFormProps> = ({
             label={t_i18n('Score')}
             type="number"
             fullWidth={true}
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <Field
             component={MarkdownField}
@@ -322,7 +322,7 @@ export const IndicatorCreationForm: FunctionComponent<IndicatorFormProps> = ({
             fullWidth={true}
             multiline={true}
             rows="4"
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <KillChainPhasesField
             name="killChainPhases"
diff --git a/opencti-platform/opencti-front/src/private/components/observations/infrastructures/InfrastructureCreation.tsx b/opencti-platform/opencti-front/src/private/components/observations/infrastructures/InfrastructureCreation.tsx
index f6776e877f1b..71f96f7ab380 100644
--- a/opencti-platform/opencti-front/src/private/components/observations/infrastructures/InfrastructureCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/observations/infrastructures/InfrastructureCreation.tsx
@@ -249,7 +249,7 @@ export const InfrastructureCreationForm: FunctionComponent<InfrastructureFormPro
             />
             <ConfidenceField
               entityType="Infrastructure"
-              containerStyle={{ width: '100%', marginTop: 20 }}
+              containerStyle={fieldSpacingContainerStyle}
             />
             <Field
               component={DateTimePickerField}
@@ -258,7 +258,7 @@ export const InfrastructureCreationForm: FunctionComponent<InfrastructureFormPro
                 label: t_i18n('First seen'),
                 variant: 'standard',
                 fullWidth: true,
-                style: { marginTop: 20 },
+                style: { ...fieldSpacingContainerStyle },
               }}
             />
             <Field
@@ -268,7 +268,7 @@ export const InfrastructureCreationForm: FunctionComponent<InfrastructureFormPro
                 label: t_i18n('Last seen'),
                 variant: 'standard',
                 fullWidth: true,
-                style: { marginTop: 20 },
+                style: { ...fieldSpacingContainerStyle },
               }}
             />
             <KillChainPhasesField
@@ -282,7 +282,7 @@ export const InfrastructureCreationForm: FunctionComponent<InfrastructureFormPro
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <CreatedByField
               name="createdBy"
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/AttackPatternCreation.tsx b/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/AttackPatternCreation.tsx
index ddddb39d8659..bd0bffdb87ab 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/AttackPatternCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/AttackPatternCreation.tsx
@@ -210,7 +210,7 @@ export const AttackPatternCreationForm: FunctionComponent<AttackPatternFormProps
             name="x_mitre_id"
             label={t_i18n('External ID')}
             fullWidth={true}
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <Field
             component={MarkdownField}
@@ -219,7 +219,7 @@ export const AttackPatternCreationForm: FunctionComponent<AttackPatternFormProps
             fullWidth={true}
             multiline={true}
             rows="4"
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <ConfidenceField
             entityType="Attack-Pattern"
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/courses_of_action/CourseOfActionCreation.tsx b/opencti-platform/opencti-front/src/private/components/techniques/courses_of_action/CourseOfActionCreation.tsx
index f18cd6be0d6e..047d66602d70 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/courses_of_action/CourseOfActionCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/courses_of_action/CourseOfActionCreation.tsx
@@ -211,7 +211,7 @@ export const CourseOfActionCreationForm: FunctionComponent<CourseOfActionFormPro
             fullWidth={true}
             multiline={true}
             rows="4"
-            style={{ marginTop: 20 }}
+            style={fieldSpacingContainerStyle}
           />
           <ConfidenceField
             entityType="Course-Of-Action"
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/data_components/DataComponentCreation.tsx b/opencti-platform/opencti-front/src/private/components/techniques/data_components/DataComponentCreation.tsx
index 65afde524795..155064f14891 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/data_components/DataComponentCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/data_components/DataComponentCreation.tsx
@@ -240,39 +240,27 @@ export const DataComponentCreationForm: FunctionComponent<DataComponentFormProps
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <CreatedByField
               name="createdBy"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ObjectLabelField
               name="objectLabel"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
               values={values.objectLabel}
             />
             <ObjectMarkingField
               name="objectMarking"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ExternalReferencesField
               name="externalReferences"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
               values={values.externalReferences}
             />
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/data_sources/DataSourceCreation.tsx b/opencti-platform/opencti-front/src/private/components/techniques/data_sources/DataSourceCreation.tsx
index 85cc4e5fc699..4780cd4650e3 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/data_sources/DataSourceCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/data_sources/DataSourceCreation.tsx
@@ -237,39 +237,27 @@ export const DataSourceCreationForm: FunctionComponent<DataSourceFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <CreatedByField
               name="createdBy"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ObjectLabelField
               name="objectLabel"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
               values={values.objectLabel}
             />
             <ObjectMarkingField
               name="objectMarking"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
             />
             <ExternalReferencesField
               name="externalReferences"
-              style={{
-                marginTop: 20,
-                width: '100%',
-              }}
+              style={fieldSpacingContainerStyle}
               setFieldValue={setFieldValue}
               values={values.externalReferences}
             />
diff --git a/opencti-platform/opencti-front/src/private/components/threats/campaigns/CampaignCreation.tsx b/opencti-platform/opencti-front/src/private/components/threats/campaigns/CampaignCreation.tsx
index de95ec9a0cf0..607b56c56c98 100644
--- a/opencti-platform/opencti-front/src/private/components/threats/campaigns/CampaignCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/threats/campaigns/CampaignCreation.tsx
@@ -224,7 +224,7 @@ export const CampaignCreationForm: FunctionComponent<CampaignFormProps> = ({
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
               askAi={true}
             />
             <CreatedByField
diff --git a/opencti-platform/opencti-front/src/private/components/threats/intrusion_sets/IntrusionSetCreation.tsx b/opencti-platform/opencti-front/src/private/components/threats/intrusion_sets/IntrusionSetCreation.tsx
index c9e31f646f21..6c14ea5165f2 100644
--- a/opencti-platform/opencti-front/src/private/components/threats/intrusion_sets/IntrusionSetCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/threats/intrusion_sets/IntrusionSetCreation.tsx
@@ -225,7 +225,7 @@ IntrusionSetFormProps
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
             />
             <CreatedByField
               name="createdBy"
diff --git a/opencti-platform/opencti-front/src/private/components/threats/threat_actors_group/ThreatActorGroupCreation.tsx b/opencti-platform/opencti-front/src/private/components/threats/threat_actors_group/ThreatActorGroupCreation.tsx
index ee050fd86099..d9fe5a10c668 100644
--- a/opencti-platform/opencti-front/src/private/components/threats/threat_actors_group/ThreatActorGroupCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/threats/threat_actors_group/ThreatActorGroupCreation.tsx
@@ -223,12 +223,12 @@ ThreatActorGroupFormProps
               name="threat_actor_types"
               label={t_i18n('Threat actor types')}
               multiple={true}
-              containerStyle={{ width: '100%', marginTop: 20 }}
+              containerStyle={fieldSpacingContainerStyle}
               onChange={setFieldValue}
             />
             <ConfidenceField
               entityType="Threat-Actor-Group"
-              containerStyle={{ width: '100%', marginTop: 20 }}
+              containerStyle={fieldSpacingContainerStyle}
             />
             <Field
               component={MarkdownField}
@@ -237,7 +237,7 @@ ThreatActorGroupFormProps
               fullWidth={true}
               multiline={true}
               rows="4"
-              style={{ marginTop: 20 }}
+              style={fieldSpacingContainerStyle}
               askAi={true}
             />
             <CreatedByField