From 8a6f69be79d711714e7b49b98fdc2fb8a1666435 Mon Sep 17 00:00:00 2001 From: Adrien Servel <50013774+Kedae@users.noreply.github.com> Date: Sat, 2 Mar 2024 09:42:11 +0100 Subject: [PATCH] [frontend/backend] Add PAP at init + fix leftbar (#6154) --- .../src/private/components/nav/LeftBar.jsx | 55 +++++++------- .../src/database/data-initialization.js | 28 +++++++- .../01-database/elasticSearch-test.js | 24 ++++--- .../01-database/marking-definition-test.js | 72 +++++++++---------- .../02-resolvers/markingDefinition-test.js | 4 +- .../tests/03-streams/00-Raw/raw-test.js | 4 +- .../opencti-graphql/tests/utils/testQuery.ts | 4 +- 7 files changed, 108 insertions(+), 83 deletions(-) diff --git a/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx b/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx index 5d44e9b1f33d..4710f0256412 100644 --- a/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx +++ b/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx @@ -1,4 +1,4 @@ -import React, { useState, useRef, useLayoutEffect } from 'react'; +import React, { useRef, useState } from 'react'; import { Link, useHistory, useLocation } from 'react-router-dom'; import { createStyles, makeStyles, styled, useTheme } from '@mui/styles'; import Toolbar from '@mui/material/Toolbar'; @@ -10,41 +10,41 @@ import Divider from '@mui/material/Divider'; import Drawer from '@mui/material/Drawer'; import Tooltip, { tooltipClasses } from '@mui/material/Tooltip'; import { + AccountBalanceOutlined, AssignmentOutlined, + BiotechOutlined, + BugReportOutlined, CasesOutlined, ChevronLeft, ChevronRight, ConstructionOutlined, DashboardOutlined, + DescriptionOutlined, + DiamondOutlined, + DomainOutlined, + EventOutlined, + ExpandLessOutlined, + ExpandMoreOutlined, ExploreOutlined, + FlagOutlined, InsertChartOutlinedOutlined, LayersOutlined, - DescriptionOutlined, - WorkspacesOutlined, - BiotechOutlined, - SubjectOutlined, LocalOfferOutlined, - TaskAltOutlined, - VisibilityOutlined, - WifiTetheringOutlined, - ExpandLessOutlined, - ExpandMoreOutlined, - DiamondOutlined, - BugReportOutlined, - WebAssetOutlined, - SurroundSoundOutlined, - StreamOutlined, - SourceOutlined, - SpeakerNotesOutlined, + MapOutlined, PersonOutlined, - StorageOutlined, - AccountBalanceOutlined, - EventOutlined, - DomainOutlined, PlaceOutlined, - MapOutlined, - FlagOutlined, PublicOutlined, + SourceOutlined, + SpeakerNotesOutlined, + StorageOutlined, + StreamOutlined, + SubjectOutlined, + SurroundSoundOutlined, + TaskAltOutlined, + VisibilityOutlined, + WebAssetOutlined, + WifiTetheringOutlined, + WorkspacesOutlined, } from '@mui/icons-material'; import { AccountMultipleOutline, @@ -304,10 +304,6 @@ const LeftBar = () => { } = useAuth(); const settingsMessagesBannerHeight = useSettingsMessagesBannerHeight(); const { dimension } = useDimensions(); - const [height, setHeight] = useState(0); - useLayoutEffect(() => { - setHeight(ref.current.offsetHeight); - }, [selectedMenu]); const isMobile = dimension.width < 768; const generateSubMenu = (menu, entries) => { return navOpen ? ( @@ -860,12 +856,11 @@ const LeftBar = () => { -
+
{(!platform_whitemark || !isEnterpriseEdition) && ( { )} { - // Create marking defs + // Create marking defs for TLP await addMarkingDefinition(context, SYSTEM_USER, { definition_type: 'TLP', definition: 'TLP:CLEAR', @@ -136,6 +136,32 @@ const createMarkingDefinitions = async (context) => { x_opencti_color: '#c62828', x_opencti_order: 4, }); + + // Creation markings for PAP + await addMarkingDefinition(context, SYSTEM_USER, { + definition_type: 'PAP', + definition: 'PAP:CLEAR', + x_opencti_color: '#ffffff', + x_opencti_order: 1, + }); + await addMarkingDefinition(context, SYSTEM_USER, { + definition_type: 'PAP', + definition: 'PAP:GREEN', + x_opencti_color: '#2e7d32', + x_opencti_order: 2, + }); + await addMarkingDefinition(context, SYSTEM_USER, { + definition_type: 'PAP', + definition: 'PAP:AMBER', + x_opencti_color: '#d84315', + x_opencti_order: 3, + }); + await addMarkingDefinition(context, SYSTEM_USER, { + definition_type: 'PAP', + definition: 'PAP:RED', + x_opencti_color: '#c62828', + x_opencti_order: 4, + }); }; const createVocabularies = async (context) => { diff --git a/opencti-platform/opencti-graphql/tests/02-integration/01-database/elasticSearch-test.js b/opencti-platform/opencti-graphql/tests/02-integration/01-database/elasticSearch-test.js index 23ae39d265d4..48d9d861e853 100644 --- a/opencti-platform/opencti-graphql/tests/02-integration/01-database/elasticSearch-test.js +++ b/opencti-platform/opencti-graphql/tests/02-integration/01-database/elasticSearch-test.js @@ -396,7 +396,7 @@ describe('Elasticsearch pagination', () => { it('should entity paginate everything', async () => { const data = await elPaginate(testContext, ADMIN_USER, READ_ENTITIES_INDICES, { first: ES_MAX_PAGINATION }); expect(data).not.toBeNull(); - expect(data.edges.length).toEqual(502); + expect(data.edges.length).toEqual(506); const filterBaseTypes = R.uniq(R.map((e) => e.node.base_type, data.edges)); expect(filterBaseTypes.length).toEqual(1); expect(R.head(filterBaseTypes)).toEqual('ENTITY'); @@ -501,7 +501,7 @@ describe('Elasticsearch pagination', () => { filterGroups: [], }; const data = await elPaginate(testContext, ADMIN_USER, READ_ENTITIES_INDICES, { filters }); - expect(data.edges.length).toEqual(7); + expect(data.edges.length).toEqual(11); }); it('should entity paginate with equality filter', async () => { // eq operation will use the field.keyword to do an exact field equality @@ -511,7 +511,7 @@ describe('Elasticsearch pagination', () => { filterGroups: [], }; let data = await elPaginate(testContext, ADMIN_USER, READ_ENTITIES_INDICES, { filters }); - expect(data.edges.length).toEqual(1); + expect(data.edges.length).toEqual(2); // Special case when operator = eq + the field key is a dateFields => use a match filters = { mode: 'and', @@ -528,7 +528,7 @@ describe('Elasticsearch pagination', () => { filterGroups: [], }; let data = await elPaginate(testContext, ADMIN_USER, READ_ENTITIES_INDICES, { filters }); - expect(data.edges.length).toEqual(7); // The 4 Default TLP + MITRE Corporation + expect(data.edges.length).toEqual(11); // The 4 Default TLP + MITRE Corporation // Verify that nothing is found in this case if using the eq operator filters = { mode: 'and', @@ -555,7 +555,7 @@ describe('Elasticsearch pagination', () => { filterGroups: [], }; data = await elPaginate(testContext, ADMIN_USER, READ_ENTITIES_INDICES, { filters, first: ES_MAX_PAGINATION }); - expect(data.edges.length).toEqual(356); + expect(data.edges.length).toEqual(360); filters = { mode: 'and', filters: [ @@ -573,7 +573,7 @@ describe('Elasticsearch pagination', () => { orderMode: 'asc', first: ES_MAX_PAGINATION }); - expect(data.edges.length).toEqual(502); + expect(data.edges.length).toEqual(506); const createdDates = R.map((e) => e.node.created, data.edges); let previousCreatedDate = null; for (let index = 0; index < createdDates.length; index += 1) { @@ -600,7 +600,7 @@ describe('Elasticsearch pagination', () => { orderBy: 'definition', orderMode: 'desc', }); - expect(data.edges.length).toEqual(7); + expect(data.edges.length).toEqual(11); const markings = R.map((e) => e.node.definition, data.edges); expect(markings[0]).toEqual('TLP:TEST'); expect(markings[1]).toEqual('TLP:RED'); @@ -608,12 +608,16 @@ describe('Elasticsearch pagination', () => { expect(markings[3]).toEqual('TLP:CLEAR'); expect(markings[4]).toEqual('TLP:AMBER+STRICT'); expect(markings[5]).toEqual('TLP:AMBER'); + expect(markings[6]).toEqual('PAP:RED'); + expect(markings[7]).toEqual('PAP:GREEN'); + expect(markings[8]).toEqual('PAP:CLEAR'); + expect(markings[9]).toEqual('PAP:AMBER'); }); it('should relation paginate everything', async () => { let data = await elPaginate(testContext, ADMIN_USER, READ_RELATIONSHIPS_INDICES, { includeAuthorities: true }); expect(data).not.toBeNull(); const groupByIndices = R.groupBy((e) => e.node._index, data.edges); - expect(groupByIndices[`${ES_INDEX_PREFIX}_internal_relationships-000001`].length).toEqual(43); + expect(groupByIndices[`${ES_INDEX_PREFIX}_internal_relationships-000001`].length).toEqual(47); expect(groupByIndices[`${ES_INDEX_PREFIX}_stix_core_relationships-000001`].length).toEqual(24); expect(groupByIndices[`${ES_INDEX_PREFIX}_stix_meta_relationships-000001`].length).toEqual(124); expect(groupByIndices[`${ES_INDEX_PREFIX}_stix_sighting_relationships-000001`].length).toEqual(2); @@ -625,14 +629,14 @@ describe('Elasticsearch pagination', () => { expect(metaByEntityType['external-reference'].length).toEqual(7); expect(metaByEntityType['object-marking'].length).toEqual(26); expect(metaByEntityType['kill-chain-phase'].length).toEqual(3); - expect(data.edges.length).toEqual(193); + expect(data.edges.length).toEqual(197); let filterBaseTypes = R.uniq(R.map((e) => e.node.base_type, data.edges)); expect(filterBaseTypes.length).toEqual(1); expect(R.head(filterBaseTypes)).toEqual('RELATION'); // Same query with no pagination data = await elPaginate(testContext, ADMIN_USER, READ_RELATIONSHIPS_INDICES, { connectionFormat: false }); expect(data).not.toBeNull(); - expect(data.length).toEqual(193); + expect(data.length).toEqual(197); filterBaseTypes = R.uniq(R.map((e) => e.base_type, data)); expect(filterBaseTypes.length).toEqual(1); expect(R.head(filterBaseTypes)).toEqual('RELATION'); diff --git a/opencti-platform/opencti-graphql/tests/02-integration/01-database/marking-definition-test.js b/opencti-platform/opencti-graphql/tests/02-integration/01-database/marking-definition-test.js index 86280d86923a..4371b5b6012e 100644 --- a/opencti-platform/opencti-graphql/tests/02-integration/01-database/marking-definition-test.js +++ b/opencti-platform/opencti-graphql/tests/02-integration/01-database/marking-definition-test.js @@ -9,20 +9,20 @@ const markings = [ { type: 'marking-definition', spec_version: '2.1', - definition_type: 'PAP', + definition_type: 'TEST', x_opencti_order: 1, x_opencti_color: '#ffffff', - definition: 'PAP:CLEAR', + definition: 'TEST:CLEAR', created: '2020-02-25T09:02:29.040Z', modified: '2020-02-25T09:02:29.040Z' }, { type: 'marking-definition', spec_version: '2.1', - definition_type: 'PAP', + definition_type: 'TEST', x_opencti_order: 4, x_opencti_color: '#d62828', - definition: 'PAP:RED', + definition: 'TEST:RED', created: '2020-02-25T09:02:29.040Z', modified: '2020-02-25T09:02:29.040Z' }, @@ -59,34 +59,34 @@ const createMarking = async (marking) => { }); }; -let clearPAPMarking; -let redPAPMarking; +let clearTESTMarking; +let redTESTMarking; let statementMarking1; let statementMarking2; describe('Marking Definition', () => { beforeAll(async () => { - clearPAPMarking = await createMarking(markings[0]); - redPAPMarking = await createMarking(markings[1]); + clearTESTMarking = await createMarking(markings[0]); + redTESTMarking = await createMarking(markings[1]); statementMarking1 = await createMarking(markings[2]); statementMarking2 = await createMarking(markings[3]); }); describe('Clean Markings use for editing', async () => { it('Case add only one marking => output one marking added', async () => { - const result = await cleanMarkings(testContext, [clearPAPMarking]); - expect(result.map((r) => r.id)).toEqual([clearPAPMarking.id]); + const result = await cleanMarkings(testContext, [clearTESTMarking]); + expect(result.map((r) => r.id)).toEqual([clearTESTMarking.id]); }); it('Case add 2 markings same type AND order different => output marking with higher rank added', async () => { // Case input 2 markings same type AND order different: output marking with higher rank added - const result = await cleanMarkings(testContext, [clearPAPMarking, redPAPMarking]); - expect(result.map((r) => r.id)).toEqual([redPAPMarking.id]); + const result = await cleanMarkings(testContext, [clearTESTMarking, redTESTMarking]); + expect(result.map((r) => r.id)).toEqual([redTESTMarking.id]); }); it('Case add 2 markings different type => output both markings added', async () => { - const result = await cleanMarkings(testContext, [clearPAPMarking, statementMarking1]); - expect(result.map((r) => r.id)).toEqual([clearPAPMarking.id, statementMarking1.id]); + const result = await cleanMarkings(testContext, [clearTESTMarking, statementMarking1]); + expect(result.map((r) => r.id)).toEqual([clearTESTMarking.id, statementMarking1.id]); }); it('Case add 2 markings same type AND order different AND another type => output marking with higher rank added AND the other type', async () => { - const result = await cleanMarkings(testContext, [redPAPMarking, clearPAPMarking, statementMarking1]); - expect(result.map((r) => r.id)).toEqual([redPAPMarking.id, statementMarking1.id]); + const result = await cleanMarkings(testContext, [redTESTMarking, clearTESTMarking, statementMarking1]); + expect(result.map((r) => r.id)).toEqual([redTESTMarking.id, statementMarking1.id]); }); it('Case add a marking with as undefined (deleted case) => output no marking added', async () => { const result = await cleanMarkings(testContext, [undefined]); @@ -94,8 +94,8 @@ describe('Marking Definition', () => { }); it('Case add 2 markings same type AND order different AND a deleted marking => output marking with higher rank added', async () => { // Case input 2 markings same type AND order different: output marking with higher rank added - const result = await cleanMarkings(testContext, [clearPAPMarking, undefined, redPAPMarking]); - expect(result.map((r) => r.id)).toEqual([redPAPMarking.id]); + const result = await cleanMarkings(testContext, [clearTESTMarking, undefined, redTESTMarking]); + expect(result.map((r) => r.id)).toEqual([redTESTMarking.id]); }); }); @@ -103,22 +103,22 @@ describe('Marking Definition', () => { describe('Case update operation ADD', () => { it('Add no markings', async () => { // PAP 01 + statement1 00 -> Add nothing => ADD nothing - const result = await handleMarkingOperations(testContext, [statementMarking1, clearPAPMarking], [], UPDATE_OPERATION_ADD); + const result = await handleMarkingOperations(testContext, [statementMarking1, clearTESTMarking], [], UPDATE_OPERATION_ADD); expect(result).toEqual({ operation: 'add', refs: [] }); }); it('Case add 1 marking, current no marking => add 1 marking', async () => { // no markings -> Add PAP 01 => ADD PAP 01 - const result = await handleMarkingOperations(testContext, [], [clearPAPMarking], UPDATE_OPERATION_ADD); + const result = await handleMarkingOperations(testContext, [], [clearTESTMarking], UPDATE_OPERATION_ADD); expect(result.operation).toEqual('add'); - expect(result.refs.map((r) => r.internal_id)).toEqual([clearPAPMarking.id]); + expect(result.refs.map((r) => r.internal_id)).toEqual([clearTESTMarking.id]); }); it('Case add 1 marking, current 1 has same type AND lower order => replace 1 marking', async () => { // PAP 01 -> Add PAP 04 => REPLACE PAP 04 - const result = await handleMarkingOperations(testContext, [clearPAPMarking], [redPAPMarking], UPDATE_OPERATION_ADD); + const result = await handleMarkingOperations(testContext, [clearTESTMarking], [redTESTMarking], UPDATE_OPERATION_ADD); expect(result.operation).toEqual('replace'); - expect(result.refs.map((r) => r.internal_id)).toEqual([redPAPMarking.id]); + expect(result.refs.map((r) => r.internal_id)).toEqual([redTESTMarking.id]); }); it('Case add 1 marking, current 1 has same type AND same order => add marking', async () => { @@ -130,13 +130,13 @@ describe('Marking Definition', () => { it('Case add 1 marking, current 1 has same type AND higher order => do nothing', async () => { // PAP 04 -> Add PAP 01 => Do nothing - const result = await handleMarkingOperations(testContext, [redPAPMarking], [clearPAPMarking], UPDATE_OPERATION_ADD); + const result = await handleMarkingOperations(testContext, [redTESTMarking], [clearTESTMarking], UPDATE_OPERATION_ADD); expect(result).toEqual({ operation: 'add', refs: [] }); }); it('Case add 2 markings, current 1 has same type AND higher order + 1 different type => only add marking not in common', async () => { // PAP 04 -> Add PAP 01 => Add marking not in common only - const result = await handleMarkingOperations(testContext, [redPAPMarking], [clearPAPMarking, statementMarking1], UPDATE_OPERATION_ADD); + const result = await handleMarkingOperations(testContext, [redTESTMarking], [clearTESTMarking, statementMarking1], UPDATE_OPERATION_ADD); expect(result.operation).toEqual('add'); expect(result.refs.map((r) => r.internal_id)).toEqual([statementMarking1.id]); }); @@ -145,27 +145,27 @@ describe('Marking Definition', () => { describe('Case update operation UPDATE', () => { it('Replace with nothing => Remove all markings', async () => { // PAP 01 + statement1 00 -> Add nothing => Remove all - const result = await handleMarkingOperations(testContext, [statementMarking1, clearPAPMarking], [], UPDATE_OPERATION_REPLACE); + const result = await handleMarkingOperations(testContext, [statementMarking1, clearTESTMarking], [], UPDATE_OPERATION_REPLACE); expect(result).toEqual({ operation: 'replace', refs: [] }); }); it('Case add 1 marking, current 1 marking => output replace 1 marking', async () => { // PAP 04 -> Add PAP 01 => REPLACE PAP 01 - const result = await handleMarkingOperations(testContext, [redPAPMarking], [clearPAPMarking], UPDATE_OPERATION_REPLACE); + const result = await handleMarkingOperations(testContext, [redTESTMarking], [clearTESTMarking], UPDATE_OPERATION_REPLACE); expect(result.operation).toEqual('replace'); - expect(result.refs.map((r) => r.internal_id)).toEqual([clearPAPMarking.id]); + expect(result.refs.map((r) => r.internal_id)).toEqual([clearTESTMarking.id]); }); it('Case add 1 marking, current 2 markings => output replace with 1 marking', async () => { // PAP 01 + statement1 00 -> Add PAP 04 => REPLACE PAP 04 - const result = await handleMarkingOperations(testContext, [clearPAPMarking, statementMarking1], [redPAPMarking], UPDATE_OPERATION_REPLACE); + const result = await handleMarkingOperations(testContext, [clearTESTMarking, statementMarking1], [redTESTMarking], UPDATE_OPERATION_REPLACE); expect(result.operation).toEqual('replace'); - expect(result.refs.map((r) => r.internal_id)).toEqual([redPAPMarking.id]); + expect(result.refs.map((r) => r.internal_id)).toEqual([redTESTMarking.id]); }); it('Case add 2 markings, current 1 marking => output replace by 2 markings', async () => { // PAP 01 -> Add statement1 00 + statement2 00 => ADD statement1 00 + statement2 00 - const result = await handleMarkingOperations(testContext, [clearPAPMarking], [statementMarking1, statementMarking2], UPDATE_OPERATION_REPLACE); + const result = await handleMarkingOperations(testContext, [clearTESTMarking], [statementMarking1, statementMarking2], UPDATE_OPERATION_REPLACE); expect(result.operation).toEqual('replace'); expect(result.refs.map((r) => r.internal_id)).toEqual([statementMarking1.id, statementMarking2.id]); }); @@ -173,21 +173,21 @@ describe('Marking Definition', () => { describe('Case update operation REMOVE', () => { it('Case remove 1 marking', async () => { - const result = await handleMarkingOperations(testContext, [clearPAPMarking], [clearPAPMarking], UPDATE_OPERATION_REMOVE); + const result = await handleMarkingOperations(testContext, [clearTESTMarking], [clearTESTMarking], UPDATE_OPERATION_REMOVE); expect(result.operation).toEqual('remove'); - expect(result.refs.map((r) => r.internal_id)).toEqual([clearPAPMarking.id]); + expect(result.refs.map((r) => r.internal_id)).toEqual([clearTESTMarking.id]); }); it('Case remove for all markings', async () => { - const result = await handleMarkingOperations(testContext, [clearPAPMarking, statementMarking1], [clearPAPMarking, statementMarking2], UPDATE_OPERATION_REMOVE); + const result = await handleMarkingOperations(testContext, [clearTESTMarking, statementMarking1], [clearTESTMarking, statementMarking2], UPDATE_OPERATION_REMOVE); expect(result.operation).toEqual('remove'); - expect(result.refs.map((r) => r.internal_id)).toEqual([clearPAPMarking.id, statementMarking2.id]); + expect(result.refs.map((r) => r.internal_id)).toEqual([clearTESTMarking.id, statementMarking2.id]); }); }); }); afterAll(async () => { - const createdMarkings = [clearPAPMarking, redPAPMarking, statementMarking1, statementMarking2]; + const createdMarkings = [clearTESTMarking, redTESTMarking, statementMarking1, statementMarking2]; for (let i = 0; i < createdMarkings.length; i += 1) { const markingId = createdMarkings[i].id; // Create the markingDefinition diff --git a/opencti-platform/opencti-graphql/tests/02-integration/02-resolvers/markingDefinition-test.js b/opencti-platform/opencti-graphql/tests/02-integration/02-resolvers/markingDefinition-test.js index 5625dacd201f..266fcedc139d 100644 --- a/opencti-platform/opencti-graphql/tests/02-integration/02-resolvers/markingDefinition-test.js +++ b/opencti-platform/opencti-graphql/tests/02-integration/02-resolvers/markingDefinition-test.js @@ -86,8 +86,8 @@ describe('MarkingDefinition resolver standard behavior', () => { expect(queryResult.data.markingDefinition.id).toEqual(markingDefinitionInternalId); }); it('should list markingDefinitions', async () => { - const queryResult = await queryAsAdmin({ query: LIST_QUERY, variables: { first: 10 } }); - expect(queryResult.data.markingDefinitions.edges.length).toEqual(8); + const queryResult = await queryAsAdmin({ query: LIST_QUERY, variables: { first: 20 } }); + expect(queryResult.data.markingDefinitions.edges.length).toEqual(12); }); it('should update markingDefinition', async () => { const UPDATE_QUERY = gql` diff --git a/opencti-platform/opencti-graphql/tests/03-streams/00-Raw/raw-test.js b/opencti-platform/opencti-graphql/tests/03-streams/00-Raw/raw-test.js index 2481236bfedf..c53e01dcc34f 100644 --- a/opencti-platform/opencti-graphql/tests/03-streams/00-Raw/raw-test.js +++ b/opencti-platform/opencti-graphql/tests/03-streams/00-Raw/raw-test.js @@ -18,7 +18,7 @@ describe('Raw streams tests', () => { const createEvents = events.filter((e) => e.type === EVENT_TYPE_CREATE); // Check some events count const createEventsByTypes = R.groupBy((e) => e.data.data.type, createEvents); - expect(createEventsByTypes['marking-definition'].length).toBe(15); + expect(createEventsByTypes['marking-definition'].length).toBe(19); expect(createEventsByTypes['external-reference'].length).toBe(17); expect(createEventsByTypes.label.length).toBe(15); expect(createEventsByTypes.identity.length).toBe(30); @@ -29,7 +29,7 @@ describe('Raw streams tests', () => { expect(createEventsByTypes.tool.length).toBe(2); expect(createEventsByTypes.vocabulary.length).toBe(335); // 328 created at init + 2 created in tests + 5 vocabulary organizations types expect(createEventsByTypes.vulnerability.length).toBe(7); - expect(createEvents.length).toBe(713); + expect(createEvents.length).toBe(717); for (let createIndex = 0; createIndex < createEvents.length; createIndex += 1) { const { data: insideData, origin, type } = createEvents[createIndex]; expect(origin).toBeDefined(); diff --git a/opencti-platform/opencti-graphql/tests/utils/testQuery.ts b/opencti-platform/opencti-graphql/tests/utils/testQuery.ts index e9c018e59a29..8f58a62a7596 100644 --- a/opencti-platform/opencti-graphql/tests/utils/testQuery.ts +++ b/opencti-platform/opencti-graphql/tests/utils/testQuery.ts @@ -22,8 +22,8 @@ export const SYNC_LIVE_START_REMOTE_URI = conf.get('app:sync_live_start_remote_u export const SYNC_DIRECT_START_REMOTE_URI = conf.get('app:sync_direct_start_remote_uri'); export const SYNC_RESTORE_START_REMOTE_URI = conf.get('app:sync_restore_start_remote_uri'); export const SYNC_TEST_REMOTE_URI = `http://api-tests:${PORT}`; -export const RAW_EVENTS_SIZE = 947; -export const SYNC_LIVE_EVENTS_SIZE = 594; +export const RAW_EVENTS_SIZE = 951; +export const SYNC_LIVE_EVENTS_SIZE = 598; export const PYTHON_PATH = './src/python/testing'; export const API_URI = `http://localhost:${conf.get('app:port')}`;