[frontend] Entity type filter value selection in 'Add entities' panels (

#7539)
OpenCTI-Platform · Nov 20, 2024 · ea72d44 · ea72d44
1 parent 50a5a8b
commit ea72d44
Showing 1 changed file with 7 additions and 18 deletions.
diff --git a/...rm/opencti-front/src/private/components/common/containers/ContainerAddStixCoreObjects.jsx b/...rm/opencti-front/src/private/components/common/containers/ContainerAddStixCoreObjects.jsx
@@ -15,7 +15,7 @@ import StixDomainObjectCreation from '../stix_domain_objects/StixDomainObjectCre
 import StixCyberObservableCreation from '../../observations/stix_cyber_observables/StixCyberObservableCreation';
 import useAuth from '../../../../utils/hooks/useAuth';
 import ListLines from '../../../../components/list_lines/ListLines';
-import { emptyFilterGroup } from '../../../../utils/filters/filtersUtils';
+import { emptyFilterGroup, useBuildEntityTypeBasedFilterContext } from '../../../../utils/filters/filtersUtils';
 import Drawer from '../drawer/Drawer';
 import useAttributes from '../../../../utils/hooks/useAttributes';
 import { usePaginationLocalStorage } from '../../../../utils/hooks/useLocalStorage';
@@ -87,19 +87,6 @@ const ContainerAddStixCoreObjects = (props) => {
     platformModuleHelpers: { isRuntimeFieldEnable },
   } = useAuth();
 
-  const targetEntityTypesFilterGroup = {
-    mode: 'and',
-    filterGroups: [],
-    filters: [
-      {
-        key: 'entity_type',
-        values: targetStixCoreObjectTypes,
-        operator: 'eq',
-        mode: 'or',
-      },
-    ],
-  };
-
   const isTypeDomainObject = (types) => {
     return !types
       || types.some((r) => stixDomainObjectTypes.indexOf(r) >= 0)
@@ -143,10 +130,7 @@ const ContainerAddStixCoreObjects = (props) => {
       searchTerm: '',
       sortBy: '_score',
       orderAsc: false,
-      filters: targetStixCoreObjectTypes
-      && !(targetStixCoreObjectTypes.includes('Stix-Domain-Object') || targetStixCoreObjectTypes.includes('Stix-Cyber-Observable'))
-        ? targetEntityTypesFilterGroup
-        : emptyFilterGroup,
+      filters: emptyFilterGroup,
       types: [resolveAvailableTypes()],
     },
     true,
@@ -159,6 +143,7 @@ const ContainerAddStixCoreObjects = (props) => {
     filters,
     numberOfElements,
   } = viewStorage;
+  const contextFilters = useBuildEntityTypeBasedFilterContext(targetStixCoreObjectTypes, filters);
 
   const containerRef = useRef(null);
   const keyword = mapping && (searchTerm ?? '').length === 0 ? selectedText : searchTerm;
@@ -350,6 +335,9 @@ const ContainerAddStixCoreObjects = (props) => {
         disableExport={true}
         availableEntityTypes={targetStixCoreObjectTypes}
         entityTypes={targetStixCoreObjectTypes}
+        additionalFilterKeys={{
+          filterKeys: ['entity_type'],
+        }}
       >
         <QueryRenderer
           query={containerAddStixCoreObjectsLinesQuery}
@@ -380,6 +368,7 @@ const ContainerAddStixCoreObjects = (props) => {
   const searchPaginationOptions = removeEmptyFields({
     ...paginationOptionsNoCount,
     search: keyword,
+    filters: contextFilters,
   });
   const renderButton = () => {
     if (knowledgeGraph) {